@mikro-orm/knex 6.3.5-dev.9 → 6.3.6-dev.0

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/README.md

@@ -143,7 +143,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
 - [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
-- [Lifecycle Hooks](https://mikro-orm.io/docs/lifecycle-hooks)
+- [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
 - [Schema Generator](https://mikro-orm.io/docs/schema-generator)
 - [Entity Generator](https://mikro-orm.io/docs/entity-generator)
@@ -163,6 +163,7 @@ You can find example integrations for some popular frameworks in the [`mikro-orm
 - [NextJS + MySQL](https://github.com/jonahallibone/mikro-orm-nextjs)
 - [Accounts.js REST and GraphQL authentication + SQLite](https://github.com/darkbasic/mikro-orm-accounts-example)
 - [Nest + Shopify + PostgreSQL + GraphQL](https://github.com/Cloudshelf/Shopify_CSConnector)
+- [Elysia.js + libSQL + Bun](https://github.com/mikro-orm/elysia-bun-example-app)
 
 ### JavaScript Examples 
 

package/dialects/mysql/MySqlPlatform.d.ts

@@ -16,6 +16,11 @@ export declare class MySqlPlatform extends AbstractSqlPlatform {
     convertJsonToDatabaseValue(value: unknown, context?: TransformContext): unknown;
     getJsonIndexDefinition(index: IndexDef): string[];
     getBooleanTypeDeclarationSQL(): string;
+    normalizeColumnType(type: string, options?: {
+        length?: number;
+        precision?: number;
+        scale?: number;
+    }): string;
     getDefaultMappedType(type: string): Type<unknown>;
     supportsUnsigned(): boolean;
     /**

package/dialects/mysql/MySqlPlatform.js

@@ -36,6 +36,13 @@ class MySqlPlatform extends AbstractSqlPlatform_1.AbstractSqlPlatform {
     getBooleanTypeDeclarationSQL() {
         return 'tinyint(1)';
     }
+    normalizeColumnType(type, options = {}) {
+        const simpleType = this.extractSimpleType(type);
+        if (['decimal', 'numeric'].includes(simpleType)) {
+            return this.getDecimalTypeDeclarationSQL(options);
+        }
+        return type;
+    }
     getDefaultMappedType(type) {
         if (type === 'tinyint(1)') {
             return super.getDefaultMappedType('boolean');

package/dialects/sqlite/BaseSqlitePlatform.d.ts

@@ -36,6 +36,11 @@ export declare abstract class BaseSqlitePlatform extends AbstractSqlPlatform {
     getVarcharTypeDeclarationSQL(column: {
         length?: number;
     }): string;
+    normalizeColumnType(type: string, options?: {
+        length?: number;
+        precision?: number;
+        scale?: number;
+    }): string;
     convertsJsonAutomatically(): boolean;
     /**
      * This is used to narrow the value of Date properties as they will be stored as timestamps in sqlite.

package/dialects/sqlite/BaseSqlitePlatform.js

@@ -44,6 +44,13 @@ class BaseSqlitePlatform extends AbstractSqlPlatform_1.AbstractSqlPlatform {
     getVarcharTypeDeclarationSQL(column) {
         return 'text';
     }
+    normalizeColumnType(type, options = {}) {
+        const simpleType = this.extractSimpleType(type);
+        if (['varchar', 'text'].includes(simpleType)) {
+            return this.getVarcharTypeDeclarationSQL(options);
+        }
+        return simpleType;
+    }
     convertsJsonAutomatically() {
         return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.5-dev.9",
+  "version": "6.3.6-dev.0",
   "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",
@@ -63,10 +63,10 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.3.4"
+    "@mikro-orm/core": "^6.3.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.5-dev.9",
+    "@mikro-orm/core": "6.3.6-dev.0",
     "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;
             }
@@ -594,6 +591,11 @@ class DatabaseTable {
         const unique = compositeFkUniques[prop] || this.indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && idx.unique && !idx.primary);
         const kind = this.getReferenceKind(fk, unique);
         const runtimeType = this.getPropertyTypeForColumn(namingStrategy, column, fk);
+        const type = fk ? runtimeType : (core_1.Utils.keys(core_1.t).find(k => {
+            const typeInCoreMap = this.platform.getMappedType(k);
+            return (typeInCoreMap !== core_1.Type.getType(core_1.UnknownType) || k === 'unknown') && typeInCoreMap === column.mappedType;
+        }) ?? runtimeType);
+        const ignoreSchemaChanges = (type === 'unknown' && column.length) ? (column.extra ? ['type', 'extra'] : ['type']) : undefined;
         const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, runtimeType, true);
         const defaultParsed = this.getPropertyDefaultValue(schemaHelper, column, runtimeType);
         const defaultTs = defaultRaw !== defaultParsed ? defaultParsed : undefined;
@@ -608,12 +610,10 @@ class DatabaseTable {
         }
         return {
             name: prop,
-            type: fk ? runtimeType : (core_1.Utils.keys(core_1.t).find(k => {
-                const typeInCoreMap = this.platform.getMappedType(k);
-                return (typeInCoreMap !== core_1.Type.getType(core_1.UnknownType) || k === 'unknown') && typeInCoreMap === column.mappedType;
-            }) ?? runtimeType),
+            type,
             runtimeType,
             kind,
+            ignoreSchemaChanges,
             generated: column.generated,
             optional: defaultRaw !== 'null' || defaultTs != null || typeof column.generated !== 'undefined',
             columnType: column.type,

package/schema/SchemaComparator.js

@@ -385,9 +385,9 @@ class SchemaComparator {
         const changedProperties = new Set();
         const fromProp = this.mapColumnToProperty({ ...fromColumn, autoincrement: false });
         const toProp = this.mapColumnToProperty({ ...toColumn, autoincrement: false });
-        const fromColumnType = fromColumn.mappedType.getColumnType(fromProp, this.platform).toLowerCase();
+        const fromColumnType = this.platform.normalizeColumnType(fromColumn.mappedType.getColumnType(fromProp, this.platform).toLowerCase(), fromProp);
         const fromNativeEnum = fromTable.nativeEnums[fromColumnType] ?? Object.values(fromTable.nativeEnums).find(e => e.name === fromColumnType && e.schema !== '*');
-        const toColumnType = toColumn.mappedType.getColumnType(toProp, this.platform).toLowerCase();
+        const toColumnType = this.platform.normalizeColumnType(toColumn.mappedType.getColumnType(toProp, this.platform).toLowerCase(), toProp);
         const log = (msg, params) => {
             if (tableName) {
                 const copy = core_1.Utils.copy(params);