@mikro-orm/knex 6.2.10-dev.0 → 6.2.10-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.10-dev.0",
+  "version": "6.2.10-dev.2",
   "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.2.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.10-dev.0",
+    "@mikro-orm/core": "6.2.10-dev.2",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/schema/DatabaseTable.d.ts

@@ -1,4 +1,4 @@
-import { type Configuration, type Dictionary, type EntityMetadata, type EntityProperty, type NamingStrategy } from '@mikro-orm/core';
+import { type Configuration, type DeferMode, type Dictionary, type EntityMetadata, type EntityProperty, type NamingStrategy } from '@mikro-orm/core';
 import type { SchemaHelper } from './SchemaHelper';
 import type { CheckDef, Column, ForeignKey, IndexDef } from '../typings';
 import type { AbstractSqlPlatform } from '../AbstractSqlPlatform';
@@ -58,6 +58,7 @@ export declare class DatabaseTable {
         name?: string;
         type?: string;
         expression?: string;
+        deferMode?: DeferMode;
         options?: Dictionary;
     }, type: 'index' | 'unique' | 'primary'): void;
     addCheck(check: CheckDef): void;

package/schema/DatabaseTable.js

@@ -482,7 +482,7 @@ class DatabaseTable {
     getForeignKeyDeclaration(fk, namingStrategy, schemaHelper, fkIndex, nullable, propNameBase) {
         const prop = this.getPropertyName(namingStrategy, propNameBase, fk);
         const kind = (fkIndex?.unique && !fkIndex.primary) ? this.getReferenceKind(fk, fkIndex) : this.getReferenceKind(fk);
-        const type = this.getPropertyTypeForForeignKey(namingStrategy, fk);
+        const runtimeType = this.getPropertyTypeForForeignKey(namingStrategy, fk);
         const fkOptions = {};
         fkOptions.fieldNames = fk.columnNames;
         fkOptions.referencedTableName = fk.referencedTableName;
@@ -510,7 +510,8 @@ class DatabaseTable {
         }
         return {
             name: prop,
-            type,
+            type: runtimeType,
+            runtimeType,
             kind,
             ...columnOptions,
             nullable,
@@ -526,9 +527,9 @@ class DatabaseTable {
         const index = compositeFkIndexes[prop] || this.indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && !idx.unique && !idx.primary);
         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 type = this.getPropertyTypeForColumn(namingStrategy, column, fk);
-        const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, type, true);
-        const defaultParsed = this.getPropertyDefaultValue(schemaHelper, column, type);
+        const runtimeType = this.getPropertyTypeForColumn(namingStrategy, column, fk);
+        const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, runtimeType, true);
+        const defaultParsed = this.getPropertyDefaultValue(schemaHelper, column, runtimeType);
         const defaultTs = defaultRaw !== defaultParsed ? defaultParsed : undefined;
         const fkOptions = {};
         if (fk) {
@@ -541,7 +542,8 @@ class DatabaseTable {
         }
         return {
             name: prop,
-            type,
+            type: fk ? runtimeType : (core_1.Utils.entries(core_1.t).find(([k, v]) => Object.getPrototypeOf(column.mappedType) === v.prototype)?.[0] ?? runtimeType),
+            runtimeType,
             kind,
             generated: column.generated,
             optional: defaultRaw !== 'null' || defaultTs != null || typeof column.generated !== 'undefined',
@@ -657,6 +659,7 @@ class DatabaseTable {
             type: index.type,
             expression: index.expression,
             options: index.options,
+            deferMode: index.deferMode,
         });
     }
     addCheck(check) {