@mikro-orm/knex 6.3.13-dev.7 → 6.3.13-dev.9

package/package.json

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

package/schema/SchemaComparator.js

@@ -390,7 +390,7 @@ class SchemaComparator {
         const toProp = this.mapColumnToProperty({ ...toColumn, autoincrement: false });
         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 = this.platform.normalizeColumnType(toColumn.mappedType.getColumnType(toProp, this.platform).toLowerCase(), toProp);
+        let 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);
@@ -402,8 +402,13 @@ class SchemaComparator {
             (!fromNativeEnum || `${fromNativeEnum.schema}.${fromNativeEnum.name}` !== toColumnType) &&
             !(fromColumn.ignoreSchemaChanges?.includes('type') || toColumn.ignoreSchemaChanges?.includes('type')) &&
             !fromColumn.generated && !toColumn.generated) {
-            log(`'type' changed for column ${tableName}.${fromColumn.name}`, { fromColumnType, toColumnType });
-            changedProperties.add('type');
+            if (!toColumnType.includes('.') && fromTable.schema && fromTable.schema !== this.platform.getDefaultSchemaName()) {
+                toColumnType = `${fromTable.schema}.${toColumnType}`;
+            }
+            if (fromColumnType !== toColumnType) {
+                log(`'type' changed for column ${tableName}.${fromColumn.name}`, { fromColumnType, toColumnType });
+                changedProperties.add('type');
+            }
         }
         if (fromColumn.nullable !== toColumn.nullable && !fromColumn.generated && !toColumn.generated) {
             log(`'nullable' changed for column ${tableName}.${fromColumn.name}`, { fromColumn, toColumn });

package/schema/SqlSchemaGenerator.js

@@ -284,7 +284,9 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
                 if (!column.nativeEnumName) {
                     continue;
                 }
-                const key = schemaName && schemaName !== this.platform.getDefaultSchemaName() ? schemaName + '.' + column.nativeEnumName : column.nativeEnumName;
+                const key = schemaName && schemaName !== this.platform.getDefaultSchemaName() && !column.nativeEnumName.includes('.')
+                    ? schemaName + '.' + column.nativeEnumName
+                    : column.nativeEnumName;
                 if (changedProperties.has('enumItems') && key in diff.fromTable.nativeEnums) {
                     changedNativeEnums.push([column.nativeEnumName, column.enumItems, diff.fromTable.nativeEnums[key].items]);
                 }
@@ -293,6 +295,11 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
                 // 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()));
+                if (enumName.includes('.')) {
+                    const [enumSchemaName, rawEnumName] = enumName.split('.');
+                    ret.push(...newItems.map(val => this.knex.schema.raw(this.helper.getAlterNativeEnumSQL(rawEnumName, enumSchemaName, val, itemsNew, itemsOld))));
+                    return;
+                }
                 ret.push(...newItems.map(val => this.knex.schema.raw(this.helper.getAlterNativeEnumSQL(enumName, schemaName, val, itemsNew, itemsOld))));
             });
         }