@mikro-orm/knex 6.1.13-dev.6 → 6.1.13-dev.8

package/index.mjs

@@ -56,6 +56,7 @@ export const DateType = mod.DateType;
 export const DeadlockException = mod.DeadlockException;
 export const DecimalType = mod.DecimalType;
 export const DefaultLogger = mod.DefaultLogger;
+export const DeferMode = mod.DeferMode;
 export const DoubleType = mod.DoubleType;
 export const DriverException = mod.DriverException;
 export const EagerProps = mod.EagerProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.13-dev.6",
+  "version": "6.1.13-dev.8",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^6.1.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.13-dev.6"
+    "@mikro-orm/core": "6.1.13-dev.8"
   }
 }

package/schema/DatabaseTable.js

@@ -123,6 +123,9 @@ class DatabaseTable {
             if (prop.updateRule || prop.cascade.includes(core_1.Cascade.PERSIST) || prop.cascade.includes(core_1.Cascade.ALL)) {
                 this.foreignKeys[constraintName].updateRule = prop.updateRule || 'cascade';
             }
+            if (prop.deferMode) {
+                this.foreignKeys[constraintName].deferMode = prop.deferMode;
+            }
         }
         if (prop.index) {
             this.indexes.push({
@@ -473,6 +476,7 @@ class DatabaseTable {
         fkOptions.referencedColumnNames = fk.referencedColumnNames;
         fkOptions.updateRule = fk.updateRule?.toLowerCase();
         fkOptions.deleteRule = fk.deleteRule?.toLowerCase();
+        fkOptions.deferMode = fk.deferMode;
         fkOptions.columnTypes = fk.columnNames.map(c => this.getColumn(c).type);
         const columnOptions = {};
         if (fk.columnNames.length === 1) {
@@ -520,6 +524,7 @@ class DatabaseTable {
             fkOptions.referencedColumnNames = fk.referencedColumnNames;
             fkOptions.updateRule = fk.updateRule?.toLowerCase();
             fkOptions.deleteRule = fk.deleteRule?.toLowerCase();
+            fkOptions.deferMode = fk.deferMode;
         }
         return {
             name: prop,

package/schema/SchemaComparator.js

@@ -348,6 +348,9 @@ class SchemaComparator {
         if (key1.referencedTableName !== key2.referencedTableName) {
             return true;
         }
+        if (key1.deferMode !== key2.deferMode) {
+            return true;
+        }
         const defaultRule = ['restrict', 'no action'];
         const rule = (key, method) => {
             return (key[method] ?? defaultRule[0]).toLowerCase().replace(defaultRule[1], defaultRule[0]);

package/schema/SchemaHelper.js

@@ -199,6 +199,7 @@ class SchemaHelper {
                     referencedColumnNames: [fk.referenced_column_name],
                     updateRule: fk.update_rule.toLowerCase(),
                     deleteRule: fk.delete_rule.toLowerCase(),
+                    deferMode: fk.defer_mode,
                 };
             }
             return ret;

package/schema/SqlSchemaGenerator.js

@@ -272,6 +272,9 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         if (foreignKey.deleteRule) {
             builder.onDelete(foreignKey.deleteRule);
         }
+        if (foreignKey.deferMode) {
+            builder.deferrable(foreignKey.deferMode);
+        }
     }
     /**
      * We need to drop foreign keys first for all tables to allow dropping PK constraints.

package/typings.d.ts

@@ -1,5 +1,5 @@
+import type { DeferMode, CheckCallback, Dictionary, EntityProperty, GroupOperator, RawQueryFragment, QBFilterQuery, QueryOrderMap, Type, QueryFlag, AnyEntity, EntityName } from '@mikro-orm/core';
 import type { Knex } from 'knex';
-import type { CheckCallback, Dictionary, EntityProperty, GroupOperator, RawQueryFragment, QBFilterQuery, QueryOrderMap, Type, QueryFlag, AnyEntity, EntityName } from '@mikro-orm/core';
 import type { JoinType, QueryType } from './query/enums';
 import type { DatabaseSchema, DatabaseTable } from './schema';
 export interface Table {
@@ -57,6 +57,7 @@ export interface ForeignKey {
     referencedColumnNames: string[];
     updateRule?: string;
     deleteRule?: string;
+    deferMode?: DeferMode;
 }
 export interface IndexDef {
     columnNames: string[];