fix: objection v3 and knex v1 compatibility

lib/operations/CursorPageOperation.js

@@ -203,6 +203,7 @@ function whereMore(builder, keyset) {
 function _whereMore(builder, comparisons, composites) {
 	const comparison = comparisons[0];
 	composites = [comparison, ...composites];
+
 	const op = comparison.order === 'asc' ? '>' : '<';
 
 	builder.andWhere(function () {

lib/operations/OrderByOperation.js

@@ -11,7 +11,7 @@ class OrderByOperation extends Operation {
 	}
 
 	onBuild(builder) {
-		builder.orderBy(this.column, this.order, true);
+		builder.orderBy(this.column, this.order, this.nulls, true);
 	}
 
 	get column() {
@@ -21,6 +21,10 @@ class OrderByOperation extends Operation {
 	get order() {
 		return this.args[1];
 	}
+
+	get nulls() {
+		return this.args[2];
+	}
 }
 
 module.exports = OrderByOperation;

lib/query-builder/CursorQueryBuilder.js

@@ -40,12 +40,12 @@ module.exports = function (options, Base) {
 			return addOperation(this, new OrderByExplicitOperation(), args);
 		}
 
-		orderBy(column, order, native = false) {
+		orderBy(column, order, nulls = '', native = false) {
 			if (native) {
-				return super.orderBy(column, order, native);
+				return super.orderBy(column, order, nulls, native);
 			}
 
-			return addOperation(this, new OrderByOperation(), [column, order]);
+			return addOperation(this, new OrderByOperation(), [column, order, nulls]);
 		}
 
 		clear(selector) {

package.json

@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "mocha --require @babel/register",
+    "test:sqlite": "CLIENT=sqlite3 mocha --require @babel/register",
     "test:pg": "CLIENT=pg mocha --require @babel/register",
     "test:tav": "tav",
     "lint": "eslint --fix \"index.js\" \"lib/**/*.js\" \"test/**/*.js\"",
@@ -29,12 +30,12 @@
     "chai-as-promised": "^7.1.1",
     "eslint": "^4.19.1",
     "eslint-plugin-mocha": "^5.0.0",
-    "knex": "^0.15.0",
+    "knex": "^2",
     "mocha": "^5.2.0",
     "mysql": "^2.17.1",
-    "objection": "^2.0.0",
-    "pg": "^7.4.3",
-    "sqlite3": "^4.0.1",
+    "objection": "^3",
+    "pg": "^8.7.3",
+    "sqlite3": "^5.0.0",
     "test-all-versions": "^4.1.1"
   },
   "dependencies": {

test/ref.js

@@ -58,10 +58,15 @@ module.exports = knex => {
 		});
 
 		it('order by ref - 2 columns', async () => {
-			const query = Movie.query()
+			let query = Movie.query()
 				.orderByCoalesce(ref('ref.data:none').castText(), 'desc', raw('?', ''))
-				.orderBy('movies.id', 'asc')
-				.joinEager('ref');
+				.orderBy('movies.id', 'asc');
+
+			if (query.withGraphJoined) {
+				query = query.withGraphJoined('ref');
+			} else {
+				query = query.joinEager('ref');
+			}
 
 			const expected = await query.clone();
 
@@ -88,11 +93,16 @@ module.exports = knex => {
 				}
 			}
 
-			const query = CaseMovie.query()
-				.joinEager('ref')
+			let query = CaseMovie.query()
 				.orderByCoalesce(ref('ref.data:title').castText(), 'desc')
 				.orderBy('movies.id', 'asc');
 
+			if (query.withGraphJoined) {
+				query = query.withGraphJoined('ref');
+			} else {
+				query = query.joinEager('ref');
+			}
+
 			const expected = await query.clone();
 
 			let res = await query.clone().limit(5).cursorPage();