@mikro-orm/sql 7.0.10-dev.10 → 7.0.10-dev.12

package/AbstractSqlConnection.d.ts

@@ -1,5 +1,5 @@
 import { type ControlledTransaction, type Dialect, Kysely } from 'kysely';
-import { type AnyEntity, Connection, type Dictionary, type EntityData, type IsolationLevel, type LogContext, type LoggingOptions, type MaybePromise, type QueryResult, RawQueryFragment, type Transaction, type TransactionEventBroadcaster } from '@mikro-orm/core';
+import { type AnyEntity, Connection, type Dictionary, type EntityData, type IsolationLevel, type LogContext, type LoggingOptions, type MaybePromise, type QueryResult, type RawQueryFragment, type Transaction, type TransactionEventBroadcaster } from '@mikro-orm/core';
 import type { AbstractSqlPlatform } from './AbstractSqlPlatform.js';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 /** Base class for SQL database connections, built on top of Kysely. */

package/AbstractSqlConnection.js

@@ -1,5 +1,5 @@
 import { CompiledQuery, Kysely } from 'kysely';
-import { Connection, EventType, RawQueryFragment, Utils, } from '@mikro-orm/core';
+import { Connection, EventType, isRaw, Utils, } from '@mikro-orm/core';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 /** Base class for SQL database connections, built on top of Kysely. */
 export class AbstractSqlConnection extends Connection {
@@ -170,7 +170,7 @@ export class AbstractSqlConnection extends Connection {
         if (query instanceof NativeQueryBuilder) {
             query = query.toRaw();
         }
-        if (query instanceof RawQueryFragment) {
+        if (isRaw(query)) {
             params = query.params;
             query = query.sql;
         }

package/AbstractSqlDriver.js

@@ -157,7 +157,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (res instanceof QueryBuilder) {
             return this.wrapVirtualExpressionInSubquery(meta, res.getFormattedQuery(), where, options, type);
         }
-        if (res instanceof RawQueryFragment) {
+        if (isRaw(res)) {
             const expr = this.platform.formatQuery(res.sql, res.params);
             return this.wrapVirtualExpressionInSubquery(meta, expr, where, options, type);
         }
@@ -185,7 +185,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             yield* this.wrapVirtualExpressionInSubqueryStream(meta, res.getFormattedQuery(), where, options, QueryType.SELECT);
             return;
         }
-        if (res instanceof RawQueryFragment) {
+        if (isRaw(res)) {
             const expr = this.platform.formatQuery(res.sql, res.params);
             yield* this.wrapVirtualExpressionInSubqueryStream(meta, expr, where, options, QueryType.SELECT);
             return;

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -1,4 +1,4 @@
-import { LockMode, QueryFlag, RawQueryFragment, Utils } from '@mikro-orm/core';
+import { isRaw, LockMode, QueryFlag, Utils } from '@mikro-orm/core';
 import { NativeQueryBuilder } from '../../query/NativeQueryBuilder.js';
 import { QueryType } from '../../query/enums.js';
 /** @internal */
@@ -98,7 +98,7 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         }
         this.parts.push(`merge into ${this.getTableName()}`);
         this.parts.push(`using (values ${parts.join(', ')}) as tsource(${keys.map(key => this.quote(key)).join(', ')})`);
-        if (clause.fields instanceof RawQueryFragment) {
+        if (isRaw(clause.fields)) {
             this.parts.push(clause.fields.sql);
             this.params.push(...clause.fields.params);
         }

package/dialects/mysql/MySqlNativeQueryBuilder.js

@@ -1,4 +1,4 @@
-import { LockMode, RawQueryFragment, Utils } from '@mikro-orm/core';
+import { isRaw, LockMode, Utils } from '@mikro-orm/core';
 import { NativeQueryBuilder } from '../../query/NativeQueryBuilder.js';
 /** @internal */
 export class MySqlNativeQueryBuilder extends NativeQueryBuilder {
@@ -65,7 +65,7 @@ export class MySqlNativeQueryBuilder extends NativeQueryBuilder {
             return;
         }
         this.parts.push('on conflict');
-        if (clause.fields instanceof RawQueryFragment) {
+        if (isRaw(clause.fields)) {
             this.parts.push(clause.fields.sql);
             this.params.push(...clause.fields.params);
         }

package/dialects/oracledb/OracleNativeQueryBuilder.js

@@ -1,4 +1,4 @@
-import { raw, RawQueryFragment, Utils } from '@mikro-orm/core';
+import { isRaw, raw, Utils } from '@mikro-orm/core';
 import { QueryType } from '../../query/enums.js';
 import { NativeQueryBuilder } from '../../query/NativeQueryBuilder.js';
 /** @internal */
@@ -164,7 +164,7 @@ export class OracleNativeQueryBuilder extends NativeQueryBuilder {
         this.parts.push(`merge into ${this.getTableName()}`);
         this.parts.push(`using (${parts.join(' union all ')}) tsource`);
         /* v8 ignore next 4: RawQueryFragment conflict fields branch */
-        if (clause.fields instanceof RawQueryFragment) {
+        if (isRaw(clause.fields)) {
             this.parts.push(clause.fields.sql);
             this.params.push(...clause.fields.params);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.10-dev.10",
+  "version": "7.0.10-dev.12",
   "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.0.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.10-dev.10"
+    "@mikro-orm/core": "7.0.10-dev.12"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/NativeQueryBuilder.d.ts

@@ -1,4 +1,4 @@
-import { type Dictionary, LockMode, type QueryFlag, RawQueryFragment, type Subquery } from '@mikro-orm/core';
+import { type Dictionary, LockMode, type QueryFlag, type RawQueryFragment, type Subquery } from '@mikro-orm/core';
 import { QueryType } from './enums.js';
 import type { AbstractSqlPlatform } from '../AbstractSqlPlatform.js';
 /** Options for Common Table Expression (CTE) definitions. */

package/query/NativeQueryBuilder.js

@@ -1,4 +1,4 @@
-import { LockMode, raw, RawQueryFragment, Utils, } from '@mikro-orm/core';
+import { isRaw, LockMode, raw, Utils, } from '@mikro-orm/core';
 import { QueryType } from './enums.js';
 /** @internal */
 export class NativeQueryBuilder {
@@ -157,7 +157,7 @@ export class NativeQueryBuilder {
             return;
         }
         this.parts.push('on conflict');
-        if (clause.fields instanceof RawQueryFragment) {
+        if (isRaw(clause.fields)) {
             this.parts.push(clause.fields.sql);
             this.params.push(...clause.fields.params);
         }
@@ -474,14 +474,14 @@ export class NativeQueryBuilder {
             throw new Error('No table name provided');
         }
         const indexHint = this.options.indexHint ? ' ' + this.options.indexHint : '';
-        if (this.options.tableName instanceof RawQueryFragment) {
+        if (isRaw(this.options.tableName)) {
             this.params.push(...this.options.tableName.params);
             return this.options.tableName.sql + indexHint;
         }
         return this.options.tableName + indexHint;
     }
     quote(id) {
-        if (id instanceof RawQueryFragment) {
+        if (isRaw(id)) {
             return this.platform.formatQuery(id.sql, id.params);
         }
         if (id instanceof NativeQueryBuilder) {

package/query/QueryBuilder.d.ts

@@ -187,6 +187,7 @@ export interface QBState<Entity extends object> {
         name: string;
         query: NativeQueryBuilder | RawQueryFragment;
         recursive?: boolean;
+        meta?: EntityMetadata;
     })[];
     tptJoinsApplied: boolean;
     autoJoinedPaths: string[];

package/query/QueryBuilder.js

@@ -1214,6 +1214,7 @@ export class QueryBuilder {
             recursive,
             columns: options?.columns,
             materialized: options?.materialized,
+            meta: query instanceof _a ? query.mainAlias.meta : undefined,
         });
         return this;
     }
@@ -2168,14 +2169,20 @@ export class QueryBuilder {
     }
     fromRawTable(tableName, aliasName) {
         aliasName ??= this.#state.mainAlias?.aliasName ?? this.getNextAlias(tableName);
-        const meta = new EntityMetadata({
-            className: tableName,
-            collection: tableName,
-        });
-        meta.root = meta;
+        // If the raw table name matches a CTE registered via `.with()` from a typed QueryBuilder,
+        // reuse the source entity meta so relation joins (`leftJoinAndSelect` etc.) keep working.
+        const cteMeta = this.#state.ctes.find(c => c.name === tableName)?.meta;
+        let meta;
+        if (cteMeta) {
+            meta = cteMeta;
+        }
+        else {
+            meta = new EntityMetadata({ className: tableName, collection: tableName });
+            meta.root = meta;
+        }
         this.#state.mainAlias = {
             aliasName,
-            entityName: tableName,
+            entityName: (cteMeta?.className ?? tableName),
             meta,
             rawTableName: tableName,
         };

package/query/QueryBuilderHelper.js

@@ -569,20 +569,24 @@ export class QueryBuilderHelper {
             parts.push(processed.sql);
             params.push(...processed.params);
         }
-        else if (value[op] instanceof Raw || typeof value[op]?.toRaw === 'function') {
-            const query = value[op] instanceof Raw ? value[op] : value[op].toRaw();
-            const mappedKey = this.mapper(key, type, query, null);
-            let sql = query.sql.replaceAll(ALIAS_REPLACEMENT, this.#alias);
-            if (['$in', '$nin'].includes(op)) {
-                sql = `(${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}`);
+            const opValue = value[op];
+            const opValueIsRaw = isRaw(opValue);
+            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);
+                if (['$in', '$nin'].includes(op)) {
+                    sql = `(${sql})`;
+                }
+                parts.push(`${this.#platform.quoteIdentifier(mappedKey)} ${replacement} ${sql}`);
+                params.push(...query.params);
+            }
+            else {
+                const mappedKey = this.mapper(key, type, opValue, null);
+                const val = this.getValueReplacement(fields, opValue, params, op, prop);
+                parts.push(`${this.#platform.quoteIdentifier(mappedKey)} ${replacement} ${val}`);
+            }
         }
         return { sql: parts.join(' and '), params };
     }
@@ -753,7 +757,7 @@ export class QueryBuilderHelper {
             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) {
+            if (isRaw(fieldName)) {
                 return fieldName.sql;
             }
             ret = alias + fieldName;
@@ -767,7 +771,7 @@ export class QueryBuilderHelper {
             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) {
+            if (isRaw(fieldName)) {
                 return fieldName.sql;
             }
             ret = resolvedAlias + '.' + fieldName;

package/schema/DatabaseTable.js

@@ -1,4 +1,4 @@
-import { DecimalType, EntitySchema, RawQueryFragment, ReferenceKind, t, Type, UnknownType, Utils, } from '@mikro-orm/core';
+import { DecimalType, EntitySchema, isRaw, ReferenceKind, t, Type, UnknownType, Utils, } from '@mikro-orm/core';
 /**
  * @internal
  */
@@ -89,7 +89,7 @@ export class DatabaseTable {
             this.#columns[field] = {
                 name: prop.fieldNames[idx],
                 type: prop.columnTypes[idx],
-                generated: prop.generated instanceof RawQueryFragment
+                generated: isRaw(prop.generated)
                     ? this.#platform.formatQuery(prop.generated.sql, prop.generated.params)
                     : prop.generated,
                 mappedType,
@@ -787,7 +787,7 @@ 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 isRaw(exp) ? this.#platform.formatQuery(exp.sql, exp.params) : exp;
         }
         return expression;
     }

package/schema/SchemaHelper.d.ts

@@ -1,4 +1,4 @@
-import { type Connection, type Dictionary, type Options, type Transaction, RawQueryFragment } from '@mikro-orm/core';
+import { type Connection, type Dictionary, type Options, type Transaction, type RawQueryFragment } from '@mikro-orm/core';
 import type { AbstractSqlConnection } from '../AbstractSqlConnection.js';
 import type { AbstractSqlPlatform } from '../AbstractSqlPlatform.js';
 import type { CheckDef, Column, ForeignKey, IndexDef, Table, TableDifference } from '../typings.js';

package/schema/SchemaHelper.js

@@ -1,4 +1,4 @@
-import { RawQueryFragment, Utils, } from '@mikro-orm/core';
+import { isRaw, Utils, } from '@mikro-orm/core';
 /** Base class for database-specific schema helpers. Provides SQL generation for DDL operations. */
 export class SchemaHelper {
     platform;
@@ -424,7 +424,7 @@ export class SchemaHelper {
         if (defaultValue == null) {
             return defaultValue;
         }
-        if (defaultValue instanceof RawQueryFragment) {
+        if (isRaw(defaultValue)) {
             return this.platform.formatQuery(defaultValue.sql, defaultValue.params);
         }
         const genericValue = defaultValue.replace(/\(\d+\)/, '(?)').toLowerCase();