@mikro-orm/sql 7.2.3-dev.1 → 7.2.3-dev.11

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -387,6 +387,8 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
       data_type,
       is_identity,
       identity_generation,
+      identity_start,
+      identity_increment,
       generation_expression,
       pg_catalog.col_description(pgc.oid, cols.ordinal_position::int) column_comment,
       coll.collname as collation_name
@@ -433,6 +435,14 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                 type += `(${col.numeric_precision},${col.numeric_scale})`;
             }
             const length = this.inferLengthFromColumnType(type) === -1 ? -1 : col.length;
+            // a descending sequence starts at -1 by default
+            const defaultIdentityStart = col.identity_increment?.startsWith('-') ? '-1' : '1';
+            // read back non-default identity options, so `identity (start with 1000)` does not diff against plain `identity`
+            const identityOptions = [
+                col.identity_start !== defaultIdentityStart && `start with ${col.identity_start}`,
+                col.identity_increment !== '1' && `increment by ${col.identity_increment}`,
+            ].filter(Boolean);
+            const identitySuffix = identityOptions.length > 0 ? ` (${identityOptions.join(' ')})` : '';
             const column = {
                 name: col.column_name,
                 type,
@@ -445,9 +455,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                 unsigned: increments,
                 autoincrement: increments,
                 generated: col.is_identity === 'YES'
-                    ? col.identity_generation === 'BY DEFAULT'
-                        ? 'by default as identity'
-                        : 'identity'
+                    ? (col.identity_generation === 'BY DEFAULT' ? 'by default as identity' : 'identity') + identitySuffix
                     : col.generation_expression
                         ? col.generation_expression + ' stored'
                         : undefined,
@@ -1032,7 +1040,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                     columnType = this.quote(columnType);
                 }
             }
-            if (column.generated === 'by default as identity') {
+            if (column.generated?.startsWith('by default as identity')) {
                 columnType += ` generated ${column.generated}`;
             }
             else if (column.generated) {

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.2.3-dev.1",
+  "version": "7.2.3-dev.11",
   "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.2.3-dev.1"
+    "@mikro-orm/core": "7.2.3-dev.11"
   },
   "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)) {