Skip to content

fix behavior when updating values where the value was previously null #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anidotnet merged 1 commit into from
May 6, 2024
Merged

fix behavior when updating values where the value was previously null #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions nitrite/src/main/java/org/dizitart/no2/collection/NitriteDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,14 @@ public Document merge(Document document) {
// if the value is a document, merge it recursively
if (containsKey(key)) {
// if the current document already contains the key,
// then merge the embedded document
get(key, Document.class).merge((Document) value);
// and the value is not null, merge it
Document pairs = get(key, Document.class);
if (pairs != null) {
pairs.merge((Document) value);
} else {
//otherwise, just set the value to whatever was provided
put(key, value);
}
} else {
// if the current document does not contain the key,
// then put the embedded document as it is
Expand Down
19 changes: 15 additions & 4 deletions nitrite/src/test/java/org/dizitart/no2/integration/collection/CollectionUpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@

package org.dizitart.no2.integration.collection;

import org.dizitart.no2.collection.Document;
import org.dizitart.no2.collection.DocumentCursor;
import org.dizitart.no2.collection.NitriteCollection;
import org.dizitart.no2.collection.UpdateOptions;
import org.dizitart.no2.collection.*;
import org.dizitart.no2.common.WriteResult;
import org.dizitart.no2.exceptions.NitriteIOException;
import org.dizitart.no2.exceptions.NotIdentifiableException;
Expand Down Expand Up @@ -299,4 +296,18 @@ public void testIssue151() {

assertEquals(coll.find(where("fruit").eq("Apple")).size(), 1);
}

@Test
public void testUpdatePreviouslyNullObject() {
Document doc1 = createDocument().put("fruitType", null);
NitriteCollection coll = db.getCollection("test");

WriteResult insert = coll.insert(doc1);
NitriteId next = insert.iterator().next();
Document doc2 = createDocument().put("_id", next.getIdValue()).put("fruitType", createDocument().put("family", "citric"));
coll.update(doc2);

assertEquals(coll.find(where("_id").eq(next.getIdValue())).size(), 1);
assertNotNull(coll.find(where("_id").eq(next.getIdValue())).firstOrNull().get("fruitType"));
}
}