Fix support for array of complex orderBys through find

vampirical · Mar 7, 2024 · 591e36e · 591e36e
1 parent 7a35da7
commit 591e36e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/Record.js b/src/Record.js
@@ -1,6 +1,6 @@
 'use strict';
 /* eslint-disable no-console */
-const {connective: connectiveDefs, type, valueNow} = require('./constants');
+const {connective: connectiveDefs, sort, type, valueNow} = require('./constants');
 const {
   FieldNotFoundError,
   IncorrectFieldsError,
@@ -150,7 +150,11 @@ class Record extends Object {
         instance.offset(offset);
       }
       if (orderBy) {
-        instance.orderBy(orderBy);
+        if (Array.isArray(orderBy) && !Object.values(sort).includes(orderBy[1])) {
+          instance.orderBy(...orderBy);
+        } else {
+          instance.orderBy(orderBy);
+        }
       }
       instance.options(options);
     }

diff --git a/src/RecordQuery.js b/src/RecordQuery.js
@@ -226,11 +226,9 @@ class RecordQuery extends Object {
    * @returns {RecordQuery}
    */
   orderBy(...orderBys) {
-    const hasMultiple = Array.isArray(orderBys[0]);
-    if (hasMultiple) {
-      Array.prototype.push.apply(this.orderBys, orderBys);
-    } else {
-      this.orderBys.push(orderBys);
+    for (const orderBy of orderBys) {
+      const expanded = !Array.isArray(orderBy) ? [orderBy] : orderBy;
+      this.orderBys.push(expanded);
     }
 
     this.setLoaded(false);

diff --git a/tests/RecordQuery.js b/tests/RecordQuery.js
@@ -938,6 +938,21 @@ test('order by multiple flat', async(t) => {
   t.is(q.rows[1].aFlag, false);
 });
 
+test('order by multiple nested array', async(t) => {
+  const rows = await QueryTestRecord.find(
+    pool,
+    {aNumber: [100, 101], aFlag: SQL.valueNotNull},
+    {orderBy: [['aNumber', SQL.sort.desc], ['aFlag', SQL.sort.desc]]}
+  );
+
+  t.is(rows[0].aNumber, 101);
+  t.is(rows[1].aNumber, 101);
+  t.is(rows[2].aNumber, 100);
+  t.is(rows[3].aNumber, 100);
+  t.is(rows[0].aFlag, true);
+  t.is(rows[1].aFlag, false);
+});
+
 test('changing criteria marks as unloaded', async (t) => {
   const q = await new SQL.RecordQuery(pool, QueryTestRecord, {output: SQL.outputType.object})
     .where({aNumber: 100})