fixes Vincit#1227

koskimas · koskimas · commit a376005a1cde · 2019-02-27T10:23:26.000+02:00
diff --git a/doc/includes/CHANGELOG.md b/doc/includes/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.3
+
+  * Fixes: [#1227](https://github.com/Vincit/objection.js/issues/1227)
+
 ## 1.6.2
 
   * Add `as` method for `raw` making it possible to use `raw` expressions in `joinEager` modifiers (as long as you give names to your raw expressions using `as`).
diff --git a/lib/model/graph/ModelGraphNode.js b/lib/model/graph/ModelGraphNode.js
@@ -10,6 +10,7 @@ class ModelGraphNode {
     this.obj = obj;
     this.edges = [];
     this.userData = {};
+    this.hadIdOriginally = obj.$hasId();
 
     // These are also included in `edges`. These are simply
     // shortcuts for commonly used edges.
diff --git a/lib/queryBuilder/graph/GraphOptions.js b/lib/queryBuilder/graph/GraphOptions.js
@@ -50,7 +50,7 @@ class GraphOptions {
     return (
       !getCurrentNode(node, currentGraph) &&
       !this.shouldRelateIgnoreDisable(node, currentGraph) &&
-      (!node.obj.$hasId() || this._hasOption(node, INSERT_MISSING))
+      (!node.hadIdOriginally || this._hasOption(node, INSERT_MISSING))
     );
   }
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
@@ -14,6 +14,7 @@
     "test-typings": "tsc",
     "coveralls": "cat ./testCoverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
     "perf": "mocha --slow 60000 --timeout 60000 --reporter spec --recursive perf",
+    "perf-debug": "mocha --slow 60000 --timeout 60000 --reporter spec --inspect-brk perf",
     "perf-prof": "mocha --slow 60000 --timeout 60000 --reporter spec --recursive perf --prof",
     "perf-opt": "mocha --slow 60000 --timeout 60000 --reporter spec --recursive perf --trace_opt --trace_deopt",
     "prettier": "prettier --write \"{examples,lib,tests,typings}/**/*.{js,ts}\"",
diff --git a/tests/integration/misc/#1227.js b/tests/integration/misc/#1227.js
@@ -0,0 +1,90 @@
+const { Model } = require('../../../');
+const { expect } = require('chai');
+
+module.exports = session => {
+  describe(`primary key to primary key relations with upsertGraph #1227`, () => {
+    let knex = session.knex;
+    let Person, Animal;
+
+    before(() => {
+      return knex.schema
+        .dropTableIfExists('cousins')
+        .dropTableIfExists('persons')
+        .createTable('persons', table => {
+          table.increments('id').primary();
+          table.string('name');
+        })
+        .createTable('pets', table => {
+          table
+            .integer('id')
+            .unsigned()
+            .primary()
+            .references('persons.id');
+          table.string('name');
+        });
+    });
+
+    after(() => {
+      return knex.schema.dropTableIfExists('pets').dropTableIfExists('persons');
+    });
+
+    beforeEach(() => {
+      Animal = class Animal extends Model {
+        static get tableName() {
+          return 'pets';
+        }
+      };
+
+      Animal.knex(knex);
+    });
+
+    beforeEach(() => {
+      Person = class Person extends Model {
+        static get tableName() {
+          return 'persons';
+        }
+
+        static get relationMappings() {
+          return {
+            pet: {
+              modelClass: Animal,
+              relation: Model.HasOneRelation,
+              join: {
+                from: 'persons.id',
+                to: 'pets.id'
+              }
+            }
+          };
+        }
+      };
+
+      Person.knex(knex);
+    });
+
+    beforeEach(() => Animal.query().delete());
+    beforeEach(() => Person.query().delete());
+
+    it('should be able to insert a primary key to primary key hasOne relation', () => {
+      return Person.query()
+        .upsertGraph({
+          name: 'person',
+          pet: {
+            name: 'pet'
+          }
+        })
+        .then(person => {
+          return Person.query()
+            .findById(person.id)
+            .eager('pet');
+        })
+        .then(person => {
+          expect(person).to.containSubset({
+            name: 'person',
+            pet: {
+              name: 'pet'
+            }
+          });
+        });
+    });
+  });
+};
diff --git a/tests/integration/upsertGraph.js b/tests/integration/upsertGraph.js
@@ -446,6 +446,52 @@ module.exports = session => {
         });
     });
 
+    it('should work with an empty object in belongsToOne relation', () => {
+      const upsert = {
+        model1Relation1: {}
+      };
+
+      return transaction(session.knex, trx => Model1.query(trx).upsertGraph(upsert))
+        .then(inserted =>
+          Model1.query(session.knex)
+            .findById(inserted.id)
+            .eager('model1Relation1')
+        )
+        .then(model => {
+          chai.expect(model).to.containSubset({
+            model1Prop1: null,
+            model1Prop2: null,
+            model1Relation1: {
+              model1Prop1: null,
+              model1Prop2: null
+            }
+          });
+        });
+    });
+
+    it('should work with an empty object in hasOne relation', () => {
+      const upsert = {
+        model1Relation1Inverse: {}
+      };
+
+      return transaction(session.knex, trx => Model1.query(trx).upsertGraph(upsert))
+        .then(inserted =>
+          Model1.query(session.knex)
+            .findById(inserted.id)
+            .eager('model1Relation1Inverse')
+        )
+        .then(model => {
+          chai.expect(model).to.containSubset({
+            model1Prop1: null,
+            model1Prop2: null,
+            model1Relation1Inverse: {
+              model1Prop1: null,
+              model1Prop2: null
+            }
+          });
+        });
+    });
+
     it('should update model if the model changes and a belongsToOne relation changes', () => {
       const upsert = {
         id: 1,

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class GraphOptions {`
`50`	`50`	`return (`
`51`	`51`	`!getCurrentNode(node, currentGraph) &&`
`52`	`52`	`!this.shouldRelateIgnoreDisable(node, currentGraph) &&`
`53`		`- (!node.obj.$hasId() \|\| this._hasOption(node, INSERT_MISSING))`
	`53`	`+ (!node.hadIdOriginally \|\| this._hasOption(node, INSERT_MISSING))`
`54`	`54`	`);`
`55`	`55`	`}`
`56`	`56`