Fix Order nulls in PostgreSQL

lib/dialects/cockroachdb/crdb-querycompiler.js

@@ -28,6 +28,11 @@ class QueryCompiler_CRDB extends QueryCompiler_PG {
     return body === '' ? '' : sql + body;
   }
 
+  _groupOrder(item, type) {
+    // CockroachDB don't support PostgreSQL order nulls first/last syntax, we take the generic one.
+    return this._basicGroupOrder(item, type);
+  }
+
   whereJsonPath(statement) {
     let castValue = '';
     if (parseInt(statement.value)) {

lib/dialects/oracledb/query/oracledb-querycompiler.js

@@ -8,9 +8,7 @@ const BlobHelper = require('../utils').BlobHelper;
 const { isString } = require('../../../util/is');
 const {
   columnize: columnize_,
-  direction: direction_,
 } = require('../../../formatter/wrappingFormatter');
-const Raw = require('../../../raw');
 
 class Oracledb_Compiler extends Oracle_Compiler {
   // Compiles an "insert" query, allowing for multiple
@@ -318,20 +316,7 @@ class Oracledb_Compiler extends Oracle_Compiler {
   }
 
   _groupOrder(item, type) {
-    const column = super._formatGroupsItemValue(item.value);
-    const direction =
-      type === 'order' && item.type !== 'orderByRaw'
-        ? ` ${direction_(
-            item.direction,
-            this.builder,
-            this.client,
-            this.bindingsHolder
-          )}`
-        : '';
-    if (item.nulls && !(item.value instanceof Raw)) {
-      return `${column}${direction ? direction : ''} nulls ${item.nulls}`;
-    }
-    return column + direction;
+    return super._groupOrderNulls(item, type);
   }
 
   update() {

lib/dialects/postgres/query/pg-querycompiler.js

@@ -217,6 +217,10 @@ class QueryCompiler_PG extends QueryCompiler {
     return lockMode + (tables.length ? ' of ' + this._tableNames(tables) : '');
   }
 
+  _groupOrder(item, type) {
+    return super._groupOrderNulls(item, type);
+  }
+
   forUpdate() {
     return this._lockingClause('for update');
   }

lib/query/querycompiler.js

@@ -1339,7 +1339,7 @@ class QueryCompiler {
     return groupOrder;
   }
 
-  _groupOrder(item, type) {
+  _basicGroupOrder(item, type) {
     const column = this._formatGroupsItemValue(item.value, item.nulls);
     const direction =
       type === 'order' && item.type !== 'orderByRaw'
@@ -1353,6 +1353,27 @@ class QueryCompiler {
     return column + direction;
   }
 
+  _groupOrder(item, type) {
+    return this._basicGroupOrder(item, type);
+  }
+
+  _groupOrderNulls(item, type) {
+    const column = this._formatGroupsItemValue(item.value);
+    const direction =
+      type === 'order' && item.type !== 'orderByRaw'
+        ? ` ${direction_(
+            item.direction,
+            this.builder,
+            this.client,
+            this.bindingsHolder
+          )}`
+        : '';
+    if (item.nulls && !(item.value instanceof Raw)) {
+      return `${column}${direction ? direction : ''} nulls ${item.nulls}`;
+    }
+    return column + direction;
+  }
+
   // Compiles the `order by` statements.
   _groupsOrders(type) {
     const items = this.grouped[type];

test/integration2/query/select/selects.spec.js

@@ -610,19 +610,19 @@ describe('Selects', function () {
             );
             tester(
               'pg',
-              'select "id" from "OrderByNullTest" order by ("null_col" is not null) asc, "string_col" asc',
+              'select "id" from "OrderByNullTest" order by "null_col" asc nulls first, "string_col" asc',
               [],
               [2, 4, 1, 3]
             );
             tester(
               'pgnative',
-              'select "id" from "OrderByNullTest" order by ("null_col" is not null) asc, "string_col" asc',
+              'select "id" from "OrderByNullTest" order by "null_col" asc nulls first, "string_col" asc',
               [],
               [2, 4, 1, 3]
             );
             tester(
               'pg-redshift',
-              'select "id" from "OrderByNullTest" order by ("null_col" is not null) asc, "string_col" asc',
+              'select "id" from "OrderByNullTest" order by "null_col" asc nulls first, "string_col" asc',
               [],
               ['2', '4', '1', '3']
             );
@@ -661,19 +661,19 @@ describe('Selects', function () {
             );
             tester(
               'pg',
-              'select "id" from "OrderByNullTest" order by ("null_col" is null) asc, "string_col" asc',
+              'select "id" from "OrderByNullTest" order by "null_col" asc nulls last, "string_col" asc',
               [],
               [1, 3, 2, 4]
             );
             tester(
               'pgnative',
-              'select "id" from "OrderByNullTest" order by ("null_col" is null) asc, "string_col" asc',
+              'select "id" from "OrderByNullTest" order by "null_col" asc nulls last, "string_col" asc',
               [],
               [1, 3, 2, 4]
             );
             tester(
               'pg-redshift',
-              'select "id" from "OrderByNullTest" order by ("null_col" is null) asc, "string_col" asc',
+              'select "id" from "OrderByNullTest" order by "null_col" asc nulls last, "string_col" asc',
               [],
               ['1', '3', '2', '4']
             );

test/unit/query/builder.js

@@ -5800,10 +5800,10 @@ describe('QueryBuilder', () => {
         sql: 'select * from [users] order by IIF([foo] is null,0,1) desc',
       },
       pg: {
-        sql: 'select * from "users" order by ("foo" is not null) desc',
+        sql: 'select * from "users" order by "foo" desc nulls first',
       },
       'pg-redshift': {
-        sql: 'select * from "users" order by ("foo" is not null) desc',
+        sql: 'select * from "users" order by "foo" desc nulls first',
       },
     });
   });
@@ -5821,10 +5821,10 @@ describe('QueryBuilder', () => {
           sql: 'select * from [users] order by IIF([foo] is null,0,1) desc',
         },
         pg: {
-          sql: 'select * from "users" order by ("foo" is not null) desc',
+          sql: 'select * from "users" order by "foo" desc nulls first',
         },
         'pg-redshift': {
-          sql: 'select * from "users" order by ("foo" is not null) desc',
+          sql: 'select * from "users" order by "foo" desc nulls first',
         },
       }
     );
@@ -5839,10 +5839,10 @@ describe('QueryBuilder', () => {
         sql: 'select * from [users] order by IIF([foo] is null,1,0) desc',
       },
       pg: {
-        sql: 'select * from "users" order by ("foo" is null) desc',
+        sql: 'select * from "users" order by "foo" desc nulls last',
       },
       'pg-redshift': {
-        sql: 'select * from "users" order by ("foo" is null) desc',
+        sql: 'select * from "users" order by "foo" desc nulls last',
       },
     });
   });
@@ -5860,10 +5860,10 @@ describe('QueryBuilder', () => {
           sql: 'select * from [users] order by IIF([foo] is null,1,0) desc',
         },
         pg: {
-          sql: 'select * from "users" order by ("foo" is null) desc',
+          sql: 'select * from "users" order by "foo" desc nulls last',
         },
         'pg-redshift': {
-          sql: 'select * from "users" order by ("foo" is null) desc',
+          sql: 'select * from "users" order by "foo" desc nulls last',
         },
       }
     );