@mikro-orm/sql 7.0.0-rc.1 → 7.0.0-rc.3

package/schema/SchemaComparator.js

@@ -59,7 +59,9 @@ export class SchemaComparator {
             if (toSchema.hasNativeEnum(key)) {
                 continue;
             }
-            if (key.startsWith(`${fromSchema.name}.`) && (fromSchema.name !== toSchema.name || toSchema.getNativeEnum(key.substring(fromSchema.name.length + 1))?.schema === '*')) {
+            if (key.startsWith(`${fromSchema.name}.`) &&
+                (fromSchema.name !== toSchema.name ||
+                    toSchema.getNativeEnum(key.substring(fromSchema.name.length + 1))?.schema === '*')) {
                 continue;
             }
             diff.removedNativeEnums.push(nativeEnum);
@@ -164,7 +166,10 @@ export class SchemaComparator {
         };
         if (this.diffComment(fromTable.comment, toTable.comment)) {
             tableDifferences.changedComment = toTable.comment;
-            this.log(`table comment changed for ${tableDifferences.name}`, { fromTableComment: fromTable.comment, toTableComment: toTable.comment });
+            this.log(`table comment changed for ${tableDifferences.name}`, {
+                fromTableComment: fromTable.comment,
+                toTableComment: toTable.comment,
+            });
             changes++;
         }
         const fromTableColumns = fromTable.getColumns();
@@ -222,7 +227,7 @@ export class SchemaComparator {
         // See if there are any removed indexes in "to" table
         for (const index of fromTableIndexes) {
             // See if index is removed in "to" table.
-            if ((index.primary && !toTable.hasPrimaryKey()) || !index.primary && !toTable.hasIndex(index.keyName)) {
+            if ((index.primary && !toTable.hasPrimaryKey()) || (!index.primary && !toTable.hasIndex(index.keyName))) {
                 tableDifferences.removedIndexes[index.keyName] = index;
                 this.log(`index ${index.keyName} removed from table ${tableDifferences.name}`);
                 changes++;
@@ -234,7 +239,10 @@ export class SchemaComparator {
                 continue;
             }
             tableDifferences.changedIndexes[index.keyName] = toTableIndex;
-            this.log(`index ${index.keyName} changed in table ${tableDifferences.name}`, { fromTableIndex: index, toTableIndex });
+            this.log(`index ${index.keyName} changed in table ${tableDifferences.name}`, {
+                fromTableIndex: index,
+                toTableIndex,
+            });
             changes++;
         }
         this.detectIndexRenamings(tableDifferences);
@@ -264,10 +272,15 @@ export class SchemaComparator {
             if (!this.diffExpression(check.expression, toTableCheck.expression)) {
                 continue;
             }
-            if (fromColumn?.enumItems && toColumn?.enumItems && !this.diffEnumItems(fromColumn.enumItems, toColumn.enumItems)) {
+            if (fromColumn?.enumItems &&
+                toColumn?.enumItems &&
+                !this.diffEnumItems(fromColumn.enumItems, toColumn.enumItems)) {
                 continue;
             }
-            this.log(`check constraint ${check.name} changed in table ${tableDifferences.name}`, { fromTableCheck: check, toTableCheck });
+            this.log(`check constraint ${check.name} changed in table ${tableDifferences.name}`, {
+                fromTableCheck: check,
+                toTableCheck,
+            });
             tableDifferences.changedChecks[check.name] = toTableCheck;
             changes++;
         }
@@ -280,7 +293,10 @@ export class SchemaComparator {
                     delete toForeignKeys[toConstraint.constraintName];
                 }
                 else if (fromConstraint.constraintName.toLowerCase() === toConstraint.constraintName.toLowerCase()) {
-                    this.log(`FK constraint ${fromConstraint.constraintName} changed in table ${tableDifferences.name}`, { fromConstraint, toConstraint });
+                    this.log(`FK constraint ${fromConstraint.constraintName} changed in table ${tableDifferences.name}`, {
+                        fromConstraint,
+                        toConstraint,
+                    });
                     tableDifferences.changedForeignKeys[toConstraint.constraintName] = toConstraint;
                     changes++;
                     delete fromForeignKeys[fromConstraint.constraintName];
@@ -295,7 +311,9 @@ export class SchemaComparator {
         }
         for (const toConstraint of Object.values(toForeignKeys)) {
             tableDifferences.addedForeignKeys[toConstraint.constraintName] = toConstraint;
-            this.log(`FK constraint ${toConstraint.constraintName} added to table ${tableDifferences.name}`, { constraint: toConstraint });
+            this.log(`FK constraint ${toConstraint.constraintName} added to table ${tableDifferences.name}`, {
+                constraint: toConstraint,
+            });
             changes++;
         }
         return changes ? tableDifferences : false;
@@ -341,7 +359,10 @@ export class SchemaComparator {
             tableDifferences.renamedColumns[removedColumnName] = addedColumn;
             delete tableDifferences.addedColumns[addedColumnName];
             delete tableDifferences.removedColumns[removedColumnName];
-            this.log(`renamed column detected in table ${tableDifferences.name}`, { old: removedColumnName, new: addedColumnName });
+            this.log(`renamed column detected in table ${tableDifferences.name}`, {
+                old: removedColumnName,
+                new: addedColumnName,
+            });
         }
     }
     /**
@@ -375,7 +396,10 @@ export class SchemaComparator {
             tableDifferences.renamedIndexes[removedIndexName] = addedIndex;
             delete tableDifferences.addedIndexes[addedIndexName];
             delete tableDifferences.removedIndexes[removedIndexName];
-            this.log(`renamed index detected in table ${tableDifferences.name}`, { old: removedIndexName, new: addedIndexName });
+            this.log(`renamed index detected in table ${tableDifferences.name}`, {
+                old: removedIndexName,
+                new: addedIndexName,
+            });
         }
     }
     diffForeignKey(key1, key2, tableDifferences) {
@@ -402,10 +426,7 @@ export class SchemaComparator {
         }
         const defaultRule = ['restrict', 'no action'];
         const rule = (key, method) => {
-            return (key[method] ?? defaultRule[0])
-                .toLowerCase()
-                .replace(defaultRule[1], defaultRule[0])
-                .replace(/"/g, '');
+            return (key[method] ?? defaultRule[0]).toLowerCase().replace(defaultRule[1], defaultRule[0]).replace(/"/g, '');
         };
         const compare = (method) => rule(key1, method) === rule(key2, method);
         return !compare('updateRule') || !compare('deleteRule');
@@ -418,7 +439,8 @@ export class SchemaComparator {
         const fromProp = this.mapColumnToProperty({ ...fromColumn, autoincrement: false });
         const toProp = this.mapColumnToProperty({ ...toColumn, autoincrement: false });
         const fromColumnType = this.platform.normalizeColumnType(fromColumn.mappedType.getColumnType(fromProp, this.platform).toLowerCase(), fromProp);
-        const fromNativeEnum = fromTable.nativeEnums[fromColumnType] ?? Object.values(fromTable.nativeEnums).find(e => e.name === fromColumnType && e.schema !== '*');
+        const fromNativeEnum = fromTable.nativeEnums[fromColumnType] ??
+            Object.values(fromTable.nativeEnums).find(e => e.name === fromColumnType && e.schema !== '*');
         let toColumnType = this.platform.normalizeColumnType(toColumn.mappedType.getColumnType(toProp, this.platform).toLowerCase(), toProp);
         const log = (msg, params) => {
             if (logging) {
@@ -430,8 +452,11 @@ export class SchemaComparator {
         if (fromColumnType !== toColumnType &&
             (!fromNativeEnum || `${fromNativeEnum.schema}.${fromNativeEnum.name}` !== toColumnType) &&
             !(fromColumn.ignoreSchemaChanges?.includes('type') || toColumn.ignoreSchemaChanges?.includes('type')) &&
-            !fromColumn.generated && !toColumn.generated) {
-            if (!toColumnType.includes('.') && fromTable.schema && fromTable.schema !== this.platform.getDefaultSchemaName()) {
+            !fromColumn.generated &&
+            !toColumn.generated) {
+            if (!toColumnType.includes('.') &&
+                fromTable.schema &&
+                fromTable.schema !== this.platform.getDefaultSchemaName()) {
                 toColumnType = `${fromTable.schema}.${toColumnType}`;
             }
             if (fromColumnType !== toColumnType) {
@@ -439,7 +464,7 @@ export 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 ${fromTable.name}.${fromColumn.name}`, { fromColumn, toColumn });
             changedProperties.add('nullable');
         }
@@ -451,12 +476,12 @@ export class SchemaComparator {
             log(`'autoincrement' changed for column ${fromTable.name}.${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 ${fromTable.name}.${fromColumn.name}`, { fromColumn, toColumn });
             changedProperties.add('unsigned');
         }
-        if (!(fromColumn.ignoreSchemaChanges?.includes('default') ||
-            toColumn.ignoreSchemaChanges?.includes('default')) && !this.hasSameDefaultValue(fromColumn, toColumn)) {
+        if (!(fromColumn.ignoreSchemaChanges?.includes('default') || toColumn.ignoreSchemaChanges?.includes('default')) &&
+            !this.hasSameDefaultValue(fromColumn, toColumn)) {
             log(`'default' changed for column ${fromTable.name}.${fromColumn.name}`, { fromColumn, toColumn });
             changedProperties.add('default');
         }
@@ -471,8 +496,7 @@ export class SchemaComparator {
             changedProperties.add('enumItems');
         }
         if ((fromColumn.extra || '').toLowerCase() !== (toColumn.extra || '').toLowerCase() &&
-            !(fromColumn.ignoreSchemaChanges?.includes('extra') ||
-                toColumn.ignoreSchemaChanges?.includes('extra'))) {
+            !(fromColumn.ignoreSchemaChanges?.includes('extra') || toColumn.ignoreSchemaChanges?.includes('extra'))) {
             log(`'extra' changed for column ${fromTable.name}.${fromColumn.name}`, { fromColumn, toColumn });
             changedProperties.add('extra');
         }
@@ -579,7 +603,7 @@ export class SchemaComparator {
             if (sort1 !== sort2) {
                 return false;
             }
-            const defaultNulls = (s) => s === 'DESC' ? 'FIRST' : 'LAST';
+            const defaultNulls = (s) => (s === 'DESC' ? 'FIRST' : 'LAST');
             const nulls1 = c1.nulls?.toUpperCase() ?? defaultNulls(sort1);
             const nulls2 = c2.nulls?.toUpperCase() ?? defaultNulls(sort2);
             if (nulls1 !== nulls2) {
@@ -610,9 +634,9 @@ export class SchemaComparator {
         // expressions like check constraints might be normalized by the driver,
         // e.g. quotes might be added (https://github.com/mikro-orm/mikro-orm/issues/3827)
         const simplify = (str) => {
-            return str
+            return (str
                 ?.replace(/_\w+'(.*?)'/g, '$1')
-                .replace(/in\s*\((.*?)\)/ig, '= any (array[$1])')
+                .replace(/in\s*\((.*?)\)/gi, '= any (array[$1])')
                 // MySQL normalizes count(*) to count(0)
                 .replace(/\bcount\s*\(\s*0\s*\)/gi, 'count(*)')
                 // Remove quotes first so we can process identifiers
@@ -628,7 +652,7 @@ export class SchemaComparator {
                 .replace(/\bas\b/gi, '')
                 // Remove remaining special chars, parentheses, type casts, asterisks, and normalize whitespace
                 .replace(/[()\n[\]*]|::\w+| +/g, '')
-                .replace(/anyarray\[(.*)]/ig, '$1')
+                .replace(/anyarray\[(.*)]/gi, '$1')
                 .toLowerCase()
                 // PostgreSQL adds default aliases to aggregate functions (e.g., count(*) AS count)
                 // After removing AS and whitespace, this results in duplicate adjacent words
@@ -636,7 +660,7 @@ export class SchemaComparator {
                 // Use lookahead to match repeated patterns of 3+ chars (avoid false positives on short sequences)
                 .replace(/(\w{3,})\1/g, '$1')
                 // Remove trailing semicolon (PostgreSQL adds it to view definitions)
-                .replace(/;$/, '');
+                .replace(/;$/, ''));
         };
         return simplify(expr1) !== simplify(expr2);
     }
@@ -645,13 +669,13 @@ export class SchemaComparator {
         if (!defaultValue) {
             return null;
         }
-        const val = defaultValue
-            .replace(/^(_\w+\\)?'(.*?)\\?'$/, '$2')
-            .replace(/^\(?'(.*?)'\)?$/, '$1');
+        const val = defaultValue.replace(/^(_\w+\\)?'(.*?)\\?'$/, '$2').replace(/^\(?'(.*?)'\)?$/, '$1');
         return parseJsonSafe(val);
     }
     hasSameDefaultValue(from, to) {
-        if (from.default == null || from.default.toString().toLowerCase() === 'null' || from.default.toString().startsWith('nextval(')) {
+        if (from.default == null ||
+            from.default.toString().toLowerCase() === 'null' ||
+            from.default.toString().startsWith('nextval(')) {
             return to.default == null || to.default.toLowerCase() === 'null';
         }
         if (to.mappedType instanceof BooleanType) {

package/schema/SchemaHelper.js

@@ -78,7 +78,7 @@ export class SchemaHelper {
         tableName = this.quote(tableName);
         oldColumnName = this.quote(oldColumnName);
         const columnName = this.quote(to.name);
-        const schemaReference = (schemaName !== undefined && schemaName !== 'public') ? ('"' + schemaName + '".') : '';
+        const schemaReference = schemaName !== undefined && schemaName !== 'public' ? '"' + schemaName + '".' : '';
         const tableReference = schemaReference + tableName;
         return `alter table ${tableReference} rename column ${oldColumnName} to ${columnName}`;
     }
@@ -124,7 +124,8 @@ export class SchemaHelper {
      */
     getIndexColumns(index) {
         if (index.columns?.length) {
-            return index.columns.map(col => {
+            return index.columns
+                .map(col => {
                 let colDef = this.quote(col.name);
                 // Collation comes after column name (SQLite syntax: column COLLATE name)
                 if (col.collation) {
@@ -139,7 +140,8 @@ export class SchemaHelper {
                     colDef += ` nulls ${col.nulls}`;
                 }
                 return colDef;
-            }).join(', ');
+            })
+                .join(', ');
         }
         return index.columnNames.map(c => this.quote(c)).join(', ');
     }
@@ -256,9 +258,11 @@ export class SchemaHelper {
         return ret;
     }
     getAddColumnsSQL(table, columns) {
-        const adds = columns.map(column => {
+        const adds = columns
+            .map(column => {
             return `add ${this.createTableColumn(column, table)}`;
-        }).join(', ');
+        })
+            .join(', ');
         return [`alter table ${table.getQuotedName()} ${adds}`];
     }
     getDropColumnsSQL(tableName, columns, schemaName) {
@@ -310,12 +314,26 @@ export class SchemaHelper {
         Utils.runIfNotEmpty(() => col.push('not null'), !column.nullable && !column.generated);
         Utils.runIfNotEmpty(() => col.push('auto_increment'), column.autoincrement);
         Utils.runIfNotEmpty(() => col.push('unique'), column.autoincrement && !column.primary);
-        if (column.autoincrement && !column.generated && !compositePK && (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
+        if (column.autoincrement &&
+            !column.generated &&
+            !compositePK &&
+            (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
             Utils.runIfNotEmpty(() => col.push('primary key'), primaryKey && column.primary);
         }
         if (useDefault) {
             // https://dev.mysql.com/doc/refman/9.0/en/data-type-defaults.html
-            const needsExpression = ['blob', 'text', 'json', 'point', 'linestring', 'polygon', 'multipoint', 'multilinestring', 'multipolygon', 'geometrycollection'].some(type => column.type.toLowerCase().startsWith(type));
+            const needsExpression = [
+                'blob',
+                'text',
+                'json',
+                'point',
+                'linestring',
+                'polygon',
+                'multipoint',
+                'multilinestring',
+                'multipolygon',
+                'geometrycollection',
+            ].some(type => column.type.toLowerCase().startsWith(type));
             const defaultSql = needsExpression && !column.default.startsWith('(') ? `(${column.default})` : column.default;
             col.push(`default ${defaultSql}`);
         }
@@ -371,7 +389,9 @@ export class SchemaHelper {
                     columnNames: [fk.column_name],
                     constraintName: fk.constraint_name,
                     localTableName: schemaName ? `${schemaName}.${tableName}` : tableName,
-                    referencedTableName: fk.referenced_schema_name ? `${fk.referenced_schema_name}.${fk.referenced_table_name}` : fk.referenced_table_name,
+                    referencedTableName: fk.referenced_schema_name
+                        ? `${fk.referenced_schema_name}.${fk.referenced_table_name}`
+                        : fk.referenced_table_name,
                     referencedColumnNames: [fk.referenced_column_name],
                     updateRule: fk.update_rule.toLowerCase(),
                     deleteRule: fk.delete_rule.toLowerCase(),

package/schema/SqlSchemaGenerator.d.ts

@@ -1,4 +1,5 @@
-import { AbstractSchemaGenerator, type ClearDatabaseOptions, type CreateSchemaOptions, type Dictionary, type DropSchemaOptions, type EnsureDatabaseOptions, type EntityMetadata, type ISchemaGenerator, type MikroORM, type Transaction, type UpdateSchemaOptions } from '@mikro-orm/core';
+import { type ClearDatabaseOptions, type CreateSchemaOptions, type Dictionary, type DropSchemaOptions, type EnsureDatabaseOptions, type EntityMetadata, type ISchemaGenerator, type MikroORM, type Transaction, type UpdateSchemaOptions } from '@mikro-orm/core';
+import { AbstractSchemaGenerator } from '@mikro-orm/core/schema';
 import type { SchemaDifference } from '../typings.js';
 import { DatabaseSchema } from './DatabaseSchema.js';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver.js';

package/schema/SqlSchemaGenerator.js

@@ -1,4 +1,5 @@
-import { AbstractSchemaGenerator, CommitOrderCalculator, Utils, } from '@mikro-orm/core';
+import { CommitOrderCalculator, Utils, } from '@mikro-orm/core';
+import { AbstractSchemaGenerator } from '@mikro-orm/core/schema';
 import { DatabaseSchema } from './DatabaseSchema.js';
 import { SchemaComparator } from './SchemaComparator.js';
 export class SqlSchemaGenerator extends AbstractSchemaGenerator {
@@ -127,7 +128,8 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
         }
         const schema = options?.schema ?? this.config.get('schema', this.platform.getDefaultSchemaName());
         for (const meta of this.getOrderedMetadata(schema).reverse()) {
-            await this.driver.createQueryBuilder(meta.class, this.em?.getTransactionContext(), 'write', false)
+            await this.driver
+                .createQueryBuilder(meta.class, this.em?.getTransactionContext(), 'write', false)
                 .withSchema(schema)
                 .truncate()
                 .execute();
@@ -223,8 +225,11 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
         options.dropTables ??= true;
         const toSchema = this.getTargetSchema(options.schema);
         const schemas = toSchema.getNamespaces();
-        const fromSchema = options.fromSchema ?? (await DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas, undefined, this.options.skipTables, this.options.skipViews));
-        const wildcardSchemaTables = [...this.metadata.getAll().values()].filter(meta => meta.schema === '*').map(meta => meta.tableName);
+        const fromSchema = options.fromSchema ??
+            (await DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas, undefined, this.options.skipTables, this.options.skipViews));
+        const wildcardSchemaTables = [...this.metadata.getAll().values()]
+            .filter(meta => meta.schema === '*')
+            .map(meta => meta.tableName);
         fromSchema.prune(options.schema, wildcardSchemaTables);
         toSchema.prune(options.schema, wildcardSchemaTables);
         return { fromSchema, toSchema };
@@ -407,7 +412,11 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
             return;
         }
         const statements = groups.flatMap(group => {
-            return group.join('\n').split(';\n').map(s => s.trim()).filter(s => s);
+            return group
+                .join('\n')
+                .split(';\n')
+                .map(s => s.trim())
+                .filter(s => s);
         });
         await Utils.runSerial(statements, stmt => this.driver.execute(stmt));
     }
@@ -475,9 +484,7 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
                 }
                 // Check if the definition references the other view's name
                 // Use word boundary matching to avoid false positives
-                const patterns = [
-                    new RegExp(`\\b${this.escapeRegExp(otherView.name.toLowerCase())}\\b`),
-                ];
+                const patterns = [new RegExp(`\\b${this.escapeRegExp(otherView.name.toLowerCase())}\\b`)];
                 if (otherView.schema) {
                     patterns.push(new RegExp(`\\b${this.escapeRegExp(`${otherView.schema}.${otherView.name}`.toLowerCase())}\\b`));
                 }