@mikro-orm/sql 7.1.12-dev.18 → 7.1.12-dev.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.12-dev.18",
+  "version": "7.1.12-dev.19",
   "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.11"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.12-dev.18"
+    "@mikro-orm/core": "7.1.12-dev.19"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/ObjectCriteriaNode.js

@@ -113,7 +113,8 @@ export class ObjectCriteriaNode extends CriteriaNode {
             }
             else if (isRawField) {
                 const rawField = RawQueryFragment.getKnownFragment(field);
-                o[raw(rawField.sql.replaceAll(ALIAS_REPLACEMENT, alias), rawField.params)] = payload;
+                qb.ensureTPTJoins();
+                o[raw(qb.helper.replaceAliases(rawField.sql, alias), rawField.params)] = payload;
             }
             else if (!childNode.validate && !childNode.prop && !field.includes('.') && !operator) {
                 // wrap unknown fields in raw() to prevent alias prefixing (e.g. raw SQL aliases in HAVING)

package/query/QueryBuilderHelper.d.ts

@@ -14,6 +14,11 @@ export declare class QueryBuilderHelper {
      * Returns the main alias if not a TPT property or if the property belongs to the main entity.
      */
     getTPTAliasForProperty(propName: string, defaultAlias: string): string;
+    /**
+     * Replaces `ALIAS_REPLACEMENT` placeholders, resolving column-qualified ones via
+     * `getTPTAliasForProperty()` so TPT inherited columns map to their owning table.
+     */
+    replaceAliases(sql: string, alias?: string): string;
     mapper(field: string | Raw | RawQueryFragmentSymbol, type?: QueryType): string;
     mapper(field: string | Raw | RawQueryFragmentSymbol, type?: QueryType, value?: any, alias?: string | null, schema?: string): string;
     processData(data: Dictionary, convertCustomTypes: boolean, multi?: boolean): any;

package/query/QueryBuilderHelper.js

@@ -1,5 +1,7 @@
 import { ALIAS_REPLACEMENT, ALIAS_REPLACEMENT_RE, ArrayType, JsonType, inspect, isRaw, LockMode, OptimisticLockError, QueryOperator, QueryOrderNumeric, raw, Raw, QueryHelper, ReferenceKind, Utils, ValidationError, } from '@mikro-orm/core';
 import { EMBEDDABLE_ARRAY_OPS, JoinType, QueryType } from './enums.js';
+/** Captures the column name that follows the alias placeholder. */
+const QUALIFYING_ALIAS_RE = new RegExp(ALIAS_REPLACEMENT_RE + '(?=["\'`\\]]*\\.["\'`\\[]?([\\w$]+))', 'g');
 /**
  * @internal
  */
@@ -49,6 +51,15 @@ export class QueryBuilderHelper {
         // Property not found in hierarchy, return default alias
         return defaultAlias;
     }
+    /**
+     * Replaces `ALIAS_REPLACEMENT` placeholders, resolving column-qualified ones via
+     * `getTPTAliasForProperty()` so TPT inherited columns map to their owning table.
+     */
+    replaceAliases(sql, alias = this.#alias) {
+        return sql
+            .replace(QUALIFYING_ALIAS_RE, (_, column) => this.getTPTAliasForProperty(column, alias))
+            .replaceAll(ALIAS_REPLACEMENT, alias);
+    }
     mapper(field, type = QueryType.SELECT, value, alias, schema) {
         if (isRaw(field)) {
             return raw(field.sql, field.params);
@@ -470,7 +481,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 = this.replaceAliases(raw.sql);
             const value = Utils.asArray(cond[key]);
             params.push(...raw.params);
             if (value.length > 0) {
@@ -581,7 +592,7 @@ export class QueryBuilderHelper {
             if (opValueIsRaw || typeof opValue?.toRaw === 'function') {
                 const query = opValueIsRaw ? opValue : opValue.toRaw();
                 const mappedKey = this.mapper(key, type, query, null);
-                let sql = query.sql.replaceAll(ALIAS_REPLACEMENT, this.#alias);
+                let sql = this.replaceAliases(query.sql);
                 if (['$in', '$nin'].includes(op)) {
                     sql = `(${sql})`;
                 }

package/typings.d.ts

@@ -277,6 +277,8 @@ export interface IQueryBuilder<T> {
     with(name: string, query: AnyQueryBuilder | NativeQueryBuilder | RawQueryFragment, options?: CteOptions): this;
     withRecursive(name: string, query: AnyQueryBuilder | NativeQueryBuilder | RawQueryFragment, options?: CteOptions): this;
     scheduleFilterCheck(path: string): void;
+    /** @internal */
+    ensureTPTJoins(): void;
     withSchema(schema: string): this;
 }
 export interface ICriteriaNodeProcessOptions {