@mikro-orm/sql 7.0.0-rc.2 → 7.0.0

package/schema/DatabaseTable.js

@@ -3,51 +3,60 @@ import { DecimalType, EntitySchema, RawQueryFragment, ReferenceKind, t, Type, Un
  * @internal
  */
 export class DatabaseTable {
-    platform;
     name;
     schema;
-    columns = {};
-    indexes = [];
-    checks = [];
-    foreignKeys = {};
+    #columns = {};
+    #indexes = [];
+    #checks = [];
+    #foreignKeys = {};
+    #platform;
     nativeEnums = {}; // for postgres
     comment;
     constructor(platform, name, schema) {
-        this.platform = platform;
         this.name = name;
         this.schema = schema;
-        Object.defineProperties(this, {
-            platform: { enumerable: false, writable: true },
-        });
+        this.#platform = platform;
     }
     getQuotedName() {
-        return this.platform.quoteIdentifier(this.getShortestName());
+        return this.#platform.quoteIdentifier(this.getShortestName());
     }
     getColumns() {
-        return Object.values(this.columns);
+        return Object.values(this.#columns);
     }
     getColumn(name) {
-        return this.columns[name];
+        return this.#columns[name];
     }
     removeColumn(name) {
-        delete this.columns[name];
+        delete this.#columns[name];
     }
     getIndexes() {
-        return Utils.removeDuplicates(this.indexes);
+        return Utils.removeDuplicates(this.#indexes);
     }
     getChecks() {
-        return this.checks;
+        return this.#checks;
+    }
+    /** @internal */
+    setIndexes(indexes) {
+        this.#indexes = indexes;
+    }
+    /** @internal */
+    setChecks(checks) {
+        this.#checks = checks;
+    }
+    /** @internal */
+    setForeignKeys(fks) {
+        this.#foreignKeys = fks;
     }
     init(cols, indexes = [], checks = [], pks, fks = {}, enums = {}) {
-        this.indexes = indexes;
-        this.checks = checks;
-        this.foreignKeys = fks;
-        this.columns = cols.reduce((o, v) => {
+        this.#indexes = indexes;
+        this.#checks = checks;
+        this.#foreignKeys = fks;
+        this.#columns = cols.reduce((o, v) => {
             const index = indexes.filter(i => i.columnNames[0] === v.name);
             v.primary = v.primary || pks.includes(v.name);
             v.unique = index.some(i => i.unique && !i.primary);
             const type = v.name in enums ? 'enum' : v.type;
-            v.mappedType = this.platform.getMappedType(type);
+            v.mappedType = this.#platform.getMappedType(type);
             v.default = v.default?.toString().startsWith('nextval(') ? null : v.default;
             v.enumItems ??= enums[v.name] || [];
             o[v.name] = v;
@@ -55,14 +64,14 @@ export class DatabaseTable {
         }, {});
     }
     addColumn(column) {
-        this.columns[column.name] = column;
+        this.#columns[column.name] = column;
     }
     addColumnFromProperty(prop, meta, config) {
         prop.fieldNames?.forEach((field, idx) => {
             const type = prop.enum ? 'enum' : prop.columnTypes[idx];
-            const mappedType = this.platform.getMappedType(type);
+            const mappedType = this.#platform.getMappedType(type);
             if (mappedType instanceof DecimalType) {
-                const match = prop.columnTypes[idx].match(/\w+\((\d+), ?(\d+)\)/);
+                const match = /\w+\((\d+), ?(\d+)\)/.exec(prop.columnTypes[idx]);
                 /* v8 ignore next */
                 if (match) {
                     prop.precision ??= +match[1];
@@ -71,21 +80,24 @@ export class DatabaseTable {
                 }
             }
             if (prop.length == null && prop.columnTypes[idx]) {
-                prop.length = this.platform.getSchemaHelper().inferLengthFromColumnType(prop.columnTypes[idx]);
+                prop.length = this.#platform.getSchemaHelper().inferLengthFromColumnType(prop.columnTypes[idx]);
                 if (typeof mappedType.getDefaultLength !== 'undefined') {
-                    prop.length ??= mappedType.getDefaultLength(this.platform);
+                    prop.length ??= mappedType.getDefaultLength(this.#platform);
                 }
             }
             const primary = !meta.compositePK && prop.fieldNames.length === 1 && !!prop.primary;
-            this.columns[field] = {
+            this.#columns[field] = {
                 name: prop.fieldNames[idx],
                 type: prop.columnTypes[idx],
-                generated: prop.generated instanceof RawQueryFragment ? this.platform.formatQuery(prop.generated.sql, prop.generated.params) : prop.generated,
+                generated: prop.generated instanceof RawQueryFragment
+                    ? this.#platform.formatQuery(prop.generated.sql, prop.generated.params)
+                    : prop.generated,
                 mappedType,
-                unsigned: prop.unsigned && this.platform.isNumericColumn(mappedType),
-                autoincrement: prop.autoincrement ?? (primary && prop.kind === ReferenceKind.SCALAR && this.platform.isNumericColumn(mappedType)),
+                unsigned: prop.unsigned && this.#platform.isNumericColumn(mappedType),
+                autoincrement: prop.autoincrement ??
+                    (primary && prop.kind === ReferenceKind.SCALAR && this.#platform.isNumericColumn(mappedType)),
                 primary,
-                nullable: this.columns[field]?.nullable ?? !!prop.nullable,
+                nullable: this.#columns[field]?.nullable ?? !!prop.nullable,
                 nativeEnumName: prop.nativeEnumName,
                 length: prop.length,
                 precision: prop.precision,
@@ -96,21 +108,29 @@ export class DatabaseTable {
                 extra: prop.extra,
                 ignoreSchemaChanges: prop.ignoreSchemaChanges,
             };
-            this.columns[field].unsigned ??= this.columns[field].autoincrement;
+            this.#columns[field].unsigned ??= this.#columns[field].autoincrement;
             if (this.nativeEnums[type]) {
-                this.columns[field].enumItems ??= this.nativeEnums[type].items;
+                this.#columns[field].enumItems ??= this.nativeEnums[type].items;
             }
-            const defaultValue = this.platform.getSchemaHelper().normalizeDefaultValue(prop.defaultRaw, prop.length);
-            this.columns[field].default = defaultValue;
+            const defaultValue = this.#platform.getSchemaHelper().normalizeDefaultValue(prop.defaultRaw, prop.length);
+            this.#columns[field].default = defaultValue;
         });
         if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && !prop.polymorphic) {
             const constraintName = this.getIndexName(prop.foreignKeyName ?? true, prop.fieldNames, 'foreign');
-            let schema = prop.targetMeta.root.schema === '*' ? this.schema : (prop.targetMeta.root.schema ?? config.get('schema', this.platform.getDefaultSchemaName()));
+            let schema = prop.targetMeta.root.schema === '*'
+                ? this.schema
+                : (prop.targetMeta.root.schema ?? config.get('schema', this.#platform.getDefaultSchemaName()));
             if (prop.referencedTableName.includes('.')) {
                 schema = undefined;
             }
+            // For cross-schema FKs on MySQL/MariaDB (where schema = database), when the referenced
+            // table has no explicit schema but the current table does, qualify with dbName so the
+            // FK can resolve the referenced table in the correct database
+            if (!schema && this.schema && !this.#platform.getDefaultSchemaName()) {
+                schema = config.get('dbName');
+            }
             if (prop.createForeignKeyConstraint) {
-                this.foreignKeys[constraintName] = {
+                this.#foreignKeys[constraintName] = {
                     constraintName,
                     columnNames: prop.fieldNames,
                     localTableName: this.getShortestName(false),
@@ -118,15 +138,15 @@ export class DatabaseTable {
                     referencedTableName: schema ? `${schema}.${prop.referencedTableName}` : prop.referencedTableName,
                 };
                 const schemaConfig = config.get('schemaGenerator');
-                this.foreignKeys[constraintName].deleteRule = prop.deleteRule ?? schemaConfig.defaultDeleteRule;
-                this.foreignKeys[constraintName].updateRule = prop.updateRule ?? schemaConfig.defaultUpdateRule;
+                this.#foreignKeys[constraintName].deleteRule = prop.deleteRule ?? schemaConfig.defaultDeleteRule;
+                this.#foreignKeys[constraintName].updateRule = prop.updateRule ?? schemaConfig.defaultUpdateRule;
                 if (prop.deferMode) {
-                    this.foreignKeys[constraintName].deferMode = prop.deferMode;
+                    this.#foreignKeys[constraintName].deferMode = prop.deferMode;
                 }
             }
         }
         if (prop.index) {
-            this.indexes.push({
+            this.#indexes.push({
                 columnNames: prop.fieldNames,
                 composite: prop.fieldNames.length > 1,
                 keyName: this.getIndexName(prop.index, prop.fieldNames, 'index'),
@@ -136,7 +156,7 @@ export class DatabaseTable {
             });
         }
         if (prop.unique && !(prop.primary && !meta.compositePK)) {
-            this.indexes.push({
+            this.#indexes.push({
                 columnNames: prop.fieldNames,
                 composite: prop.fieldNames.length > 1,
                 keyName: this.getIndexName(prop.unique, prop.fieldNames, 'unique'),
@@ -151,22 +171,23 @@ export class DatabaseTable {
         if (typeof value === 'string') {
             return value;
         }
-        return this.platform.getIndexName(this.name, columnNames, type);
+        return this.#platform.getIndexName(this.name, columnNames, type);
     }
     getEntityDeclaration(namingStrategy, schemaHelper, scalarPropertiesForRelations) {
-        const { fksOnColumnProps, fksOnStandaloneProps, columnFks, fkIndexes, nullableForeignKeys, skippedColumnNames, } = this.foreignKeysToProps(namingStrategy, scalarPropertiesForRelations);
+        const { fksOnColumnProps, fksOnStandaloneProps, columnFks, fkIndexes, nullableForeignKeys, skippedColumnNames } = this.foreignKeysToProps(namingStrategy, scalarPropertiesForRelations);
         const name = namingStrategy.getEntityName(this.name, this.schema);
         const schema = new EntitySchema({ name, collection: this.name, schema: this.schema, comment: this.comment });
         const compositeFkIndexes = {};
         const compositeFkUniques = {};
-        const potentiallyUnmappedIndexes = this.indexes.filter(index => !index.primary // Skip primary index. Whether it's in use by scalar column or FK, it's already mapped.
-            && (( // Non-trivial non-composite indexes will be declared at the entity's metadata, though later outputted in the property
-            index.columnNames.length > 1 // All composite indexes are to be mapped to entity decorators or FK props.
-                || skippedColumnNames.includes(index.columnNames[0]) // Non-composite indexes for skipped columns are to be mapped as entity decorators.
-                || index.deferMode || index.expression || !(index.columnNames[0] in columnFks)) // Trivial non-composite indexes for scalar props are to be mapped to the column.
-            )
+        const potentiallyUnmappedIndexes = this.#indexes.filter(index => !index.primary && // Skip primary index. Whether it's in use by scalar column or FK, it's already mapped.
+            // Non-trivial non-composite indexes will be declared at the entity's metadata, though later outputted in the property
+            (index.columnNames.length > 1 || // All composite indexes are to be mapped to entity decorators or FK props.
+                skippedColumnNames.includes(index.columnNames[0]) || // Non-composite indexes for skipped columns are to be mapped as entity decorators.
+                index.deferMode ||
+                index.expression ||
+                !(index.columnNames[0] in columnFks)) && // Trivial non-composite indexes for scalar props are to be mapped to the column.
             // ignore indexes that don't have all column names (this can happen in sqlite where there is no way to infer this for expressions)
-            && !(index.columnNames.some(col => !col) && !index.expression));
+            !(index.columnNames.some(col => !col) && !index.expression));
         // Helper to map column name to property name
         const columnToPropertyName = (colName) => this.getPropertyName(namingStrategy, colName);
         for (const index of potentiallyUnmappedIndexes) {
@@ -198,8 +219,13 @@ export class DatabaseTable {
                 }
             }
             // An index is trivial if it has no special options that require entity-level declaration
-            const hasAdvancedOptions = index.columns?.length || index.include?.length || index.fillFactor ||
-                index.type || index.invisible || index.disabled || index.clustered;
+            const hasAdvancedOptions = index.columns?.length ||
+                index.include?.length ||
+                index.fillFactor ||
+                index.type ||
+                index.invisible ||
+                index.disabled ||
+                index.clustered;
             const isTrivial = !index.deferMode && !index.expression && !hasAdvancedOptions;
             if (isTrivial) {
                 // Index is for FK. Map to the FK prop and move on.
@@ -213,7 +239,8 @@ export class DatabaseTable {
                     }
                 }
             }
-            const properties = ret.properties ?? this.getIndexProperties(index, columnFks, fksOnColumnProps, fksOnStandaloneProps, namingStrategy);
+            const properties = ret.properties ??
+                this.getIndexProperties(index, columnFks, fksOnColumnProps, fksOnStandaloneProps, namingStrategy);
             // If there is a column that cannot be unambiguously mapped to a prop, render an expression.
             if (typeof properties === 'undefined') {
                 ret.expression ??= schemaHelper.getCreateIndexSQL(this.name, index);
@@ -237,7 +264,7 @@ export class DatabaseTable {
             }
             schema.addIndex(ret);
         }
-        const addedStandaloneFkPropsBasedOnColumn = new Set;
+        const addedStandaloneFkPropsBasedOnColumn = new Set();
         const nonSkippedColumns = this.getColumns().filter(column => !skippedColumnNames.includes(column.name));
         for (const column of nonSkippedColumns) {
             const columnName = column.name;
@@ -259,10 +286,10 @@ export class DatabaseTable {
             schema.addProperty(prop.name, prop.type, prop);
         }
         const meta = schema.init().meta;
-        const oneToOneCandidateProperties = meta.relations
-            .filter(prop => prop.primary && prop.kind === ReferenceKind.MANY_TO_ONE);
-        if (oneToOneCandidateProperties.length === 1
-            && oneToOneCandidateProperties[0].fieldNames.length === (new Set(meta.getPrimaryProps().flatMap(prop => prop.fieldNames))).size) {
+        const oneToOneCandidateProperties = meta.relations.filter(prop => prop.primary && prop.kind === ReferenceKind.MANY_TO_ONE);
+        if (oneToOneCandidateProperties.length === 1 &&
+            oneToOneCandidateProperties[0].fieldNames.length ===
+                new Set(meta.getPrimaryProps().flatMap(prop => prop.fieldNames)).size) {
             oneToOneCandidateProperties[0].kind = ReferenceKind.ONE_TO_ONE;
         }
         return meta;
@@ -277,7 +304,8 @@ export class DatabaseTable {
         const standaloneFksBasedOnColumnNames = new Map();
         for (const currentFk of fks) {
             const fkIndex = this.findFkIndex(currentFk);
-            if (currentFk.columnNames.length === 1 && !fks.some(fk => fk !== currentFk && fk.columnNames.length === 1 && currentFk.columnNames[0] === fk.columnNames[0])) {
+            if (currentFk.columnNames.length === 1 &&
+                !fks.some(fk => fk !== currentFk && fk.columnNames.length === 1 && currentFk.columnNames[0] === fk.columnNames[0])) {
                 // Non-composite FK is the only possible one for a column. Render the column with it.
                 const columnName = currentFk.columnNames[0];
                 columnFks[columnName] ??= [];
@@ -316,7 +344,10 @@ export class DatabaseTable {
             if (nullableColumnsInFk.length > 0) {
                 nullableForeignKeys.add(currentFk);
             }
-            if (specificColumnNames.length === 1 && ((nullableColumnsInFk.length === currentFk.columnNames.length || nullableColumnsInFk.length === 0) || (nullableColumnsInFk.length === 1 && nullableColumnsInFk[0] === specificColumnNames[0]))) {
+            if (specificColumnNames.length === 1 &&
+                (nullableColumnsInFk.length === currentFk.columnNames.length ||
+                    nullableColumnsInFk.length === 0 ||
+                    (nullableColumnsInFk.length === 1 && nullableColumnsInFk[0] === specificColumnNames[0]))) {
                 // Composite FK has exactly one column which is not used in any other FK.
                 // The FK also doesn't have a mix of nullable and non-nullable columns,
                 // or its only nullable column is this very one.
@@ -391,14 +422,16 @@ export class DatabaseTable {
             // But also does not skip if the column is not nullable, and yet all involved FKs are nullable,
             // or if one or more FKs involved has multiple nullable columns.
             smart: (column) => {
-                return columnsInFks.includes(column.name)
-                    && !fksOnColumnProps.has(column.name)
-                    && (column.nullable
+                return (columnsInFks.includes(column.name) &&
+                    !fksOnColumnProps.has(column.name) &&
+                    (column.nullable
                         ? columnFks[column.name].some(fk => !fk.columnNames.some(fkColumnName => fkColumnName !== column.name && this.getColumn(fkColumnName)?.nullable))
-                        : columnFks[column.name].some(fk => !nullableForeignKeys.has(fk)));
+                        : columnFks[column.name].some(fk => !nullableForeignKeys.has(fk))));
             },
         };
-        const skippedColumnNames = this.getColumns().filter(skippingHandlers[scalarPropertiesForRelations]).map(column => column.name);
+        const skippedColumnNames = this.getColumns()
+            .filter(skippingHandlers[scalarPropertiesForRelations])
+            .map(column => column.name);
         // Check standalone FKs named after columns for potential conflicts among themselves.
         // This typically happens when two standalone FKs named after a column resolve to the same prop name
         // because the respective columns include the referenced table in the name.
@@ -438,8 +471,9 @@ export class DatabaseTable {
     }
     findFkIndex(currentFk) {
         const fkColumnsLength = currentFk.columnNames.length;
-        const possibleIndexes = this.indexes.filter(index => {
-            return index.columnNames.length === fkColumnsLength && !currentFk.columnNames.some((columnName, i) => index.columnNames[i] !== columnName);
+        const possibleIndexes = this.#indexes.filter(index => {
+            return (index.columnNames.length === fkColumnsLength &&
+                !currentFk.columnNames.some((columnName, i) => index.columnNames[i] !== columnName));
         });
         possibleIndexes.sort((a, b) => {
             if (a.primary !== b.primary) {
@@ -502,7 +536,8 @@ export class DatabaseTable {
         return Array.from(propBaseNames).map(baseName => this.getPropertyName(namingStrategy, baseName, fksOnColumnProps.get(baseName)));
     }
     getSafeBaseNameForFkProp(namingStrategy, currentFk, fks, columnName) {
-        if (columnName && this.getPropertyName(namingStrategy, columnName, currentFk) !== this.getPropertyName(namingStrategy, columnName)) {
+        if (columnName &&
+            this.getPropertyName(namingStrategy, columnName, currentFk) !== this.getPropertyName(namingStrategy, columnName)) {
             // The eligible scalar column name is different from the name of the FK prop of the same column.
             // Both can be safely rendered.
             // Use the column name as a base for the FK prop.
@@ -537,39 +572,41 @@ export class DatabaseTable {
      * The shortest name is stripped of the default namespace. All other namespaced elements are returned as full-qualified names.
      */
     getShortestName(skipDefaultSchema = true) {
-        const defaultSchema = this.platform.getDefaultSchemaName();
-        if (!this.schema || this.name.startsWith(defaultSchema + '.') || (this.schema === defaultSchema && skipDefaultSchema)) {
+        const defaultSchema = this.#platform.getDefaultSchemaName();
+        if (!this.schema ||
+            this.name.startsWith(defaultSchema + '.') ||
+            (this.schema === defaultSchema && skipDefaultSchema)) {
             return this.name;
         }
         return `${this.schema}.${this.name}`;
     }
     getForeignKeys() {
-        return this.foreignKeys;
+        return this.#foreignKeys;
     }
     hasColumn(columnName) {
-        return columnName in this.columns;
+        return columnName in this.#columns;
     }
     getIndex(indexName) {
-        return this.indexes.find(i => i.keyName === indexName);
+        return this.#indexes.find(i => i.keyName === indexName);
     }
     hasIndex(indexName) {
         return !!this.getIndex(indexName);
     }
     getCheck(checkName) {
-        return this.checks.find(i => i.name === checkName);
+        return this.#checks.find(i => i.name === checkName);
     }
     hasCheck(checkName) {
         return !!this.getCheck(checkName);
     }
     getPrimaryKey() {
-        return this.indexes.find(i => i.primary);
+        return this.#indexes.find(i => i.primary);
     }
     hasPrimaryKey() {
         return !!this.getPrimaryKey();
     }
     getForeignKeyDeclaration(fk, namingStrategy, schemaHelper, fkIndex, nullable, propNameBase, fksOnColumnProps) {
         const prop = this.getPropertyName(namingStrategy, propNameBase, fk);
-        const kind = (fkIndex?.unique && !fkIndex.primary) ? this.getReferenceKind(fk, fkIndex) : this.getReferenceKind(fk);
+        const kind = fkIndex?.unique && !fkIndex.primary ? this.getReferenceKind(fk, fkIndex) : this.getReferenceKind(fk);
         const runtimeType = this.getPropertyTypeForForeignKey(namingStrategy, fk);
         const fkOptions = {};
         fkOptions.fieldNames = fk.columnNames;
@@ -584,8 +621,8 @@ export class DatabaseTable {
             const column = this.getColumn(fk.columnNames[0]);
             const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, column.type, true);
             const defaultTs = this.getPropertyDefaultValue(schemaHelper, column, column.type);
-            columnOptions.default = (defaultRaw !== defaultTs || defaultRaw === '') ? defaultTs : undefined;
-            columnOptions.defaultRaw = (column.nullable && defaultRaw === 'null') ? undefined : defaultRaw;
+            columnOptions.default = defaultRaw !== defaultTs || defaultRaw === '' ? defaultTs : undefined;
+            columnOptions.defaultRaw = column.nullable && defaultRaw === 'null' ? undefined : defaultRaw;
             columnOptions.optional = typeof column.generated !== 'undefined' || defaultRaw !== 'null';
             columnOptions.generated = column.generated;
             columnOptions.nullable = column.nullable;
@@ -607,25 +644,29 @@ export class DatabaseTable {
             nullable,
             primary: fkIndex?.primary || !fk.columnNames.some(columnName => !this.getPrimaryKey()?.columnNames.includes(columnName)),
             index: !fkIndex?.unique ? fkIndex?.keyName : undefined,
-            unique: (fkIndex?.unique && !fkIndex.primary) ? fkIndex.keyName : undefined,
+            unique: fkIndex?.unique && !fkIndex.primary ? fkIndex.keyName : undefined,
             ...fkOptions,
         };
     }
     getPropertyDeclaration(column, namingStrategy, schemaHelper, compositeFkIndexes, compositeFkUniques, columnFks, fk) {
         const prop = this.getPropertyName(namingStrategy, column.name, fk);
         const persist = !(column.name in columnFks && typeof fk === 'undefined');
-        const index = compositeFkIndexes[prop] || this.indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && !idx.unique && !idx.primary);
-        const unique = compositeFkUniques[prop] || this.indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && idx.unique && !idx.primary);
+        const index = compositeFkIndexes[prop] ||
+            this.#indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && !idx.unique && !idx.primary);
+        const unique = compositeFkUniques[prop] ||
+            this.#indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && idx.unique && !idx.primary);
         const kind = this.getReferenceKind(fk, unique);
         const runtimeType = this.getPropertyTypeForColumn(namingStrategy, column, fk);
-        const type = fk ? runtimeType : (Utils.keys(t).find(k => {
-            const typeInCoreMap = this.platform.getMappedType(k);
-            return (typeInCoreMap !== Type.getType(UnknownType) || k === 'unknown') && typeInCoreMap === column.mappedType;
-        }) ?? runtimeType);
-        const ignoreSchemaChanges = (type === 'unknown' && column.length) ? (column.extra ? ['type', 'extra'] : ['type']) : undefined;
+        const type = fk
+            ? runtimeType
+            : (Utils.keys(t).find(k => {
+                const typeInCoreMap = this.#platform.getMappedType(k);
+                return ((typeInCoreMap !== Type.getType(UnknownType) || k === 'unknown') && typeInCoreMap === column.mappedType);
+            }) ?? runtimeType);
+        const ignoreSchemaChanges = type === 'unknown' && column.length ? (column.extra ? ['type', 'extra'] : ['type']) : undefined;
         const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, runtimeType, true);
         const defaultParsed = this.getPropertyDefaultValue(schemaHelper, column, runtimeType);
-        const defaultTs = (defaultRaw !== defaultParsed || defaultParsed === '') ? defaultParsed : undefined;
+        const defaultTs = defaultRaw !== defaultParsed || defaultParsed === '' ? defaultParsed : undefined;
         const fkOptions = {};
         if (fk) {
             fkOptions.fieldNames = fk.columnNames;
@@ -646,7 +687,7 @@ export class DatabaseTable {
             optional: defaultRaw !== 'null' || defaultTs != null || typeof column.generated !== 'undefined',
             columnType: column.type,
             default: defaultTs,
-            defaultRaw: (column.nullable && defaultRaw === 'null') ? undefined : defaultRaw,
+            defaultRaw: column.nullable && defaultRaw === 'null' ? undefined : defaultRaw,
             nullable: column.nullable,
             primary: column.primary && persist,
             autoincrement: column.autoincrement,
@@ -702,7 +743,7 @@ export class DatabaseTable {
         if (fk) {
             return this.getPropertyTypeForForeignKey(namingStrategy, fk);
         }
-        const enumMode = this.platform.getConfig().get('entityGenerator').enumMode;
+        const enumMode = this.#platform.getConfig().get('entityGenerator').enumMode;
         // If this column is using an enum.
         if (column.enumItems?.length) {
             const name = column.nativeEnumName ?? column.name;
@@ -720,7 +761,7 @@ export class DatabaseTable {
         const defaultValue = column.default ?? 'null';
         const val = schemaHelper.normalizeDefaultValue(defaultValue, column.length);
         if (val === 'null') {
-            return raw ? 'null' : (column.nullable ? null : undefined);
+            return raw ? 'null' : column.nullable ? null : undefined;
         }
         if (propType === 'boolean' && !raw) {
             return !['0', 'false', 'f', 'n', 'no', 'off'].includes('' + column.default);
@@ -729,7 +770,7 @@ export class DatabaseTable {
             return +defaultValue;
         }
         // unquote string defaults if `raw = false`
-        const match = ('' + val).match(/^'(.*)'$/);
+        const match = /^'(.*)'$/.exec('' + val);
         if (!raw && match) {
             return match[1];
         }
@@ -746,13 +787,15 @@ export class DatabaseTable {
             };
             const columns = meta.createSchemaColumnMappingObject();
             const exp = expression(columns, table, indexName);
-            return exp instanceof RawQueryFragment ? this.platform.formatQuery(exp.sql, exp.params) : exp;
+            return exp instanceof RawQueryFragment ? this.#platform.formatQuery(exp.sql, exp.params) : exp;
         }
         return expression;
     }
     addIndex(meta, index, type) {
         // If columns are specified but properties are not, derive properties from column names
-        if (index.columns?.length && !index.expression && (!index.properties || Utils.asArray(index.properties).length === 0)) {
+        if (index.columns?.length &&
+            !index.expression &&
+            (!index.properties || Utils.asArray(index.properties).length === 0)) {
             index = { ...index, properties: index.columns.map(c => c.name) };
         }
         const properties = Utils.unique(Utils.flatten(Utils.asArray(index.properties).map(prop => {
@@ -787,13 +830,15 @@ export class DatabaseTable {
         }
         const name = this.getIndexName(index.name, properties, type);
         // Process include columns (map property names to field names)
-        const includeColumns = index.include ? Utils.unique(Utils.flatten(Utils.asArray(index.include).map(prop => {
-            if (meta.properties[prop]) {
-                return meta.properties[prop].fieldNames;
-            }
-            /* v8 ignore next */
-            return [prop];
-        }))) : undefined;
+        const includeColumns = index.include
+            ? Utils.unique(Utils.flatten(Utils.asArray(index.include).map(prop => {
+                if (meta.properties[prop]) {
+                    return meta.properties[prop].fieldNames;
+                }
+                /* v8 ignore next */
+                return [prop];
+            })))
+            : undefined;
         // Process columns with advanced options (map property names to field names)
         const columns = index.columns?.map(col => {
             const fieldName = meta.properties[col.name]?.fieldNames[0] ?? col.name;
@@ -817,7 +862,7 @@ export class DatabaseTable {
         if (index.fillFactor != null && (index.fillFactor < 0 || index.fillFactor > 100)) {
             throw new Error(`fillFactor must be between 0 and 100, got ${index.fillFactor} for index '${name}' on entity '${meta.className}'`);
         }
-        this.indexes.push({
+        this.#indexes.push({
             keyName: name,
             columnNames: properties,
             composite: properties.length > 1,
@@ -838,16 +883,55 @@ export class DatabaseTable {
         });
     }
     addCheck(check) {
-        this.checks.push(check);
+        this.#checks.push(check);
     }
     toJSON() {
-        const { platform, columns, ...rest } = this;
+        const columns = this.#columns;
         const columnsMapped = Utils.keys(columns).reduce((o, col) => {
-            const { mappedType, ...restCol } = columns[col];
-            o[col] = restCol;
-            o[col].mappedType = Utils.keys(t).find(k => 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: Utils.keys(t).find(k => 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;
+            }
+            if (c.defaultConstraint) {
+                normalized.defaultConstraint = c.defaultConstraint;
+            }
+            o[col] = normalized;
             return o;
         }, {});
-        return { columns: columnsMapped, ...rest };
+        return {
+            name: this.name,
+            schema: this.schema,
+            columns: columnsMapped,
+            indexes: this.#indexes,
+            checks: this.#checks,
+            foreignKeys: this.#foreignKeys,
+            nativeEnums: this.nativeEnums,
+            comment: this.comment,
+        };
     }
 }

package/schema/SchemaComparator.d.ts

@@ -7,9 +7,7 @@ import type { AbstractSqlPlatform } from '../AbstractSqlPlatform.js';
  * Compares two Schemas and return an instance of SchemaDifference.
  */
 export declare class SchemaComparator {
-    private readonly platform;
-    private readonly helper;
-    private readonly logger;
+    #private;
     constructor(platform: AbstractSqlPlatform);
     /**
      * Returns a SchemaDifference object containing the differences between the schemas fromSchema and toSchema.