@mikro-orm/sql 7.0.0-dev.320 → 7.0.0-dev.322

package/query/QueryBuilderHelper.d.ts

@@ -7,14 +7,7 @@ import type { NativeQueryBuilder } from './NativeQueryBuilder.js';
  * @internal
  */
 export declare class QueryBuilderHelper {
-    private readonly entityName;
-    private alias;
-    private readonly aliasMap;
-    private readonly subQueries;
-    private readonly driver;
-    private readonly tptAliasMap;
-    private readonly platform;
-    private readonly metadata;
+    #private;
     constructor(entityName: EntityName, alias: string, aliasMap: Dictionary<Alias<any>>, subQueries: Dictionary<string>, driver: AbstractSqlDriver, tptAliasMap?: Dictionary<string>);
     /**
      * For TPT inheritance, finds the correct alias for a property based on which entity owns it.

package/query/QueryBuilderHelper.js

@@ -4,30 +4,30 @@ import { JoinType, QueryType } from './enums.js';
  * @internal
  */
 export class QueryBuilderHelper {
-    entityName;
-    alias;
-    aliasMap;
-    subQueries;
-    driver;
-    tptAliasMap;
-    platform;
-    metadata;
+    #platform;
+    #metadata;
+    #entityName;
+    #alias;
+    #aliasMap;
+    #subQueries;
+    #driver;
+    #tptAliasMap;
     constructor(entityName, alias, aliasMap, subQueries, driver, tptAliasMap = {}) {
-        this.entityName = entityName;
-        this.alias = alias;
-        this.aliasMap = aliasMap;
-        this.subQueries = subQueries;
-        this.driver = driver;
-        this.tptAliasMap = tptAliasMap;
-        this.platform = this.driver.getPlatform();
-        this.metadata = this.driver.getMetadata();
+        this.#entityName = entityName;
+        this.#alias = alias;
+        this.#aliasMap = aliasMap;
+        this.#subQueries = subQueries;
+        this.#driver = driver;
+        this.#tptAliasMap = tptAliasMap;
+        this.#platform = this.#driver.getPlatform();
+        this.#metadata = this.#driver.getMetadata();
     }
     /**
      * For TPT inheritance, finds the correct alias for a property based on which entity owns it.
      * Returns the main alias if not a TPT property or if the property belongs to the main entity.
      */
     getTPTAliasForProperty(propName, defaultAlias) {
-        const meta = this.aliasMap[defaultAlias]?.meta ?? this.metadata.get(this.entityName);
+        const meta = this.#aliasMap[defaultAlias]?.meta ?? this.#metadata.get(this.#entityName);
         if (meta?.inheritanceType !== 'tpt' || !meta.tptParent) {
             return defaultAlias;
         }
@@ -38,7 +38,7 @@ export class QueryBuilderHelper {
         // Walk up the TPT hierarchy to find which parent owns this property
         let parentMeta = meta.tptParent;
         while (parentMeta) {
-            const parentAlias = this.tptAliasMap[parentMeta.className];
+            const parentAlias = this.#tptAliasMap[parentMeta.className];
             if (parentAlias && parentMeta.ownProps?.some(p => p.name === propName || p.fieldNames?.includes(propName))) {
                 return parentAlias;
             }
@@ -67,13 +67,13 @@ export class QueryBuilderHelper {
                 const prop = this.getProperty(f, a);
                 const fkIdx2 = prop?.fieldNames.findIndex(name => name === f) ?? -1;
                 if (fkIdx2 !== -1) {
-                    parts.push(this.mapper(a !== this.alias ? `${a}.${prop.fieldNames[fkIdx2]}` : prop.fieldNames[fkIdx2], type, value, alias));
+                    parts.push(this.mapper(a !== this.#alias ? `${a}.${prop.fieldNames[fkIdx2]}` : prop.fieldNames[fkIdx2], type, value, alias));
                 }
                 else if (prop) {
-                    parts.push(...prop.fieldNames.map(f => this.mapper(a !== this.alias ? `${a}.${f}` : f, type, value, alias)));
+                    parts.push(...prop.fieldNames.map(f => this.mapper(a !== this.#alias ? `${a}.${f}` : f, type, value, alias)));
                 }
                 else {
-                    parts.push(this.mapper(a !== this.alias ? `${a}.${f}` : f, type, value, alias));
+                    parts.push(this.mapper(a !== this.#alias ? `${a}.${f}` : f, type, value, alias));
                 }
             }
             // flatten the value if we see we are expanding nested composite key
@@ -87,16 +87,16 @@ export class QueryBuilderHelper {
                     }
                 });
             }
-            return raw('(' + parts.map(part => this.platform.quoteIdentifier(part)).join(', ') + ')');
+            return raw('(' + parts.map(part => this.#platform.quoteIdentifier(part)).join(', ') + ')');
         }
         const [a, f] = this.splitField(field);
         const prop = this.getProperty(f, a);
         // For TPT inheritance, resolve the correct alias for this property
         // Only apply TPT resolution when `a` is an actual table alias (in aliasMap),
         // not when it's an embedded property name like 'profile1.identity.links'
-        const isTableAlias = !!this.aliasMap[a];
-        const baseAlias = isTableAlias ? a : this.alias;
-        const resolvedAlias = isTableAlias ? this.getTPTAliasForProperty(prop?.name ?? f, a) : this.alias;
+        const isTableAlias = !!this.#aliasMap[a];
+        const baseAlias = isTableAlias ? a : this.#alias;
+        const resolvedAlias = isTableAlias ? this.getTPTAliasForProperty(prop?.name ?? f, a) : this.#alias;
         const aliasPrefix = isTableNameAliasRequired ? resolvedAlias + '.' : '';
         const fkIdx2 = prop?.fieldNames.findIndex(name => name === f) ?? -1;
         const fkIdx = fkIdx2 === -1 ? 0 : fkIdx2;
@@ -108,13 +108,13 @@ export class QueryBuilderHelper {
             return raw(this.prefix(field, isTableNameAliasRequired));
         }
         if (prop?.formula) {
-            const alias2 = this.platform.quoteIdentifier(a).toString();
+            const alias2 = this.#platform.quoteIdentifier(a).toString();
             const aliasName = alias === undefined ? prop.fieldNames[0] : alias;
-            const as = aliasName === null ? '' : ` as ${this.platform.quoteIdentifier(aliasName)}`;
-            const meta = this.aliasMap[a]?.meta ?? this.metadata.get(this.entityName);
+            const as = aliasName === null ? '' : ` as ${this.#platform.quoteIdentifier(aliasName)}`;
+            const meta = this.#aliasMap[a]?.meta ?? this.#metadata.get(this.#entityName);
             const table = this.createFormulaTable(alias2, meta, schema);
             const columns = meta.createColumnMappingObject(p => this.getTPTAliasForProperty(p.name, a), alias2);
-            let value = this.driver.evaluateFormula(prop.formula, columns, table);
+            let value = this.#driver.evaluateFormula(prop.formula, columns, table);
             if (!this.isTableNameAliasRequired(type)) {
                 value = value.replaceAll(alias2 + '.', '');
             }
@@ -125,16 +125,16 @@ export class QueryBuilderHelper {
             if (prop.fieldNames.length > 1 && fkIdx !== -1) {
                 const fk = prop.targetMeta.getPrimaryProps()[fkIdx];
                 const prefixed = this.prefix(field, isTableNameAliasRequired, true, fkIdx);
-                valueSQL = fk.customType.convertToJSValueSQL(prefixed, this.platform);
+                valueSQL = fk.customType.convertToJSValueSQL(prefixed, this.#platform);
             }
             else {
                 const prefixed = this.prefix(field, isTableNameAliasRequired, true);
-                valueSQL = prop.customType.convertToJSValueSQL(prefixed, this.platform);
+                valueSQL = prop.customType.convertToJSValueSQL(prefixed, this.#platform);
             }
             if (alias === null) {
                 return raw(valueSQL);
             }
-            return raw(`${valueSQL} as ${this.platform.quoteIdentifier(alias ?? prop.fieldNames[fkIdx])}`);
+            return raw(`${valueSQL} as ${this.#platform.quoteIdentifier(alias ?? prop.fieldNames[fkIdx])}`);
         }
         let ret = this.prefix(field, false, false, fkIdx);
         if (alias) {
@@ -149,11 +149,11 @@ export class QueryBuilderHelper {
         if (Array.isArray(data)) {
             return data.map(d => this.processData(d, convertCustomTypes, true));
         }
-        const meta = this.metadata.find(this.entityName);
-        data = this.driver.mapDataToFieldNames(data, true, meta?.properties, convertCustomTypes);
+        const meta = this.#metadata.find(this.#entityName);
+        data = this.#driver.mapDataToFieldNames(data, true, meta?.properties, convertCustomTypes);
         if (!Utils.hasObjectKeys(data) && meta && multi) {
             /* v8 ignore next */
-            data[meta.getPrimaryProps()[0].fieldNames[0]] = this.platform.usesDefaultKeyword() ? raw('default') : undefined;
+            data[meta.getPrimaryProps()[0].fieldNames[0]] = this.#platform.usesDefaultKeyword() ? raw('default') : undefined;
         }
         return data;
     }
@@ -163,11 +163,11 @@ export class QueryBuilderHelper {
         const joinColumns = prop.owner ? prop.referencedColumnNames : prop2.joinColumns;
         const inverseJoinColumns = prop.referencedColumnNames;
         const primaryKeys = prop.owner ? prop.joinColumns : prop2.referencedColumnNames;
-        schema ??= prop.targetMeta?.schema === '*' ? '*' : this.driver.getSchemaName(prop.targetMeta);
+        schema ??= prop.targetMeta?.schema === '*' ? '*' : this.#driver.getSchemaName(prop.targetMeta);
         cond = Utils.merge(cond, prop.where);
         // For inverse side of polymorphic relations, add discriminator condition
         if (!prop.owner && prop2.polymorphic && prop2.discriminatorColumn && prop2.discriminatorMap) {
-            const ownerMeta = this.aliasMap[ownerAlias]?.meta ?? this.metadata.get(this.entityName);
+            const ownerMeta = this.#aliasMap[ownerAlias]?.meta ?? this.#metadata.get(this.#entityName);
             const discriminatorValue = QueryHelper.findDiscriminatorValue(prop2.discriminatorMap, ownerMeta.class);
             if (discriminatorValue) {
                 cond[`${alias}.${prop2.discriminatorColumn}`] = discriminatorValue;
@@ -194,7 +194,7 @@ export class QueryBuilderHelper {
             ownerAlias,
             alias,
             table: this.getTableName(prop.targetMeta.class),
-            schema: prop.targetMeta?.schema === '*' ? '*' : this.driver.getSchemaName(prop.targetMeta, { schema }),
+            schema: prop.targetMeta?.schema === '*' ? '*' : this.#driver.getSchemaName(prop.targetMeta, { schema }),
             joinColumns: prop.referencedColumnNames,
             // For polymorphic relations, fieldNames includes the discriminator column which is not
             // part of the join condition - use joinColumns (the FK columns only) instead
@@ -202,7 +202,7 @@ export class QueryBuilderHelper {
         };
     }
     joinManyToManyReference(prop, ownerAlias, alias, pivotAlias, type, cond, path, schema) {
-        const pivotMeta = this.metadata.find(prop.pivotEntity);
+        const pivotMeta = this.#metadata.find(prop.pivotEntity);
         const ret = {
             [`${ownerAlias}.${prop.name}#${pivotAlias}`]: {
                 prop,
@@ -215,7 +215,7 @@ export class QueryBuilderHelper {
                 primaryKeys: prop.referencedColumnNames,
                 cond: {},
                 table: pivotMeta.tableName,
-                schema: prop.targetMeta?.schema === '*' ? '*' : this.driver.getSchemaName(pivotMeta, { schema }),
+                schema: prop.targetMeta?.schema === '*' ? '*' : this.#driver.getSchemaName(pivotMeta, { schema }),
                 path: path.endsWith('[pivot]') ? path : `${path}[pivot]`,
             },
         };
@@ -248,25 +248,25 @@ export class QueryBuilderHelper {
         const conditions = [];
         const params = [];
         schema = join.schema === '*' ? schema : (join.schema ?? schemaOverride);
-        if (schema && schema !== this.platform.getDefaultSchemaName()) {
+        if (schema && schema !== this.#platform.getDefaultSchemaName()) {
             table = `${schema}.${table}`;
         }
         if (join.prop.name !== '__subquery__') {
             join.primaryKeys.forEach((primaryKey, idx) => {
                 const right = `${join.alias}.${join.joinColumns[idx]}`;
                 if (join.prop.formula) {
-                    const quotedAlias = this.platform.quoteIdentifier(join.ownerAlias).toString();
-                    const ownerMeta = this.aliasMap[join.ownerAlias]?.meta ?? this.metadata.get(this.entityName);
+                    const quotedAlias = this.#platform.quoteIdentifier(join.ownerAlias).toString();
+                    const ownerMeta = this.#aliasMap[join.ownerAlias]?.meta ?? this.#metadata.get(this.#entityName);
                     const table = this.createFormulaTable(quotedAlias, ownerMeta, schema);
                     const columns = ownerMeta.createColumnMappingObject(p => this.getTPTAliasForProperty(p.name, join.ownerAlias), quotedAlias);
-                    const left = this.driver.evaluateFormula(join.prop.formula, columns, table);
-                    conditions.push(`${left} = ${this.platform.quoteIdentifier(right)}`);
+                    const left = this.#driver.evaluateFormula(join.prop.formula, columns, table);
+                    conditions.push(`${left} = ${this.#platform.quoteIdentifier(right)}`);
                     return;
                 }
                 const left = join.prop.object && join.prop.fieldNameRaw
                     ? join.prop.fieldNameRaw.replaceAll(ALIAS_REPLACEMENT, join.ownerAlias)
-                    : this.platform.quoteIdentifier(`${join.ownerAlias}.${primaryKey}`);
-                conditions.push(`${left} = ${this.platform.quoteIdentifier(right)}`);
+                    : this.#platform.quoteIdentifier(`${join.ownerAlias}.${primaryKey}`);
+                conditions.push(`${left} = ${this.#platform.quoteIdentifier(right)}`);
             });
         }
         if (join.prop.targetMeta?.root.inheritanceType === 'sti' &&
@@ -280,15 +280,15 @@ export class QueryBuilderHelper {
         if (join.prop.polymorphic && join.prop.discriminatorColumn && join.prop.discriminatorMap) {
             const discriminatorValue = QueryHelper.findDiscriminatorValue(join.prop.discriminatorMap, join.prop.targetMeta.class);
             if (discriminatorValue) {
-                const discriminatorCol = this.platform.quoteIdentifier(`${join.ownerAlias}.${join.prop.discriminatorColumn}`);
+                const discriminatorCol = this.#platform.quoteIdentifier(`${join.ownerAlias}.${join.prop.discriminatorColumn}`);
                 conditions.push(`${discriminatorCol} = ?`);
                 params.push(discriminatorValue);
             }
         }
         let sql = method + ' ';
         if (join.nested) {
-            const asKeyword = this.platform.usesAsKeyword() ? ' as ' : ' ';
-            sql += `(${this.platform.quoteIdentifier(table)}${asKeyword}${this.platform.quoteIdentifier(join.alias)}`;
+            const asKeyword = this.#platform.usesAsKeyword() ? ' as ' : ' ';
+            sql += `(${this.#platform.quoteIdentifier(table)}${asKeyword}${this.#platform.quoteIdentifier(join.alias)}`;
             for (const nested of join.nested) {
                 const { sql: nestedSql, params: nestedParams } = this.createJoinExpression(nested, joins, schema, schemaOverride);
                 sql += ' ' + nestedSql;
@@ -297,19 +297,19 @@ export class QueryBuilderHelper {
             sql += `)`;
         }
         else if (join.subquery) {
-            const asKeyword = this.platform.usesAsKeyword() ? ' as ' : ' ';
-            sql += `(${join.subquery})${asKeyword}${this.platform.quoteIdentifier(join.alias)}`;
+            const asKeyword = this.#platform.usesAsKeyword() ? ' as ' : ' ';
+            sql += `(${join.subquery})${asKeyword}${this.#platform.quoteIdentifier(join.alias)}`;
         }
         else {
             sql +=
-                this.platform.quoteIdentifier(table) +
-                    (this.platform.usesAsKeyword() ? ' as ' : ' ') +
-                    this.platform.quoteIdentifier(join.alias);
+                this.#platform.quoteIdentifier(table) +
+                    (this.#platform.usesAsKeyword() ? ' as ' : ' ') +
+                    this.#platform.quoteIdentifier(join.alias);
         }
-        const oldAlias = this.alias;
-        this.alias = join.alias;
+        const oldAlias = this.#alias;
+        this.#alias = join.alias;
         const subquery = this._appendQueryCondition(QueryType.SELECT, join.cond);
-        this.alias = oldAlias;
+        this.#alias = oldAlias;
         if (subquery.sql) {
             conditions.push(subquery.sql);
             subquery.params.forEach(p => params.push(p));
@@ -332,12 +332,12 @@ export class QueryBuilderHelper {
         ];
     }
     isOneToOneInverse(field, meta) {
-        meta ??= this.metadata.find(this.entityName);
+        meta ??= this.#metadata.find(this.#entityName);
         const prop = meta.properties[field.replace(/:ref$/, '')];
         return prop?.kind === ReferenceKind.ONE_TO_ONE && !prop.owner;
     }
     getTableName(entityName) {
-        const meta = this.metadata.find(entityName);
+        const meta = this.#metadata.find(entityName);
         return meta?.tableName ?? Utils.className(entityName);
     }
     /**
@@ -432,7 +432,7 @@ export class QueryBuilderHelper {
         const parts = [];
         const params = [];
         if (this.isSimpleRegExp(cond[key])) {
-            parts.push(`${this.platform.quoteIdentifier(this.mapper(key, type))} like ?`);
+            parts.push(`${this.#platform.quoteIdentifier(this.mapper(key, type))} like ?`);
             params.push(this.getRegExpParam(cond[key]));
             return { sql: parts.join(' and '), params };
         }
@@ -442,7 +442,7 @@ export class QueryBuilderHelper {
         const op = cond[key] === null ? 'is' : '=';
         if (Raw.isKnownFragmentSymbol(key)) {
             const raw = Raw.getKnownFragment(key);
-            const sql = raw.sql.replaceAll(ALIAS_REPLACEMENT, this.alias);
+            const sql = raw.sql.replaceAll(ALIAS_REPLACEMENT, this.#alias);
             const value = Utils.asArray(cond[key]);
             params.push(...raw.params);
             if (value.length > 0) {
@@ -455,13 +455,13 @@ export class QueryBuilderHelper {
             return { sql: parts.join(' and '), params };
         }
         const fields = Utils.splitPrimaryKeys(key);
-        if (this.subQueries[key]) {
+        if (this.#subQueries[key]) {
             const val = this.getValueReplacement(fields, cond[key], params, key);
-            parts.push(`(${this.subQueries[key]}) ${op} ${val}`);
+            parts.push(`(${this.#subQueries[key]}) ${op} ${val}`);
             return { sql: parts.join(' and '), params };
         }
         const val = this.getValueReplacement(fields, cond[key], params, key);
-        parts.push(`${this.platform.quoteIdentifier(this.mapper(key, type, cond[key], null))} ${op} ${val}`);
+        parts.push(`${this.#platform.quoteIdentifier(this.mapper(key, type, cond[key], null))} ${op} ${val}`);
         return { sql: parts.join(' and '), params };
     }
     processObjectSubCondition(cond, key, type) {
@@ -483,7 +483,7 @@ export class QueryBuilderHelper {
             return { sql: parts.join(' and '), params };
         }
         if (value instanceof RegExp) {
-            value = this.platform.getRegExpValue(value);
+            value = this.#platform.getRegExpValue(value);
         }
         // operators
         const op = Object.keys(QueryOperator).find(op => op in value);
@@ -496,17 +496,17 @@ export class QueryBuilderHelper {
         const fields = rawField ? [key] : Utils.splitPrimaryKeys(key);
         if (fields.length > 1 && Array.isArray(value[op])) {
             const singleTuple = !value[op].every((v) => Array.isArray(v));
-            if (!this.platform.allowsComparingTuples()) {
+            if (!this.#platform.allowsComparingTuples()) {
                 const mapped = fields.map(f => this.mapper(f, type));
                 if (op === '$in') {
                     const conds = value[op].map(() => {
-                        return `(${mapped.map(field => `${this.platform.quoteIdentifier(field)} = ?`).join(' and ')})`;
+                        return `(${mapped.map(field => `${this.#platform.quoteIdentifier(field)} = ?`).join(' and ')})`;
                     });
                     parts.push(`(${conds.join(' or ')})`);
                     params.push(...Utils.flatten(value[op]));
                     return { sql: parts.join(' and '), params };
                 }
-                parts.push(...mapped.map(field => `${this.platform.quoteIdentifier(field)} = ?`));
+                parts.push(...mapped.map(field => `${this.#platform.quoteIdentifier(field)} = ?`));
                 params.push(...Utils.flatten(value[op]));
                 return { sql: parts.join(' and '), params };
             }
@@ -516,9 +516,9 @@ export class QueryBuilderHelper {
                 value[op] = raw(sql, tmp);
             }
         }
-        if (this.subQueries[key]) {
+        if (this.#subQueries[key]) {
             const val = this.getValueReplacement(fields, value[op], params, op);
-            parts.push(`(${this.subQueries[key]}) ${replacement} ${val}`);
+            parts.push(`(${this.#subQueries[key]}) ${replacement} ${val}`);
             return { sql: parts.join(' and '), params };
         }
         const [a, f] = rawField ? [] : this.splitField(key);
@@ -531,7 +531,7 @@ export class QueryBuilderHelper {
             if (!prop) {
                 throw new Error(`Cannot use $fulltext operator on ${String(key)}, property not found`);
             }
-            const { sql, params: params2 } = raw(this.platform.getFullTextWhereClause(prop), {
+            const { sql, params: params2 } = raw(this.#platform.getFullTextWhereClause(prop), {
                 column: this.mapper(key, type, undefined, null),
                 query: value[op],
             });
@@ -543,7 +543,7 @@ export class QueryBuilderHelper {
         }
         else if (op === '$re') {
             const mappedKey = this.mapper(key, type, value[op], null);
-            const processed = this.platform.mapRegExpCondition(mappedKey, value);
+            const processed = this.#platform.mapRegExpCondition(mappedKey, value);
             parts.push(processed.sql);
             params.push(...processed.params);
         }
@@ -554,13 +554,13 @@ export class QueryBuilderHelper {
             if (['$in', '$nin'].includes(op)) {
                 sql = `(${sql})`;
             }
-            parts.push(`${this.platform.quoteIdentifier(mappedKey)} ${replacement} ${sql}`);
+            parts.push(`${this.#platform.quoteIdentifier(mappedKey)} ${replacement} ${sql}`);
             params.push(...query.params);
         }
         else {
             const mappedKey = this.mapper(key, type, value[op], null);
             const val = this.getValueReplacement(fields, value[op], params, op, prop);
-            parts.push(`${this.platform.quoteIdentifier(mappedKey)} ${replacement} ${val}`);
+            parts.push(`${this.#platform.quoteIdentifier(mappedKey)} ${replacement} ${val}`);
         }
         return { sql: parts.join(' and '), params };
     }
@@ -575,7 +575,7 @@ export class QueryBuilderHelper {
                 return `(${tmp.join(', ')})`;
             }
             if (prop?.customType instanceof ArrayType) {
-                const item = prop.customType.convertToDatabaseValue(value, this.platform, {
+                const item = prop.customType.convertToDatabaseValue(value, this.#platform, {
                     fromQuery: true,
                     key,
                     mode: 'query',
@@ -603,7 +603,7 @@ export class QueryBuilderHelper {
             replacement = op === '$eq' ? 'is' : 'is not';
         }
         if (op === '$re') {
-            replacement = this.platform.getRegExpOperator(value[op], value.$flags);
+            replacement = this.#platform.getRegExpOperator(value[op], value.$flags);
         }
         if (replacement.includes('?')) {
             replacement = replacement.replaceAll('?', '\\?');
@@ -648,7 +648,7 @@ export class QueryBuilderHelper {
             const order = typeof direction === 'number' ? QueryOrderNumeric[direction] : direction;
             if (Raw.isKnownFragmentSymbol(key)) {
                 const raw = Raw.getKnownFragment(key);
-                ret.push(...this.platform.getOrderByExpression(this.platform.formatQuery(raw.sql, raw.params), order, collation));
+                ret.push(...this.#platform.getOrderByExpression(this.#platform.formatQuery(raw.sql, raw.params), order, collation));
                 continue;
             }
             for (const f of Utils.splitPrimaryKeys(key)) {
@@ -662,19 +662,19 @@ export class QueryBuilderHelper {
                 const rawColumn = typeof column === 'string'
                     ? column
                         .split('.')
-                        .map(e => this.platform.quoteIdentifier(e))
+                        .map(e => this.#platform.quoteIdentifier(e))
                         .join('.')
                     : column;
                 const customOrder = prop?.customOrder;
-                let colPart = customOrder ? this.platform.generateCustomOrder(rawColumn, customOrder) : rawColumn;
+                let colPart = customOrder ? this.#platform.generateCustomOrder(rawColumn, customOrder) : rawColumn;
                 if (isRaw(colPart)) {
-                    colPart = this.platform.formatQuery(colPart.sql, colPart.params);
+                    colPart = this.#platform.formatQuery(colPart.sql, colPart.params);
                 }
                 if (Array.isArray(order)) {
                     order.forEach(part => ret.push(...this.getQueryOrderFromObject(type, part, populate, collation)));
                 }
                 else {
-                    ret.push(...this.platform.getOrderByExpression(colPart, order, collation));
+                    ret.push(...this.#platform.getOrderByExpression(colPart, order, collation));
                 }
             }
         }
@@ -687,7 +687,7 @@ export class QueryBuilderHelper {
             parts[parts.length - 1] = parts[parts.length - 1].substring(0, parts[parts.length - 1].indexOf(':'));
         }
         if (parts.length === 1) {
-            return [this.alias, parts[0], ref];
+            return [this.#alias, parts[0], ref];
         }
         if (greedyAlias) {
             const fromField = parts.pop();
@@ -699,28 +699,28 @@ export class QueryBuilderHelper {
         return [fromAlias, fromField, ref];
     }
     getLockSQL(qb, lockMode, lockTables = [], joinsMap) {
-        const meta = this.metadata.find(this.entityName);
+        const meta = this.#metadata.find(this.#entityName);
         if (lockMode === LockMode.OPTIMISTIC && meta && !meta.versionProperty) {
-            throw OptimisticLockError.lockFailed(Utils.className(this.entityName));
+            throw OptimisticLockError.lockFailed(Utils.className(this.#entityName));
         }
         if (lockMode !== LockMode.OPTIMISTIC && lockTables.length === 0 && joinsMap) {
             const joins = Object.values(joinsMap);
             const innerJoins = joins.filter(join => [JoinType.innerJoin, JoinType.innerJoinLateral, JoinType.nestedInnerJoin].includes(join.type));
             if (joins.length > innerJoins.length) {
-                lockTables.push(this.alias, ...innerJoins.map(join => join.alias));
+                lockTables.push(this.#alias, ...innerJoins.map(join => join.alias));
             }
         }
         qb.lockMode(lockMode, lockTables);
     }
     updateVersionProperty(qb, data) {
-        const meta = this.metadata.find(this.entityName);
+        const meta = this.#metadata.find(this.#entityName);
         if (!meta?.versionProperty || meta.versionProperty in data) {
             return;
         }
         const versionProperty = meta.properties[meta.versionProperty];
-        let sql = this.platform.quoteIdentifier(versionProperty.fieldNames[0]) + ' + 1';
+        let sql = this.#platform.quoteIdentifier(versionProperty.fieldNames[0]) + ' + 1';
         if (versionProperty.runtimeType === 'Date') {
-            sql = this.platform.getCurrentTimestampSQL(versionProperty.length);
+            sql = this.#platform.getCurrentTimestampSQL(versionProperty.length);
         }
         qb.update({ [versionProperty.fieldNames[0]]: raw(sql) });
     }
@@ -728,8 +728,8 @@ export class QueryBuilderHelper {
         let ret;
         if (!this.isPrefixed(field)) {
             // For TPT inheritance, resolve the correct alias for this property
-            const tptAlias = this.getTPTAliasForProperty(field, this.alias);
-            const alias = always ? (quote ? tptAlias : this.platform.quoteIdentifier(tptAlias)) + '.' : '';
+            const tptAlias = this.getTPTAliasForProperty(field, this.#alias);
+            const alias = always ? (quote ? tptAlias : this.#platform.quoteIdentifier(tptAlias)) + '.' : '';
             const fieldName = this.fieldName(field, tptAlias, always, idx);
             if (fieldName instanceof Raw) {
                 return fieldName.sql;
@@ -742,7 +742,7 @@ export class QueryBuilderHelper {
             // For TPT inheritance, resolve the correct alias for this property
             // Only apply TPT resolution when `a` is an actual table alias (in aliasMap),
             // not when it's an embedded property name like 'profile1.identity.links'
-            const isTableAlias = !!this.aliasMap[a];
+            const isTableAlias = !!this.#aliasMap[a];
             const resolvedAlias = isTableAlias ? this.getTPTAliasForProperty(f, a) : a;
             const fieldName = this.fieldName(f, resolvedAlias, always, idx);
             if (fieldName instanceof Raw) {
@@ -751,7 +751,7 @@ export class QueryBuilderHelper {
             ret = resolvedAlias + '.' + fieldName;
         }
         if (quote) {
-            return this.platform.quoteIdentifier(ret);
+            return this.#platform.quoteIdentifier(ret);
         }
         return ret;
     }
@@ -792,7 +792,7 @@ export class QueryBuilderHelper {
             if (!always) {
                 return raw(prop.fieldNameRaw
                     .replace(new RegExp(ALIAS_REPLACEMENT_RE + '\\.?', 'g'), '')
-                    .replace(this.platform.quoteIdentifier('') + '.', ''));
+                    .replace(this.#platform.quoteIdentifier('') + '.', ''));
             }
             if (alias) {
                 return raw(prop.fieldNameRaw.replace(new RegExp(ALIAS_REPLACEMENT_RE, 'g'), alias));
@@ -804,8 +804,8 @@ export class QueryBuilderHelper {
         return prop.fieldNames?.[idx] ?? field;
     }
     getProperty(field, alias) {
-        const entityName = this.aliasMap[alias]?.entityName || this.entityName;
-        const meta = this.metadata.find(entityName);
+        const entityName = this.#aliasMap[alias]?.entityName || this.#entityName;
+        const meta = this.#metadata.find(entityName);
         // raw table name (e.g. CTE) — no metadata available
         if (!meta) {
             return undefined;
@@ -828,7 +828,7 @@ export class QueryBuilderHelper {
         return [QueryType.SELECT, QueryType.COUNT].includes(type);
     }
     processOnConflictCondition(cond, schema) {
-        const meta = this.metadata.get(this.entityName);
+        const meta = this.#metadata.get(this.#entityName);
         const tableName = meta.tableName;
         for (const key of Object.keys(cond)) {
             const mapped = this.mapper(key, QueryType.UPSERT);

package/query/ScalarCriteriaNode.js

@@ -18,7 +18,9 @@ export class ScalarCriteriaNode extends CriteriaNode {
             const type = this.prop.kind === ReferenceKind.MANY_TO_MANY ? JoinType.pivotJoin : JoinType.leftJoin;
             qb.join(field, nestedAlias, undefined, type, path);
             // select the owner as virtual property when joining from 1:1 inverse side, but only if the parent is root entity
-            if (this.prop.kind === ReferenceKind.ONE_TO_ONE && !parentPath.includes('.') && !qb._fields?.includes(field)) {
+            if (this.prop.kind === ReferenceKind.ONE_TO_ONE &&
+                !parentPath.includes('.') &&
+                !qb.state.fields?.includes(field)) {
                 qb.addSelect(field);
             }
         }

package/schema/DatabaseSchema.d.ts

@@ -7,19 +7,21 @@ import type { AbstractSqlPlatform } from '../AbstractSqlPlatform.js';
  * @internal
  */
 export declare class DatabaseSchema {
-    private readonly platform;
+    #private;
     readonly name: string;
-    private tables;
-    private views;
-    private namespaces;
-    private nativeEnums;
     constructor(platform: AbstractSqlPlatform, name: string);
     addTable(name: string, schema: string | undefined | null, comment?: string): DatabaseTable;
     getTables(): DatabaseTable[];
+    /** @internal */
+    setTables(tables: DatabaseTable[]): void;
+    /** @internal */
+    setNamespaces(namespaces: Set<string>): void;
     getTable(name: string): DatabaseTable | undefined;
     hasTable(name: string): boolean;
     addView(name: string, schema: string | undefined | null, definition: string, materialized?: boolean, withData?: boolean): DatabaseView;
     getViews(): DatabaseView[];
+    /** @internal */
+    setViews(views: DatabaseView[]): void;
     getView(name: string): DatabaseView | undefined;
     hasView(name: string): boolean;
     setNativeEnums(nativeEnums: Dictionary<{