Bug fix: "order by" crash on non real keys when list first field is a…

… relationship (#4791)
keystonejs · Feb 8, 2021 · 45b047a · 45b047a · vercel · Feb 8, 2021
1 parent 208722a
commit 45b047a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/.changeset/many-feet-rule.md b/.changeset/many-feet-rule.md
@@ -0,0 +1,5 @@
+---
+'@keystonejs/adapter-knex': patch
+---
+
+Bug fix: "order by" crash on non real keys when list first field is a relationship
diff --git a/packages/adapter-knex/lib/adapter-knex.js b/packages/adapter-knex/lib/adapter-knex.js
@@ -648,17 +648,25 @@ class QueryBuilder {
         // SELECT ... ORDER BY <orderField>
         const [orderField, orderDirection] = this._getOrderFieldAndDirection(orderBy);
         const sortKey = listAdapter.fieldAdaptersByPath[orderField].sortKey || orderField;
-        this._query.orderBy(sortKey, orderDirection);
+        if (listAdapter.realKeys.includes(sortKey)) {
+          this._query.orderBy(sortKey, orderDirection);
+        }
       }
       if (sortBy !== undefined) {
         // SELECT ... ORDER BY <orderField>[, <orderField>, ...]
         this._query.orderBy(
-          sortBy.map(s => {
-            const [orderField, orderDirection] = this._getOrderFieldAndDirection(s);
-            const sortKey = listAdapter.fieldAdaptersByPath[orderField].sortKey || orderField;
+          sortBy
+            .map(s => {
+              const [orderField, orderDirection] = this._getOrderFieldAndDirection(s);
+              const sortKey = listAdapter.fieldAdaptersByPath[orderField].sortKey || orderField;
 
-            return { column: sortKey, order: orderDirection };
-          })
+              if (listAdapter.realKeys.includes(sortKey)) {
+                return { column: sortKey, order: orderDirection };
+              } else {
+                return undefined;
+              }
+            })
+            .filter(s => typeof s !== 'undefined')
         );
       }
     }