@mikro-orm/sql 7.1.9-dev.20 → 7.1.9-dev.22

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -53,6 +53,7 @@ export declare class MySqlSchemaHelper extends SchemaHelper {
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string[];
     getRenameColumnSQL(tableName: string, oldColumnName: string, to: Column): string;
     getRenameIndexSQL(tableName: string, index: IndexDef, oldIndexName: string): string[];
+    protected hasInlineColumnComment(): boolean;
     getChangeColumnCommentSQL(tableName: string, to: Column, schemaName?: string): string;
     alterTableColumn(column: Column, table: DatabaseTable, changedProperties: Set<string>): string[];
     private getColumnDeclarationSQL;

package/dialects/mysql/MySqlSchemaHelper.js

@@ -540,6 +540,9 @@ export class MySqlSchemaHelper extends SchemaHelper {
         const keyName = this.quote(index.keyName);
         return [`alter table ${tableName} rename index ${oldIndexName} to ${keyName}`];
     }
+    hasInlineColumnComment() {
+        return true;
+    }
     getChangeColumnCommentSQL(tableName, to, schemaName) {
         tableName = this.quote(tableName);
         const columnName = this.quote(to.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.9-dev.20",
+  "version": "7.1.9-dev.22",
   "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.1.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.9-dev.20"
+    "@mikro-orm/core": "7.1.9-dev.22"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/SchemaHelper.d.ts

@@ -143,6 +143,8 @@ export declare abstract class SchemaHelper {
         }[];
     }[], safe: boolean): string[];
     getChangeColumnCommentSQL(tableName: string, to: Column, schemaName?: string): string;
+    /** Whether the column comment is part of the column declaration, as opposed to a separate statement. */
+    protected hasInlineColumnComment(): boolean;
     getNamespaces(connection: AbstractSqlConnection, ctx?: Transaction): Promise<string[]>;
     protected mapIndexes(indexes: IndexDef[]): Promise<IndexDef[]>;
     mapForeignKeys(fks: any[], tableName: string, schemaName?: string): Dictionary;

package/schema/SchemaHelper.js

@@ -446,7 +446,8 @@ export class SchemaHelper {
             this.append(ret, this.alterTableColumn(column, diff.fromTable, changedProperties));
         }
         for (const { column, changedProperties } of Object.values(diff.changedColumns).filter(diff => diff.changedProperties.has('comment'))) {
-            if (['type', 'nullable', 'autoincrement', 'unsigned', 'default', 'enumItems', 'collation'].some(t => changedProperties.has(t))) {
+            if (this.hasInlineColumnComment() &&
+                ['type', 'nullable', 'autoincrement', 'unsigned', 'default', 'enumItems', 'collation'].some(t => changedProperties.has(t))) {
                 continue; // will be handled via column update
             }
             ret.push(this.getChangeColumnCommentSQL(tableName, column, schemaName));
@@ -499,7 +500,13 @@ export class SchemaHelper {
             return `add ${this.createTableColumn(column, table)}`;
         })
             .join(', ');
-        return [`alter table ${table.getQuotedName()} ${adds}`];
+        const ret = [`alter table ${table.getQuotedName()} ${adds}`];
+        if (!this.hasInlineColumnComment()) {
+            for (const column of columns.filter(column => column.comment)) {
+                ret.push(this.getChangeColumnCommentSQL(table.name, column, table.schema));
+            }
+        }
+        return ret;
     }
     getDropColumnsSQL(tableName, columns, schemaName) {
         const name = this.quote(this.getTableName(tableName, schemaName));
@@ -618,6 +625,10 @@ export class SchemaHelper {
     getChangeColumnCommentSQL(tableName, to, schemaName) {
         return '';
     }
+    /** Whether the column comment is part of the column declaration, as opposed to a separate statement. */
+    hasInlineColumnComment() {
+        return false;
+    }
     async getNamespaces(connection, ctx) {
         return [];
     }