@mikro-orm/knex 6.0.0-dev.22 → 6.0.0-dev.24

package/AbstractSqlDriver.js

@@ -29,16 +29,25 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false);
         const fields = this.buildFields(meta, populate, joinedProps, qb, options.fields);
         const joinedPropsOrderBy = this.buildJoinedPropsOrderBy(entityName, qb, meta, joinedProps);
+        const orderBy = [...core_1.Utils.asArray(options.orderBy), ...joinedPropsOrderBy];
         if (core_1.Utils.isPrimaryKey(where, meta.compositePK)) {
             where = { [core_1.Utils.getPrimaryKeyHash(meta.primaryKeys)]: where };
         }
+        const { first, last, before, after } = options;
+        const isCursorPagination = [first, last, before, after].some(v => v != null);
         qb.select(fields)
             .populate(populate, joinedProps.length > 0 ? options.populateWhere : undefined)
             .where(where)
-            .orderBy([...core_1.Utils.asArray(options.orderBy), ...joinedPropsOrderBy])
             .groupBy(options.groupBy)
             .having(options.having)
             .withSchema(this.getSchemaName(meta, options));
+        if (isCursorPagination) {
+            const { orderBy: newOrderBy, where } = this.processCursorOptions(meta, options, orderBy);
+            qb.andWhere(where).orderBy(newOrderBy);
+        }
+        else {
+            qb.orderBy(orderBy);
+        }
         if (options.limit !== undefined) {
             qb.limit(options.limit, options.offset);
         }
@@ -47,6 +56,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         core_1.Utils.asArray(options.flags).forEach(flag => qb.setFlag(flag));
         const result = await this.rethrow(qb.execute('all'));
+        if (isCursorPagination && !first && !!last) {
+            result.reverse();
+        }
         if (joinedProps.length > 0) {
             return this.mergeJoinedResult(result, meta);
         }
@@ -674,7 +686,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         });
         /* istanbul ignore else */
         if (this.platform.allowsMultiInsert()) {
-            await this.nativeInsertMany(prop.pivotEntity, items, { ...options, convertCustomTypes: false, processCollections: false });
+            await this.nativeInsertMany(prop.pivotEntity, items, {
+                ...options,
+                convertCustomTypes: false,
+                processCollections: false,
+            });
         }
         else {
             await core_1.Utils.runSerial(items, item => {
@@ -747,7 +763,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             return;
         }
         if (prop.fieldNames) {
-            ret.push(prop.fieldNames[0]);
+            ret.push(...prop.fieldNames);
         }
     }
     buildFields(meta, populate, joinedProps, qb, fields) {

package/index.mjs

@@ -36,6 +36,7 @@ export const ConnectionException = mod.ConnectionException;
 export const ConstraintViolationException = mod.ConstraintViolationException;
 export const CriteriaNode = mod.CriteriaNode;
 export const CriteriaNodeFactory = mod.CriteriaNodeFactory;
+export const Cursor = mod.Cursor;
 export const DatabaseDriver = mod.DatabaseDriver;
 export const DatabaseObjectExistsException = mod.DatabaseObjectExistsException;
 export const DatabaseObjectNotFoundException = mod.DatabaseObjectNotFoundException;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.22",
+  "version": "6.0.0-dev.24",
   "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",
@@ -59,13 +59,13 @@
   },
   "dependencies": {
     "fs-extra": "11.1.0",
-    "knex": "2.4.0",
+    "knex": "2.4.2",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.6.6"
+    "@mikro-orm/core": "^5.6.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.22"
+    "@mikro-orm/core": "~6.0.0-dev.24"
   }
 }