@mikro-orm/knex 6.0.8-dev.16 → 6.0.8-dev.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.8-dev.16",
+  "version": "6.0.8-dev.17",
   "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.0.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.8-dev.16"
+    "@mikro-orm/core": "6.0.8-dev.17"
   }
 }

package/schema/SchemaHelper.d.ts

@@ -27,10 +27,11 @@ export declare abstract class SchemaHelper {
     getDropIndexSQL(tableName: string, index: IndexDef): string;
     getRenameIndexSQL(tableName: string, index: IndexDef, oldIndexName: string): string;
     hasNonDefaultPrimaryKeyName(table: DatabaseTable): boolean;
-    createTableColumn(table: Knex.TableBuilder, column: Column, fromTable: DatabaseTable, changedProperties?: Set<string>): Knex.ColumnBuilder;
+    createTableColumn(table: Knex.TableBuilder, column: Column, fromTable: DatabaseTable, changedProperties?: Set<string>, alter?: boolean): Knex.ColumnBuilder;
     configureColumn(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     configureColumnDefault(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string;
+    getPostAlterTable(tableDiff: TableDifference, safe: boolean): string;
     getAlterColumnAutoincrement(tableName: string, column: Column, schemaName?: string): string;
     getChangeColumnCommentSQL(tableName: string, to: Column, schemaName?: string): string;
     getNamespaces(connection: AbstractSqlConnection): Promise<string[]>;

package/schema/SchemaHelper.js

@@ -104,7 +104,7 @@ class SchemaHelper {
         const defaultName = this.platform.getDefaultPrimaryName(table.name, pkIndex.columnNames);
         return pkIndex?.keyName !== defaultName;
     }
-    createTableColumn(table, column, fromTable, changedProperties) {
+    createTableColumn(table, column, fromTable, changedProperties, alter) {
         const compositePK = fromTable.getPrimaryKey()?.composite;
         if (column.autoincrement && !column.generated && !compositePK && (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
             const primaryKey = !changedProperties && !this.hasNonDefaultPrimaryKeyName(fromTable);
@@ -144,6 +144,9 @@ class SchemaHelper {
     getPreAlterTable(tableDiff, safe) {
         return '';
     }
+    getPostAlterTable(tableDiff, safe) {
+        return '';
+    }
     getAlterColumnAutoincrement(tableName, column, schemaName) {
         return '';
     }

package/schema/SqlSchemaGenerator.d.ts

@@ -37,6 +37,7 @@ export declare class SqlSchemaGenerator extends AbstractSchemaGenerator<Abstract
      * We need to drop foreign keys first for all tables to allow dropping PK constraints.
      */
     private preAlterTable;
+    private postAlterTable;
     private splitTableName;
     private alterTable;
     /**

package/schema/SqlSchemaGenerator.js

@@ -188,7 +188,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
             }
         }
         for (const newTable of Object.values(schemaDiff.newTables)) {
-            ret += await this.dump(this.createTable(newTable));
+            ret += await this.dump(this.createTable(newTable, true));
         }
         for (const newTable of Object.values(schemaDiff.newTables)) {
             ret += await this.dump(this.createSchemaBuilder(newTable.schema).alterTable(newTable.name, table => {
@@ -210,6 +210,11 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
                 ret += await this.dump(builder);
             }
         }
+        for (const changedTable of Object.values(schemaDiff.changedTables)) {
+            for (const builder of this.postAlterTable(changedTable, options.safe)) {
+                ret += await this.dump(builder);
+            }
+        }
         if (options.dropTables && !options.safe) {
             for (const removedNamespace of schemaDiff.removedNamespaces) {
                 ret += await this.dump(this.knex.schema.dropSchema(removedNamespace));
@@ -263,6 +268,12 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         }));
         return ret;
     }
+    postAlterTable(diff, safe) {
+        const ret = [];
+        const push = (sql) => sql ? ret.push(this.knex.schema.raw(sql)) : undefined;
+        push(this.helper.getPostAlterTable(diff, safe));
+        return ret;
+    }
     splitTableName(name) {
         const parts = name.split('.');
         const tableName = parts.pop();
@@ -272,11 +283,19 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
     alterTable(diff, safe) {
         const ret = [];
         const [schemaName, tableName] = this.splitTableName(diff.name);
-        const changedNativeEnums = [];
-        for (const { column, changedProperties } of Object.values(diff.changedColumns)) {
-            if (column.nativeEnumName && changedProperties.has('enumItems') && column.nativeEnumName in diff.fromTable.nativeEnums) {
-                changedNativeEnums.push([column.nativeEnumName, column.enumItems, diff.fromTable.getColumn(column.name).enumItems]);
+        if (this.platform.supportsNativeEnums()) {
+            const changedNativeEnums = [];
+            for (const { column, changedProperties } of Object.values(diff.changedColumns)) {
+                if (column.nativeEnumName && changedProperties.has('enumItems') && column.nativeEnumName in diff.fromTable.nativeEnums) {
+                    changedNativeEnums.push([column.nativeEnumName, column.enumItems, diff.fromTable.getColumn(column.name).enumItems]);
+                }
             }
+            core_1.Utils.removeDuplicates(changedNativeEnums).forEach(([enumName, itemsNew, itemsOld]) => {
+                // postgres allows only adding new items, the values are case insensitive
+                itemsOld = itemsOld.map(v => v.toLowerCase());
+                const newItems = itemsNew.filter(val => !itemsOld.includes(val.toLowerCase()));
+                ret.push(...newItems.map(val => this.knex.schema.raw(this.helper.getAlterNativeEnumSQL(enumName, schemaName, val))));
+            });
         }
         ret.push(this.createSchemaBuilder(schemaName).alterTable(tableName, table => {
             for (const index of Object.values(diff.removedIndexes)) {
@@ -300,7 +319,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         }));
         ret.push(this.createSchemaBuilder(schemaName).alterTable(tableName, table => {
             for (const column of Object.values(diff.addedColumns)) {
-                const col = this.helper.createTableColumn(table, column, diff.fromTable);
+                const col = this.helper.createTableColumn(table, column, diff.fromTable, undefined, true);
                 this.helper.configureColumn(column, col, this.knex);
                 const foreignKey = Object.values(diff.addedForeignKeys).find(fk => fk.columnNames.length === 1 && fk.columnNames[0] === column.name);
                 if (foreignKey && this.options.createForeignKeyConstraints) {
@@ -319,7 +338,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
                 if (changedProperties.size === 1 && changedProperties.has('enumItems') && column.nativeEnumName) {
                     continue;
                 }
-                const col = this.helper.createTableColumn(table, column, diff.fromTable, changedProperties).alter();
+                const col = this.helper.createTableColumn(table, column, diff.fromTable, changedProperties, true).alter();
                 this.helper.configureColumn(column, col, this.knex, changedProperties);
             }
             for (const { column } of Object.values(diff.changedColumns).filter(diff => diff.changedProperties.has('autoincrement'))) {
@@ -366,13 +385,6 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
                 table.comment(comment);
             }
         }));
-        if (this.platform.supportsNativeEnums()) {
-            changedNativeEnums.forEach(([enumName, itemsNew, itemsOld]) => {
-                // postgres allows only adding new items
-                const newItems = itemsNew.filter(val => !itemsOld.includes(val));
-                ret.push(...newItems.map(val => this.knex.schema.raw(this.helper.getAlterNativeEnumSQL(enumName, schemaName, val))));
-            });
-        }
         return ret;
     }
     /**
@@ -422,10 +434,10 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         }
         return builder;
     }
-    createTable(tableDef) {
+    createTable(tableDef, alter) {
         return this.createSchemaBuilder(tableDef.schema).createTable(tableDef.name, table => {
             tableDef.getColumns().forEach(column => {
-                const col = this.helper.createTableColumn(table, column, tableDef);
+                const col = this.helper.createTableColumn(table, column, tableDef, undefined, alter);
                 this.helper.configureColumn(column, col, this.knex);
             });
             for (const index of tableDef.getIndexes()) {