@mikro-orm/sql 7.3.0-dev.6 → 7.3.0-dev.8

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -499,7 +499,9 @@ export class SqliteSchemaHelper extends SchemaHelper {
         if (Utils.hasObjectKeys(diff.removedChecks) ||
             Utils.hasObjectKeys(diff.changedChecks) ||
             Utils.hasObjectKeys(diff.changedForeignKeys) ||
-            Utils.hasObjectKeys(diff.changedColumns)) {
+            Utils.hasObjectKeys(diff.changedColumns) ||
+            // sqlite can only add or change a primary key by rebuilding the table
+            [...Object.values(diff.addedIndexes), ...Object.values(diff.changedIndexes)].some(index => index.primary)) {
             return this.getAlterTempTableSQL(diff);
         }
         for (const index of Object.values(diff.removedIndexes)) {
@@ -644,10 +646,11 @@ export class SqliteSchemaHelper extends SchemaHelper {
             first.replace(`create table ${quotedName}`, `create table ${quotedTempName}`),
         ];
         const columns = [];
+        const renamedFrom = Object.fromEntries(Object.entries(changedTable.renamedColumns).map(([oldName, column]) => [column.name, oldName]));
         for (const column of changedTable.toTable.getColumns()) {
-            const fromColumn = changedTable.fromTable.getColumn(column.name);
-            if (fromColumn) {
-                columns.push(this.quote(column.name));
+            const fromName = renamedFrom[column.name] ?? column.name;
+            if (changedTable.fromTable.getColumn(fromName)) {
+                columns.push(this.quote(fromName));
             }
             else {
                 columns.push(`null as ${this.quote(column.name)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.3.0-dev.6",
+  "version": "7.3.0-dev.8",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.2.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.3.0-dev.6"
+    "@mikro-orm/core": "7.3.0-dev.8"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/SchemaHelper.js

@@ -474,10 +474,16 @@ export class SchemaHelper {
         for (const foreignKey of Object.values(diff.changedForeignKeys)) {
             ret.push(this.createForeignKey(diff.toTable, foreignKey));
         }
-        for (const index of Object.values(diff.addedIndexes)) {
-            ret.push(this.createIndex(index, diff.toTable));
-        }
-        for (const index of Object.values(diff.changedIndexes)) {
+        for (const index of [...Object.values(diff.addedIndexes), ...Object.values(diff.changedIndexes)]) {
+            const addedColumn = diff.addedColumns[index.columnNames[0]];
+            // an added autoincrement PK column already declares the primary key inline
+            if (index.primary &&
+                !index.composite &&
+                addedColumn?.autoincrement &&
+                addedColumn.primary &&
+                !this.hasNonDefaultPrimaryKeyName(diff.toTable)) {
+                continue;
+            }
             ret.push(this.createIndex(index, diff.toTable, true));
         }
         for (const [oldIndexName, index] of Object.entries(diff.renamedIndexes)) {