fix(databases): pin the grid sort tie breaker to the sort direction

package.json

@@ -51,7 +51,7 @@
         "flatted": "^3.4.2",
         "ignore": "^6.0.2",
         "json5": "^2.2.3",
-        "nanoid": "^5.1.11",
+        "nanoid": "^5.1.16",
         "nanotar": "^0.3.0",
         "pretty-bytes": "^6.1.1",
         "remarkable": "^2.0.1",
@@ -113,6 +113,6 @@
         "picomatch": "^4.0.4",
         "cookie": "^0.7.0",
         "ws": "^8.21.0",
-        "postcss": "^8.5.18"
+        "postcss": "^8.5.26"
     }
 }

src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte

@@ -37,7 +37,12 @@
     import { formatNumberWithCommas } from '$lib/helpers/numbers';
     import { chunks } from '$lib/helpers/array';
     import { mapToQueryParams } from '$lib/components/filters/store';
-    import { expandTabs, buildWildcardEntitiesQuery } from '$database/store';
+    import {
+        expandTabs,
+        buildWildcardEntitiesQuery,
+        orderMethod,
+        orderTieBreaker
+    } from '$database/store';
     import { setupUnsavedChangesGuard } from '$lib/helpers/unsavedChanges';
     import { mockSuggestions } from '$database/(suggestions)';
     import {
@@ -265,7 +270,7 @@
 
         if (parsedQueries.size > 0) {
             for (const [tagValue, queryString] of parsedQueries.entries()) {
-                if (queryString.includes('orderAsc') || queryString.includes('orderDesc')) {
+                if (orderMethod(queryString)) {
                     parsedQueries.delete(tagValue);
                 }
             }
@@ -491,12 +496,15 @@
         }
     }
 
-    function getCorrectOrderQuery() {
-        return $sortState?.column && $sortState?.direction !== 'default'
-            ? $sortState.direction === 'asc'
-                ? Query.orderAsc($sortState.column)
-                : Query.orderDesc($sortState.column)
-            : Query.orderDesc('');
+    function getCorrectOrderQueries() {
+        const order =
+            $sortState?.column && $sortState?.direction !== 'default'
+                ? $sortState.direction === 'asc'
+                    ? Query.orderAsc($sortState.column)
+                    : Query.orderDesc($sortState.column)
+                : Query.orderDesc('');
+
+        return [order, ...orderTieBreaker(order)];
     }
 
     async function loadPage(pageNumber: number): Promise<boolean> {
@@ -512,7 +520,7 @@
             databaseId,
             collectionId,
             queries: [
-                getCorrectOrderQuery(),
+                ...getCorrectOrderQueries(),
                 Query.limit(SPREADSHEET_PAGE_LIMIT),
                 Query.offset(pageToOffset(pageNumber, SPREADSHEET_PAGE_LIMIT)),
                 ...filterQueries /* filter queries */,
@@ -538,7 +546,7 @@
                 databaseId,
                 collectionId,
                 queries: [
-                    getCorrectOrderQuery(),
+                    ...getCorrectOrderQueries(),
                     Query.limit(SPREADSHEET_PAGE_LIMIT),
                     Query.offset(pageToOffset(targetPageNum, SPREADSHEET_PAGE_LIMIT)),
                     ...buildWildcardEntitiesQuery(collection)

src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts

@@ -161,40 +161,65 @@ export function buildWildcardEntitiesQuery(entity: Entity | null = null): string
     ];
 }
 
+/**
+ * A filter can carry `orderAsc` or `orderDesc` inside its value, so match on the
+ * query's method rather than searching the serialized query for the substring.
+ */
+export function orderMethod(query: string): string | null {
+    const { method } = JSON.parse(query);
+
+    return method === 'orderAsc' || method === 'orderDesc' ? method : null;
+}
+
 export function extractSortFromQueries(parsedQueries: Map<TagValue, string>) {
     for (const [tagValue, queryString] of parsedQueries.entries()) {
-        if (queryString.includes('orderAsc') || queryString.includes('orderDesc')) {
-            const isAsc = queryString.includes('orderAsc');
+        const method = orderMethod(queryString);
+
+        if (method) {
             return {
                 column: tagValue.value,
-                direction: isAsc ? 'asc' : 'desc'
+                direction: method === 'orderAsc' ? 'asc' : 'desc'
             };
         }
     }
 
     return { column: null, direction: 'default' };
 }
 
+/**
+ * The API appends `$sequence` to any sort without a unique attribute, but always
+ * ascending. A lone descending sort therefore becomes `column DESC, _id ASC`, a
+ * direction mix neither scan direction of the index can serve, so the engine
+ * filesorts the whole table. Pin the tie breaker to the sort's own direction.
+ */
+export function orderTieBreaker(order: string): string[] {
+    const { method, attribute } = JSON.parse(order);
+    const needsTieBreaker = attribute && attribute !== '$id' && attribute !== '$sequence';
+
+    return needsTieBreaker && method === 'orderDesc' ? [Query.orderDesc('$sequence')] : [];
+}
+
 export function buildGridQueries(
     limit: number,
     offset: number,
     parsedQueries: Map<TagValue, string>,
     table: Entity,
     includeRelationships: boolean = true
 ) {
-    const hasOrderQuery = Array.from(parsedQueries.values()).some(
-        (q) => q.includes('orderAsc') || q.includes('orderDesc')
+    const orderQuery = Array.from(parsedQueries.values()).find(
+        (query) => orderMethod(query) !== null
     );
 
     const queryArray = [Query.limit(limit), Query.offset(offset)];
 
     // don't override if there's a user created sort!
-    if (!hasOrderQuery) {
+    if (!orderQuery) {
         queryArray.push(Query.orderDesc(''));
     }
 
     queryArray.push(
         ...parsedQueries.values(),
+        ...(orderQuery ? orderTieBreaker(orderQuery) : []),
         ...(includeRelationships ? buildWildcardEntitiesQuery(table) : [Query.select(['*'])])
     );
 

src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte

@@ -98,6 +98,8 @@
         expandTabs,
         type Columns,
         buildWildcardEntitiesQuery,
+        orderMethod,
+        orderTieBreaker,
         loadGridRows,
         type SortState,
         randomDataModalState,
@@ -394,7 +396,7 @@
 
         if (parsedQueries.size > 0) {
             for (const [tagValue, queryString] of parsedQueries.entries()) {
-                if (queryString.includes('orderAsc') || queryString.includes('orderDesc')) {
+                if (orderMethod(queryString)) {
                     parsedQueries.delete(tagValue);
                 }
             }
@@ -709,12 +711,15 @@
         }
     }
 
-    function getCorrectOrderQuery() {
-        return $sortState?.column && $sortState?.direction !== 'default'
-            ? $sortState.direction === 'asc'
-                ? Query.orderAsc($sortState.column)
-                : Query.orderDesc($sortState.column)
-            : Query.orderDesc('');
+    function getCorrectOrderQueries() {
+        const order =
+            $sortState?.column && $sortState?.direction !== 'default'
+                ? $sortState.direction === 'asc'
+                    ? Query.orderAsc($sortState.column)
+                    : Query.orderDesc($sortState.column)
+                : Query.orderDesc('');
+
+        return [order, ...orderTieBreaker(order)];
     }
 
     async function loadPage(pageNumber: number): Promise<boolean> {
@@ -730,7 +735,7 @@
         const loadedRows = await loadGridRows(
             table,
             (includeRelationships) => [
-                getCorrectOrderQuery(),
+                ...getCorrectOrderQueries(),
                 Query.limit(SPREADSHEET_PAGE_LIMIT),
                 Query.offset(pageToOffset(pageNumber, SPREADSHEET_PAGE_LIMIT)),
                 ...filterQueries /* filter queries */,
@@ -761,7 +766,7 @@
             const loadedRows = await loadGridRows(
                 table,
                 (includeRelationships) => [
-                    getCorrectOrderQuery(),
+                    ...getCorrectOrderQueries(),
                     Query.limit(SPREADSHEET_PAGE_LIMIT),
                     Query.offset(pageToOffset(targetPageNum, SPREADSHEET_PAGE_LIMIT)),
                     ...(includeRelationships