@mikro-orm/knex 6.6.9-dev.1 → 6.6.9-dev.2

package/package.json

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

package/schema/DatabaseTable.js

@@ -76,14 +76,15 @@ class DatabaseTable {
                     prop.length ??= mappedType.getDefaultLength(this.platform);
                 }
             }
-            const primary = !meta.compositePK && !!prop.primary && prop.kind === core_1.ReferenceKind.SCALAR && this.platform.isNumericColumn(mappedType);
+            const primary = !!prop.primary;
+            const autoincrement = !meta.compositePK && primary && prop.kind === core_1.ReferenceKind.SCALAR && this.platform.isNumericColumn(mappedType);
             this.columns[field] = {
                 name: prop.fieldNames[idx],
                 type: prop.columnTypes[idx],
                 generated: prop.generated,
                 mappedType,
                 unsigned: prop.unsigned && this.platform.isNumericColumn(mappedType),
-                autoincrement: prop.autoincrement ?? primary,
+                autoincrement: prop.autoincrement ?? autoincrement,
                 primary,
                 nullable: this.columns[field]?.nullable ?? !!prop.nullable,
                 nativeEnumName: prop.nativeEnumName,
@@ -782,9 +783,36 @@ class DatabaseTable {
     toJSON() {
         const { platform, columns, ...rest } = this;
         const columnsMapped = core_1.Utils.keys(columns).reduce((o, col) => {
-            const { mappedType, ...restCol } = columns[col];
-            o[col] = restCol;
-            o[col].mappedType = core_1.Utils.keys(core_1.t).find(k => core_1.t[k] === mappedType.constructor);
+            const c = columns[col];
+            const normalized = {
+                name: c.name,
+                type: c.type,
+                unsigned: !!c.unsigned,
+                autoincrement: !!c.autoincrement,
+                primary: !!c.primary,
+                nullable: !!c.nullable,
+                unique: !!c.unique,
+                length: c.length ?? null,
+                precision: c.precision ?? null,
+                scale: c.scale ?? null,
+                default: c.default ?? null,
+                comment: c.comment ?? null,
+                enumItems: c.enumItems ?? [],
+                mappedType: core_1.Utils.keys(core_1.t).find(k => core_1.t[k] === c.mappedType.constructor),
+            };
+            if (c.generated) {
+                normalized.generated = c.generated;
+            }
+            if (c.nativeEnumName) {
+                normalized.nativeEnumName = c.nativeEnumName;
+            }
+            if (c.extra) {
+                normalized.extra = c.extra;
+            }
+            if (c.ignoreSchemaChanges) {
+                normalized.ignoreSchemaChanges = c.ignoreSchemaChanges;
+            }
+            o[col] = normalized;
             return o;
         }, {});
         return { columns: columnsMapped, ...rest };

package/schema/SchemaComparator.js

@@ -414,7 +414,7 @@ class SchemaComparator {
                 changedProperties.add('type');
             }
         }
-        if (fromColumn.nullable !== toColumn.nullable && !fromColumn.generated && !toColumn.generated) {
+        if (!!fromColumn.nullable !== !!toColumn.nullable && !fromColumn.generated && !toColumn.generated) {
             log(`'nullable' changed for column ${tableName}.${fromColumn.name}`, { fromColumn, toColumn });
             changedProperties.add('nullable');
         }
@@ -426,7 +426,7 @@ class SchemaComparator {
             log(`'autoincrement' changed for column ${tableName}.${fromColumn.name}`, { fromColumn, toColumn });
             changedProperties.add('autoincrement');
         }
-        if (fromColumn.unsigned !== toColumn.unsigned && this.platform.supportsUnsigned()) {
+        if (!!fromColumn.unsigned !== !!toColumn.unsigned && this.platform.supportsUnsigned()) {
             log(`'unsigned' changed for column ${tableName}.${fromColumn.name}`, { fromColumn, toColumn });
             changedProperties.add('unsigned');
         }