Merge pull request #10414 from AbdelrahmanHafez/gh-9010

Allow usage of schema reserved keywords
Automattic · Aug 20, 2021 · 14dd60b · 14dd60b
2 parents 744eaa1 + 05bbdf1
commit 14dd60b
Show file tree

Hide file tree

Showing 32 changed files with 626 additions and 220 deletions.
diff --git a/benchmarks/index.js b/benchmarks/index.js
@@ -149,7 +149,4 @@ run('array of docs', function() {
   });
 });
 
-// console.error(a.toObject({depopulate:true}));
-console.error('completed %d docs in %d seconds (%d dps)', numdocs, totaltime, numdocs / totaltime);
-
-// --trace-opt --trace-deopt --trace-bailout
+console.error('completed %d docs in %d seconds (%d dps)', numdocs, totaltime, numdocs / totaltime);
diff --git a/lib/connection.js b/lib/connection.js
@@ -483,7 +483,7 @@ Connection.prototype.transaction = function transaction(fn, options) {
         for (const doc of session[sessionNewDocuments].keys()) {
           const state = session[sessionNewDocuments].get(doc);
           if (state.hasOwnProperty('isNew')) {
-            doc.isNew = state.isNew;
+            doc.$isNew = state.$isNew;
           }
           if (state.hasOwnProperty('versionKey')) {
             doc.set(doc.schema.options.versionKey, state.versionKey);

diff --git a/lib/cursor/QueryCursor.js b/lib/cursor/QueryCursor.js
@@ -497,7 +497,7 @@ function _create(ctx, doc, populatedIds, cb) {
     { populated: populatedIds } :
     undefined;
 
-  instance.init(doc, opts, function(err) {
+  instance.$init(doc, opts, function(err) {
     if (err) {
       return cb(err);
     }