fixes #1983

Author: koskimas

lib/queryBuilder/QueryBuilder.js

@@ -483,7 +483,8 @@ class QueryBuilder extends QueryBuilderBase {
   }
 
   hasWheres() {
-    return prebuildQuery(this).has(QueryBuilderBase.WhereSelector);
+    const queryWithoutGraph = this.clone().clearWithGraph();
+    return prebuildQuery(queryWithoutGraph).has(QueryBuilderBase.WhereSelector);
   }
 
   hasSelects() {
@@ -653,7 +654,8 @@ class QueryBuilder extends QueryBuilderBase {
   }
 
   toKnexQuery(knexBuilder = this.knex().queryBuilder()) {
-    return buildKnexQuery(prebuildQuery(this), knexBuilder);
+    const prebuiltQuery = prebuildQuery(this.clone());
+    return buildKnexQuery(prebuiltQuery, knexBuilder);
   }
 
   async execute() {
@@ -1526,9 +1528,6 @@ function ensureJoinRelatedOperation(builder, joinOperation) {
 }
 
 function prebuildQuery(builder) {
-  // Take a clone so that we don't modify this instance.
-  builder = builder.clone();
-
   builder = addImplicitOperations(builder);
   builder = callOnBuildHooks(builder);
 

tests/integration/find.js

@@ -489,6 +489,47 @@ module.exports = (session) => {
                 expect(res[0].id).to.equal(3);
               });
           });
+
+          it('.distinctOn() many-to-many', async () => {
+            await session.populate([]);
+            await Model2.query().insertGraph([
+              {
+                idCol: 1,
+                model2Relation1: [{ id: 1 }, { id: 2 }],
+              },
+              {
+                idCol: 2,
+                model2Relation1: [{ id: 5 }, { id: 6 }],
+              },
+              {
+                idCol: 3,
+                model2Relation1: [{ id: 3 }, { id: 4 }],
+              },
+            ]);
+
+            const result = await Model2.query()
+              .distinctOn('id_col')
+              .joinRelated('model2Relation1')
+              .where('model2Relation1.id', '<', 5)
+              .orderBy('id_col');
+
+            expect(result).to.eql([
+              {
+                idCol: 1,
+                model1Id: null,
+                model2Prop1: null,
+                model2Prop2: null,
+                $afterFindCalled: 1,
+              },
+              {
+                idCol: 3,
+                model1Id: null,
+                model2Prop1: null,
+                model2Prop2: null,
+                $afterFindCalled: 1,
+              },
+            ]);
+          });
         }
 
         it('.count()', () => {

tests/unit/queryBuilder/QueryBuilder.js

@@ -1142,6 +1142,9 @@ describe('QueryBuilder', () => {
     let query = model.$query();
     chai.expect(query.hasWheres()).to.equal(true);
 
+    query = model.$query().withGraphJoined('manyToManyRelation');
+    chai.expect(query.hasWheres()).to.equal(true);
+
     query = model.$relatedQuery('belongsToOneRelation');
     chai.expect(query.hasWheres()).to.equal(true);