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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.9-dev.9",
+  "version": "6.1.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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.1.8"
+    "@mikro-orm/core": "^6.1.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.9-dev.9"
+    "@mikro-orm/core": "^6.0.0"
   }
 }

package/schema/SchemaHelper.d.ts

@@ -18,6 +18,7 @@ export declare abstract class SchemaHelper {
     getForeignKeys(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<Dictionary>;
     protected getTableKey(t: Table): string;
     getEnumDefinitions(connection: AbstractSqlConnection, checks: CheckDef[], tableName: string, schemaName?: string): Promise<Dictionary<string[]>>;
+    getCreateNativeEnumSQL(name: string, values: unknown[], schema?: string): string;
     getDropNativeEnumSQL(name: string, schema?: string): string;
     getAlterNativeEnumSQL(name: string, schema?: string, value?: string): string;
     loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[], schemas?: string[]): Promise<void>;

package/schema/SchemaHelper.js

@@ -47,6 +47,9 @@ class SchemaHelper {
     async getEnumDefinitions(connection, checks, tableName, schemaName) {
         return {};
     }
+    getCreateNativeEnumSQL(name, values, schema) {
+        throw new Error('Not supported by given driver');
+    }
     getDropNativeEnumSQL(name, schema) {
         throw new Error('Not supported by given driver');
     }

package/schema/SqlSchemaGenerator.js

@@ -60,6 +60,18 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
             }
             ret += await this.dump(this.knex.schema.createSchemaIfNotExists(namespace));
         }
+        if (this.platform.supportsNativeEnums()) {
+            const created = [];
+            for (const [enumName, enumOptions] of Object.entries(toSchema.getNativeEnums())) {
+                /* istanbul ignore if */
+                if (created.includes(enumName)) {
+                    continue;
+                }
+                created.push(enumName);
+                const sql = this.helper.getCreateNativeEnumSQL(enumName, enumOptions, options.schema ?? this.config.get('schema'));
+                ret += await this.dump(this.knex.schema.raw(sql), '\n');
+            }
+        }
         for (const tableDef of toSchema.getTables()) {
             ret += await this.dump(this.createTable(tableDef));
         }
@@ -284,12 +296,22 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         const ret = [];
         const [schemaName, tableName] = this.splitTableName(diff.name);
         if (this.platform.supportsNativeEnums()) {
+            const createdNativeEnums = [];
             const changedNativeEnums = [];
-            for (const { column, changedProperties } of Object.values(diff.changedColumns)) {
-                if (column.nativeEnumName && changedProperties.has('enumItems') && column.nativeEnumName in diff.fromTable.nativeEnums) {
+            for (const { column, changedProperties, fromColumn } of Object.values(diff.changedColumns)) {
+                if (!column.nativeEnumName) {
+                    continue;
+                }
+                if (changedProperties.has('enumItems') && column.nativeEnumName in diff.fromTable.nativeEnums) {
                     changedNativeEnums.push([column.nativeEnumName, column.enumItems, diff.fromTable.getColumn(column.name).enumItems]);
                 }
+                else if (changedProperties.has('type') && !(column.nativeEnumName in diff.fromTable.nativeEnums)) {
+                    createdNativeEnums.push([column.nativeEnumName, column.enumItems]);
+                }
             }
+            core_1.Utils.removeDuplicates(createdNativeEnums).forEach(([enumName, items]) => {
+                ret.push(this.knex.schema.raw(this.helper.getCreateNativeEnumSQL(enumName, items, schemaName)));
+            });
             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());
@@ -331,7 +353,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
                         .onDelete(foreignKey.deleteRule);
                 }
             }
-            for (const { column, changedProperties } of Object.values(diff.changedColumns)) {
+            for (const { column, changedProperties, fromColumn } of Object.values(diff.changedColumns)) {
                 if (changedProperties.size === 1 && changedProperties.has('comment')) {
                     continue;
                 }