Merge pull request #192 from plainblack/db_sorting_duplicates

Always fall back to sorting the list by the id, so that duplicate ent…
plainblack · Oct 1, 2024 · 8d958d1 · 8d958d1
2 parents 2f28602 + 6f1cf33
commit 8d958d1
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/ving/record/VingRecord.mjs b/ving/record/VingRecord.mjs
@@ -855,12 +855,19 @@ export class VingKind {
         where
     ) {
         const sortMethod = (params.sortOrder == 'desc') ? desc : asc;
-        let orderBy = [sortMethod(this.table.createdAt)];
+        let orderBy = [sortMethod(this.table.createdAt), sortMethod(this.table.id)];
         if (params.sortBy) {
             const cols = [];
+            let hasIdSortField = false;
             for (const field of params.sortBy) {
+                if (field == 'id') {
+                    hasIdSortField = true;
+                }
                 cols.push(sortMethod(this.table[field]));
             }
+            if (!hasIdSortField) {
+                cols.push(sortMethod(this.table.id));
+            }
             orderBy = cols;
         }
         const itemsPerPage = isUndefined(params?.itemsPerPage) || params?.itemsPerPage > 100 || params?.itemsPerPage < 1 ? 10 : params.itemsPerPage;