@mikro-orm/knex 6.3.5-dev.17 → 6.3.5-dev.18

package/dialects/mysql/MySqlPlatform.d.ts

@@ -16,6 +16,11 @@ export declare class MySqlPlatform extends AbstractSqlPlatform {
     convertJsonToDatabaseValue(value: unknown, context?: TransformContext): unknown;
     getJsonIndexDefinition(index: IndexDef): string[];
     getBooleanTypeDeclarationSQL(): string;
+    normalizeColumnType(type: string, options?: {
+        length?: number;
+        precision?: number;
+        scale?: number;
+    }): string;
     getDefaultMappedType(type: string): Type<unknown>;
     supportsUnsigned(): boolean;
     /**

package/dialects/mysql/MySqlPlatform.js

@@ -36,6 +36,13 @@ class MySqlPlatform extends AbstractSqlPlatform_1.AbstractSqlPlatform {
     getBooleanTypeDeclarationSQL() {
         return 'tinyint(1)';
     }
+    normalizeColumnType(type, options = {}) {
+        const simpleType = this.extractSimpleType(type);
+        if (['decimal', 'numeric'].includes(simpleType)) {
+            return this.getDecimalTypeDeclarationSQL(options);
+        }
+        return type;
+    }
     getDefaultMappedType(type) {
         if (type === 'tinyint(1)') {
             return super.getDefaultMappedType('boolean');

package/dialects/sqlite/BaseSqlitePlatform.d.ts

@@ -36,6 +36,11 @@ export declare abstract class BaseSqlitePlatform extends AbstractSqlPlatform {
     getVarcharTypeDeclarationSQL(column: {
         length?: number;
     }): string;
+    normalizeColumnType(type: string, options?: {
+        length?: number;
+        precision?: number;
+        scale?: number;
+    }): string;
     convertsJsonAutomatically(): boolean;
     /**
      * This is used to narrow the value of Date properties as they will be stored as timestamps in sqlite.

package/dialects/sqlite/BaseSqlitePlatform.js

@@ -44,6 +44,13 @@ class BaseSqlitePlatform extends AbstractSqlPlatform_1.AbstractSqlPlatform {
     getVarcharTypeDeclarationSQL(column) {
         return 'text';
     }
+    normalizeColumnType(type, options = {}) {
+        const simpleType = this.extractSimpleType(type);
+        if (['varchar', 'text'].includes(simpleType)) {
+            return this.getVarcharTypeDeclarationSQL(options);
+        }
+        return simpleType;
+    }
     convertsJsonAutomatically() {
         return false;
     }

package/package.json

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

package/schema/SchemaComparator.js

@@ -385,9 +385,9 @@ class SchemaComparator {
         const changedProperties = new Set();
         const fromProp = this.mapColumnToProperty({ ...fromColumn, autoincrement: false });
         const toProp = this.mapColumnToProperty({ ...toColumn, autoincrement: false });
-        const fromColumnType = fromColumn.mappedType.getColumnType(fromProp, this.platform).toLowerCase();
+        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 = toColumn.mappedType.getColumnType(toProp, this.platform).toLowerCase();
+        const 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);