support most recent knex

doc/release-notes/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.1.4
+
+### What's new
+
+- Fixes [#1750](https://github.com/Vincit/objection.js/issues/1750)
+
 ## 2.1.3
 
 ### What's new

docker-compose.yml

@@ -3,13 +3,15 @@ services:
   postgres:
     image: 'postgres'
     container_name: 'objection_postgres'
-    command: postgres -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c random_page_cost=1.0 
+    command: postgres -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c random_page_cost=1.0
     ports:
       - '5432:5432'
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
   mysql:
     image: 'mysql:5'
     container_name: 'objection_mysql'
     ports:
       - '3306:3306'
     environment:
-      - 'MYSQL_ALLOW_EMPTY_PASSWORD=yes'
+      - 'MYSQL_ALLOW_EMPTY_PASSWORD=yes'

lib/queryBuilder/QueryBuilderBase.js

@@ -300,6 +300,10 @@ class QueryBuilderBase extends QueryBuilderOperationSupport {
     return this.addOperation(new KnexOperation('clearHaving'), args);
   }
 
+  clearGroup(...args) {
+    return this.addOperation(new KnexOperation('clearGroup'), args);
+  }
+
   orHaving(...args) {
     return this.addOperation(new KnexOperation('orHaving'), args);
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
@@ -79,7 +79,7 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
     "husky": "^3.1.0",
-    "knex": "0.20.11",
+    "knex": "0.21.1",
     "lint-staged": "^9.4.3",
     "mocha": "^6.2.2",
     "mysql": "^2.18.1",

testUtils/mockKnex.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const knexMethods = require('knex/lib/query/methods').concat('queryBuilder');
+const knexMethods = require('knex/lib/query/methods').concat('queryBuilder', 'raw');
 
 /**
  * @param {function} knex
@@ -12,15 +12,15 @@ const knexMethods = require('knex/lib/query/methods').concat('queryBuilder');
  *    Mocked knex.
  */
 module.exports = function mockKnex(knex, mockExecutor) {
-  const mock = (table) => {
+  const mock = table => {
     return mock.queryBuilder().table(table);
   };
 
   // Mock query builder methods.
   knexMethods.forEach(methodName => {
     mock[methodName] = (...args) => {
       return wrapBuilder(knex[methodName](...args));
-    }
+    };
   });
 
   const keys = _.uniqBy([...Object.keys(knex), 'client']);
@@ -55,7 +55,7 @@ module.exports = function mockKnex(knex, mockExecutor) {
   function wrapBuilder(builder) {
     const oldImpl = builder.then;
 
-    builder.then = function (...args) {
+    builder.then = function(...args) {
       return mockExecutor.call(this, mock, oldImpl, args);
     };