@mikro-orm/knex 6.4.3-dev.9 → 6.4.3

package/dialects/mysql/MySqlPlatform.d.ts

@@ -22,6 +22,7 @@ export declare class MySqlPlatform extends AbstractSqlPlatform {
         scale?: number;
     }): string;
     getDefaultMappedType(type: string): Type<unknown>;
+    isNumericColumn(mappedType: Type<unknown>): boolean;
     supportsUnsigned(): boolean;
     /**
      * Returns the default name of index for the given columns

package/dialects/mysql/MySqlPlatform.js

@@ -49,6 +49,9 @@ class MySqlPlatform extends AbstractSqlPlatform_1.AbstractSqlPlatform {
         }
         return super.getDefaultMappedType(type);
     }
+    isNumericColumn(mappedType) {
+        return super.isNumericColumn(mappedType) || [core_1.DecimalType, core_1.DoubleType].some(t => mappedType instanceof t);
+    }
     supportsUnsigned() {
         return true;
     }

package/dialects/sqlite/SqliteTableCompiler.d.ts

@@ -2,4 +2,5 @@ import type { Dictionary } from '@mikro-orm/core';
 import { MonkeyPatchable } from '../../MonkeyPatchable';
 export declare class SqliteTableCompiler extends MonkeyPatchable.Sqlite3DialectTableCompiler {
     foreign(this: any, foreignInfo: Dictionary): void;
+    foreignKeys(this: any): string;
 }

package/dialects/sqlite/SqliteTableCompiler.js

@@ -41,5 +41,31 @@ class SqliteTableCompiler extends MonkeyPatchable_1.MonkeyPatchable.Sqlite3Diale
             });
         }
     }
+    foreignKeys() {
+        let sql = '';
+        const foreignKeys = (this.grouped.alterTable || []).filter((o) => o.method === 'foreign');
+        for (let i = 0, l = foreignKeys.length; i < l; i++) {
+            const foreign = foreignKeys[i].args[0];
+            const column = this.formatter.columnize(foreign.column);
+            const references = this.formatter.columnize(foreign.references);
+            const foreignTable = this.formatter.wrap(foreign.inTable);
+            /* istanbul ignore next */
+            let constraintName = foreign.keyName || '';
+            if (constraintName) {
+                constraintName = ' constraint ' + this.formatter.wrap(constraintName);
+            }
+            sql += `,${constraintName} foreign key(${column}) references ${foreignTable}(${references})`;
+            if (foreign.onDelete) {
+                sql += ` on delete ${foreign.onDelete}`;
+            }
+            if (foreign.onUpdate) {
+                sql += ` on update ${foreign.onUpdate}`;
+            }
+            if (foreign.deferrable) {
+                sql += ` deferrable initially ${foreign.deferrable}`;
+            }
+        }
+        return sql;
+    }
 }
 exports.SqliteTableCompiler = SqliteTableCompiler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.3-dev.9",
+  "version": "6.4.3",
   "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.4.2"
+    "@mikro-orm/core": "^6.4.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.3-dev.9",
+    "@mikro-orm/core": "^6.0.0",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -1252,7 +1252,7 @@ class QueryBuilder {
     }
     wrapPaginateSubQuery(meta) {
         const pks = this.prepareFields(meta.primaryKeys, 'sub-query');
-        const subQuery = this.clone(['_orderBy', '_fields']).select(pks).groupBy(pks).limit(this._limit);
+        const subQuery = this.clone(['_orderBy', '_fields', 'lockMode', 'lockTableAliases']).select(pks).groupBy(pks).limit(this._limit);
         // revert the on conditions added via populateWhere, we want to apply those only once
         for (const join of Object.values(subQuery._joins)) {
             if (join.cond_) {