closes Vincit#1109 closes Vincit#1110

flipace · May 7, 2019 · 51ab2c6 · 51ab2c6
1 parent 0232894
commit 51ab2c6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/lib/queryBuilder/operations/InsertGraphAndFetchOperation.js b/lib/queryBuilder/operations/InsertGraphAndFetchOperation.js
@@ -22,6 +22,10 @@ class InsertGraphAndFetchOperation extends DelegateOperation {
   }
 
   onAfter2(builder) {
+    if (this.models.length === 0) {
+      return this.isArray ? [] : null;
+    }
+
     const eager = RelationExpression.fromModelGraph(this.models);
     const modelClass = this.models[0].constructor;
     const ids = this.models.map(model => model.$id());

diff --git a/lib/queryBuilder/operations/UpsertGraphAndFetchOperation.js b/lib/queryBuilder/operations/UpsertGraphAndFetchOperation.js
@@ -22,14 +22,18 @@ class UpsertGraphAndFetchOperation extends DelegateOperation {
   }
 
   onAfter3(builder) {
+    if (this.models.length === 0) {
+      return this.isArray ? [] : null;
+    }
+
     const eager = RelationExpression.fromModelGraph(this.models);
     const modelClass = this.models[0].constructor;
     const ids = this.models.map(model => model.$id());
 
     return modelClass
       .query()
       .childQueryOf(builder)
-      .whereIn(builder.fullIdColumnFor(modelClass), ids)
+      .whereInComposite(builder.fullIdColumnFor(modelClass), ids)
       .eager(eager)
       .then(models => {
         return this.isArray ? models : models[0] || null;

diff --git a/tests/integration/insertGraph.js b/tests/integration/insertGraph.js
@@ -80,6 +80,10 @@ module.exports = session => {
         return session.populate(population);
       });
 
+      it('should do nothing if an empty array is provided', () => {
+        return Model1.query().insertGraph([]);
+      })
+
       it('should insert a model with relations', () => {
         return Model1.query()
           .insertGraph(insertion)
@@ -552,6 +556,10 @@ module.exports = session => {
         return session.populate(population);
       });
 
+      it('should do nothing if an empty array is provided', () => {
+        return Model1.query().insertGraphAndFetch([]);
+      })
+
       it('should insert a model with relations and fetch the inserted graph', () => {
         return Model1.query()
           .insertGraphAndFetch(insertion)

diff --git a/tests/integration/upsertGraph.js b/tests/integration/upsertGraph.js
@@ -83,6 +83,13 @@ module.exports = session => {
       return session.populate(population);
     });
 
+    it('should do nothing if an empty array is given', () => {
+      return Promise.all([
+        Model1.query(session.knex).upsertGraph([]),
+        Model1.query(session.knex).upsertGraphAndFetch([])
+      ]);
+    })
+
     for (const passthroughMethodCall of [null, 'forUpdate', 'forShare']) {
       const passthroughMethodCallSql = {
         null: '',