@mikro-orm/knex 6.3.5-dev.10 → 6.3.5-dev.12

package/AbstractSqlDriver.js

@@ -135,11 +135,19 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             .indexHint(options.indexHint)
             .comment(options.comments)
             .hintComment(options.hintComments);
+        const { first, last, before, after } = options;
+        const isCursorPagination = [first, last, before, after].some(v => v != null);
         if (type !== query_1.QueryType.COUNT) {
-            qb.limit(options?.limit, options?.offset);
             if (options.orderBy) {
-                qb.orderBy(options.orderBy);
+                if (isCursorPagination) {
+                    const { orderBy: newOrderBy, where } = this.processCursorOptions(meta, options, options.orderBy);
+                    qb.andWhere(where).orderBy(newOrderBy);
+                }
+                else {
+                    qb.orderBy(options.orderBy);
+                }
             }
+            qb.limit(options?.limit, options?.offset);
         }
         qb.where(where);
         const kqb = qb.getKnexQuery(false).clear('select');
@@ -154,6 +162,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (type === query_1.QueryType.COUNT) {
             return res[0].count;
         }
+        if (isCursorPagination && !first && !!last) {
+            res.reverse();
+        }
         return res.map(row => this.mapResult(row, meta));
     }
     mapResult(result, meta, populate = [], qb, map = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.5-dev.10",
+  "version": "6.3.5-dev.12",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.3.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.5-dev.10",
+    "@mikro-orm/core": "6.3.5-dev.12",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/schema/DatabaseTable.js

@@ -421,12 +421,9 @@ class DatabaseTable {
     findFkIndex(currentFk) {
         const fkColumnsLength = currentFk.columnNames.length;
         const possibleIndexes = this.indexes.filter(index => {
-            return index.columnNames.length >= fkColumnsLength && !currentFk.columnNames.some((columnName, i) => index.columnNames[i] !== columnName);
+            return index.columnNames.length === fkColumnsLength && !currentFk.columnNames.some((columnName, i) => index.columnNames[i] !== columnName);
         });
         possibleIndexes.sort((a, b) => {
-            if (a.columnNames.length !== b.columnNames.length) {
-                return a.columnNames.length < b.columnNames.length ? -1 : 1;
-            }
             if (a.primary !== b.primary) {
                 return a.primary ? -1 : 1;
             }