Added support for GROUP BY with ONLY_FULL_GROUP_BY enabled

Author: Dekel Barzilay

test/company.js

@@ -44,6 +44,13 @@ export default class Company extends Model {
 
       if (hasCeo) { builder.whereNot('ceo', null); }
     },
+    googleWithEager: (builder, hasCeo) => {
+      builder.where('companies.name', 'Google')
+        .select(['companies.name'])
+        .groupBy(['companies.name', 'companies.id']);
+
+      if (hasCeo) { builder.whereNot('ceo', null); }
+    },
     apple: (builder, hasCeo) => {
       builder.where('name', 'Apple');
 

test/index.test.js

@@ -248,7 +248,7 @@ function clean (done) {
         return db.schema
           .createTable('employees', table => {
             table.increments('id');
-            table.integer('companyId').references('companies.id');
+            table.integer('companyId');
             table.string('name');
           });
       });
@@ -258,7 +258,7 @@ function clean (done) {
         return db.schema
           .createTable('clients', table => {
             table.increments('id');
-            table.integer('companyId').references('companies.id');
+            table.integer('companyId');
             table.string('name');
           })
           .then(() => done());
@@ -1771,7 +1771,7 @@ describe('Feathers Objection Service', () => {
       });
     });
 
-    it('allow $modify query with paginate and groupBy', () => {
+    it('allow $modify query with paginate and groupBy and joinRelation', () => {
       companies.options.paginate = {
         default: 1,
         max: 2
@@ -1784,6 +1784,19 @@ describe('Feathers Objection Service', () => {
       });
     });
 
+    it.skip('allow $modify query with paginate and groupBy and eager', () => {
+      companies.options.paginate = {
+        default: 1,
+        max: 2
+      };
+
+      return companies.find({ query: { $modify: ['googleWithEager'], $eager: 'employees' } }).then(data => {
+        expect(data.total).to.be.equal(1);
+        expect(data.data.length).to.be.equal(1);
+        expect(data.data[0].name).to.be.equal('Google');
+      });
+    });
+
     it('allow $modify query as string', () => {
       return companies.find({ query: { $modify: 'google' } }).then(data => {
         expect(data.length).to.be.equal(1);