Merge pull request #289 from ayende/RDBC-509

RDBC-509 SaveChanges after query modifies the change vector

Author: ml054

src/Documents/Session/EntityToJson.ts

@@ -112,10 +112,30 @@ export class EntityToJson {
                 documentInfo.metadata[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] || typeInfo.typeName;
         }
 
+        function differentNestedTypes(): boolean {
+            const existing = documentInfo.metadataInstance[CONSTANTS.Documents.Metadata.NESTED_OBJECT_TYPES];
+            if (!existing) {
+                return true;
+            }
+            if (Object.keys(existing).length !== Object.keys(typeInfo.nestedTypes).length) {
+                return true;
+            }
+            for (const key in typeInfo.nestedTypes) {
+                if (typeInfo.nestedTypes[key] !== existing[key]) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         if (documentInfo.metadataInstance) {
-            documentInfo.metadataInstance[CONSTANTS.Documents.Metadata.NESTED_OBJECT_TYPES] = typeInfo.nestedTypes;
-            documentInfo.metadataInstance[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] =
-               documentInfo.metadataInstance["Raven-Node-Type"] || typeInfo.typeName;
+            if (differentNestedTypes()) {
+                documentInfo.metadataInstance[CONSTANTS.Documents.Metadata.NESTED_OBJECT_TYPES] = typeInfo.nestedTypes;
+            }
+            const nodeType = documentInfo.metadataInstance[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] || typeInfo.typeName;
+            if (documentInfo.metadataInstance[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] !== nodeType) {
+                documentInfo.metadataInstance[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] = nodeType;
+            }
         }
 
         let setMetadata: boolean = false;

test/Ported/MailingList/SpuriousSaveChanges.ts

@@ -0,0 +1,50 @@
+import { testContext, disposeTestDocumentStore } from "../../Utils/TestUtil";
+
+import {
+    IDocumentStore,
+} from "../../../src";
+import { assertThat } from "../../Utils/AssertExtensions";
+
+class Item {
+    v: string;
+
+    constructor(v: string) {
+        this.v = v;
+    }
+}
+
+describe("SpuriousSaveChanges", function () {
+
+    let store: IDocumentStore;
+
+    beforeEach(async function () {
+        store = await testContext.getDocumentStore();
+    });
+
+    afterEach(async () =>
+        await disposeTestDocumentStore(store)
+    );
+
+    it("willNotSaveUnmodifiedDocuments", async () => {
+
+        await createData(store);
+
+        {
+            const session = store.openSession();
+            const result = await session.query<Item>({ collection: "items" })
+                .all();
+            assertThat(session.advanced.hasChanged(result[0]))
+                .isFalse();
+            const old = session.advanced.numberOfRequests;
+            await session.saveChanges();
+            assertThat(session.advanced.numberOfRequests)
+                .isEqualTo(old);
+        }
+    });
+
+    async function createData(store: IDocumentStore): Promise<void> {
+        const session = store.openSession();
+        await session.store(new Item("f"), "items/1");
+        await session.saveChanges();
+    }
+});