@mikro-orm/entity-generator 6.3.5-dev.17 → 6.3.5-dev.18

package/SourceFile.js

@@ -528,11 +528,17 @@ class SourceFile {
         const columnTypeFromMappedRuntimeType = mappedRuntimeType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         const columnTypeFromMappedColumnType = mappedColumnType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         const columnTypeFromMappedDeclaredType = mappedDeclaredType.getColumnType({ ...prop, autoincrement: false }, this.platform);
-        if (isTypeStringMissingFromMap
-            || columnTypeFromMappedRuntimeType !== columnTypeFromMappedColumnType
-            || columnTypeFromMappedDeclaredType !== columnTypeFromMappedColumnType
-            || [mappedRuntimeType, mappedColumnType, columnTypeFromMappedDeclaredType].some(t => t instanceof core_1.UnknownType)) {
-            options.columnType = this.quote(columnTypeFromMappedColumnType);
+        const needsExplicitColumnType = () => {
+            if (isTypeStringMissingFromMap || [mappedRuntimeType, mappedColumnType, columnTypeFromMappedDeclaredType].some(t => t instanceof core_1.UnknownType)) {
+                return true;
+            }
+            if (this.platform.normalizeColumnType(prop.columnTypes[0], prop) !== this.platform.normalizeColumnType(columnTypeFromMappedColumnType, prop)) {
+                return prop.columnTypes[0] !== columnTypeFromMappedColumnType;
+            }
+            return columnTypeFromMappedRuntimeType !== columnTypeFromMappedColumnType || columnTypeFromMappedDeclaredType !== columnTypeFromMappedColumnType;
+        };
+        if (needsExplicitColumnType()) {
+            options.columnType = this.quote(prop.columnTypes[0]);
         }
         const assign = (key) => {
             if (prop[key] != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "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",
@@ -58,13 +58,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.3.5-dev.17",
+    "@mikro-orm/knex": "6.3.5-dev.18",
     "fs-extra": "11.2.0"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.3.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.5-dev.17"
+    "@mikro-orm/core": "6.3.5-dev.18"
   }
 }