Fix a bug with typescript 4 and allowGraph

koskimas · koskimas · commit 9a66f2160820 · 2021-11-09T11:59:49.000+02:00
diff --git a/lib/model/modelFilter.js b/lib/model/modelFilter.js
diff --git a/lib/queryBuilder/QueryBuilderOperationSupport.js b/lib/queryBuilder/QueryBuilderOperationSupport.js
@@ -3,6 +3,7 @@
 const { isString, isFunction, isRegExp, last } = require('../utils/objectUtils');
 const { QueryBuilderContextBase } = require('./QueryBuilderContextBase');
 const { QueryBuilderUserContext } = require('./QueryBuilderUserContext');
+const { deprecate } = require('../utils/deprecate');
 
 const AllSelector = () => true;
 const SelectSelector =
@@ -494,6 +495,7 @@ class QueryBuilderOperationSupport {
   }
 
   skipUndefined() {
+    deprecate('skipUndefined() is deprecated and will be removed in objection 4.0');
     this.internalOptions().skipUndefined = true;
     return this;
   }
diff --git a/lib/queryBuilder/RelationExpression.js b/lib/queryBuilder/RelationExpression.js
@@ -291,7 +291,7 @@ function modelToNode(model, node) {
   for (let r = 0, lr = relationNames.length; r < lr; ++r) {
     const relName = relationNames[r];
 
-    if (model.hasOwnProperty(relName)) {
+    if (model[relName] !== undefined) {
       let childNode = node[relName];
 
       if (!childNode) {
diff --git a/lib/queryBuilder/graph/recursiveUpsert/GraphRecursiveUpsert.js b/lib/queryBuilder/graph/recursiveUpsert/GraphRecursiveUpsert.js
@@ -18,7 +18,7 @@ class GraphRecursiveUpsert extends GraphOperation {
 
 function hasRelations(obj) {
   for (const relationName of obj.constructor.getRelationNames()) {
-    if (obj.hasOwnProperty(relationName)) {
+    if (obj[relationName] !== undefined) {
       return true;
     }
   }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.3",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
diff --git a/tests/integration/insert.js b/tests/integration/insert.js
@@ -1699,8 +1699,7 @@ module.exports = (session) => {
           const result = await Model2.query()
             .insert({ idCol: 1, model2Prop1: 'updated', model2Prop2: 123456 })
             .onConflict('id_col')
-            .merge(['model2_prop1'])
-            .debug();
+            .merge(['model2_prop1']);
           expect(result instanceof Model2).to.equal(true);
 
           const rows = await Model2.query();

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`const { isString, isFunction, isRegExp, last } = require('../utils/objectUtils');`
`4`	`4`	`const { QueryBuilderContextBase } = require('./QueryBuilderContextBase');`
`5`	`5`	`const { QueryBuilderUserContext } = require('./QueryBuilderUserContext');`
	`6`	`+const { deprecate } = require('../utils/deprecate');`
`6`	`7`
`7`	`8`	`const AllSelector = () => true;`
`8`	`9`	`const SelectSelector =`
`@@ -494,6 +495,7 @@ class QueryBuilderOperationSupport {`
`494`	`495`	`}`
`495`	`496`
`496`	`497`	`skipUndefined() {`
	`498`	`+ deprecate('skipUndefined() is deprecated and will be removed in objection 4.0');`
`497`	`499`	`this.internalOptions().skipUndefined = true;`
`498`	`500`	`return this;`
`499`	`501`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class GraphRecursiveUpsert extends GraphOperation {`
`18`	`18`
`19`	`19`	`function hasRelations(obj) {`
`20`	`20`	`for (const relationName of obj.constructor.getRelationNames()) {`
`21`		`- if (obj.hasOwnProperty(relationName)) {`
	`21`	`+ if (obj[relationName] !== undefined) {`
`22`	`22`	`return true;`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "objection",`
`3`		`- "version": "3.0.0-rc.2",`
	`3`	`+ "version": "3.0.0-rc.3",`
`4`	`4`	`"description": "An SQL-friendly ORM for Node.js",`
`5`	`5`	`"main": "lib/objection.js",`
`6`	`6`	`"license": "MIT",`