cleanup

koskimas · koskimas · commit cef73c4525ed · 2021-11-06T17:32:25.000+02:00
diff --git a/lib/relations/RelationOwner.js b/lib/relations/RelationOwner.js
@@ -71,12 +71,10 @@ class RelationOwner {
       if (values) {
         builder.whereInComposite(relatedRefs, values);
       } else {
-        builder.where(false);
-        builder.resolve([]);
+        builder.where(false).resolve([]);
       }
     } else {
-      builder.where(false);
-      builder.resolve([]);
+      builder.where(false).resolve([]);
     }
 
     return builder;
diff --git a/tests/integration/find.js b/tests/integration/find.js
@@ -2400,16 +2400,21 @@ module.exports = (session) => {
           });
         });
 
-        it('should return undefined if the model has no parents', async () => {
+        it('should return undefined if the result is empty', async () => {
           const parent = await Model1.query().findById(2);
 
           const result1 = await parent.$relatedQuery('model1Relation1');
           expect(result1).to.be.equal(undefined);
 
-          const result2 = await Model1.relatedQuery('model1Relation1').for(
-            Model1.relatedQuery('model1Relation1').for(parent)
+          const result2 = await Model1.query().from(
+            Model1.relatedQuery('model1Relation1').for(parent).as('model1')
           );
           expect(result2).to.eql([]);
+
+          const result3 = await Model1.query().from(
+            Model1.relatedQuery('model1Relation1').for(parent.id).as('model1')
+          );
+          expect(result3).to.eql([]);
         });
 
         describe('knex methods', () => {

Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,10 @@ class RelationOwner {`
`71`	`71`	`if (values) {`
`72`	`72`	`builder.whereInComposite(relatedRefs, values);`
`73`	`73`	`} else {`
`74`		`- builder.where(false);`
`75`		`- builder.resolve([]);`
	`74`	`+ builder.where(false).resolve([]);`
`76`	`75`	`}`
`77`	`76`	`} else {`
`78`		`- builder.where(false);`
`79`		`- builder.resolve([]);`
	`77`	`+ builder.where(false).resolve([]);`
`80`	`78`	`}`
`81`	`79`
`82`	`80`	`return builder;`