fixes Vincit#1364

koskimas · koskimas · commit 5007b74d2a24 · 2019-09-21T16:28:44.000+03:00
diff --git a/lib/queryBuilder/QueryBuilder.js b/lib/queryBuilder/QueryBuilder.js
@@ -562,7 +562,7 @@ class QueryBuilder extends QueryBuilderBase {
   }
 
   clone() {
-    const builder = new this.constructor(this.modelClass());
+    const builder = this.emptyInstance();
 
     // Call the super class's clone implementation.
     this.baseCloneInto(builder);
@@ -577,13 +577,20 @@ class QueryBuilder extends QueryBuilderBase {
     builder._findOperationOptions = this._findOperationOptions;
     builder._relatedQueryFor = this._relatedQueryFor;
 
+    return builder;
+  }
+
+  emptyInstance() {
+    const builder = new this.constructor(this.modelClass());
+
     builder._findOperationFactory = this._findOperationFactory;
     builder._insertOperationFactory = this._insertOperationFactory;
     builder._updateOperationFactory = this._updateOperationFactory;
     builder._patchOperationFactory = this._patchOperationFactory;
     builder._relateOperationFactory = this._relateOperationFactory;
     builder._unrelateOperationFactory = this._unrelateOperationFactory;
     builder._deleteOperationFactory = this._deleteOperationFactory;
+    builder._relatedQueryFor = this._relatedQueryFor;
 
     return builder;
   }
diff --git a/lib/queryBuilder/operations/UpdateAndFetchOperation.js b/lib/queryBuilder/operations/UpdateAndFetchOperation.js
@@ -25,11 +25,11 @@ class UpdateAndFetchOperation extends DelegateOperation {
   }
 
   onBuild(builder) {
-    super.onBuild(builder);
-
     if (!this.skipIdWhere) {
       builder.findById(this.id);
     }
+
+    super.onBuild(builder);
   }
 
   async onAfter2(builder, numUpdated) {
@@ -40,10 +40,13 @@ class UpdateAndFetchOperation extends DelegateOperation {
     }
 
     const fetched = await builder
-      .modelClass()
-      .query()
+      .emptyInstance()
       .childQueryOf(builder)
-      .findById(this.id)
+      .modify(builder => {
+        if (!this.skipIdWhere) {
+          builder.findById(this.id);
+        }
+      })
       .castTo(builder.resultModelClass());
 
     if (fetched) {
diff --git a/tests/integration/patch.js b/tests/integration/patch.js
@@ -1123,6 +1123,39 @@ module.exports = session => {
             });
         });
 
+        it('should patch a related object with extras using patchAndFetchById', () => {
+          return Model1.query()
+            .findById(1)
+            .then(parent => {
+              return parent
+                .$relatedQuery('model1Relation3')
+                .debug()
+                .patchAndFetchById(4, {
+                  model2Prop1: 'iam updated',
+                  extra1: 'updated extra 1',
+                  // Test query properties. sqlite doesn't have `concat` function. Use a literal for it.
+                  extra2: isSqlite(session.knex)
+                    ? 'updated extra 2'
+                    : raw(`CONCAT('updated extra ', '2')`)
+                });
+            })
+            .then(result => {
+              chai.expect(result).to.containSubset({
+                model2Prop1: 'iam updated',
+                extra1: 'updated extra 1',
+                extra2: 'updated extra 2',
+                idCol: 4
+              });
+
+              return Model1.query()
+                .findById(1)
+                .eager('model1Relation3');
+            })
+            .then(model1 => {
+              console.dir(model1, { depth: null });
+            });
+        });
+
         it('should patch a related object with extras', () => {
           return Model1.query()
             .findById(1)
