@mikro-orm/sql 7.0.0-dev.300 → 7.0.0-dev.301

package/dialects/postgresql/BasePostgreSqlPlatform.js

@@ -113,8 +113,10 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
     }
     getMappedType(type) {
         switch (this.extractSimpleType(type)) {
-            case 'tsvector': return Type.getType(FullTextType);
-            default: return super.getMappedType(type);
+            case 'tsvector':
+                return Type.getType(FullTextType);
+            default:
+                return super.getMappedType(type);
         }
     }
     getRegExpOperator(val, flags) {
@@ -132,7 +134,7 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         return { $re: val.source };
     }
     isBigIntProperty(prop) {
-        return super.isBigIntProperty(prop) || (['bigserial', 'int8'].includes(prop.columnTypes?.[0]));
+        return super.isBigIntProperty(prop) || ['bigserial', 'int8'].includes(prop.columnTypes?.[0]);
     }
     getArrayDeclarationSQL() {
         return 'text[]';
@@ -166,7 +168,7 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         return ['begin'];
     }
     marshallArray(values) {
-        const quote = (v) => v === '' || v.match(/["{},\\]/) ? JSON.stringify(v) : v;
+        const quote = (v) => (v === '' || v.match(/["{},\\]/) ? JSON.stringify(v) : v);
         return `{${values.map(v => quote('' + v)).join(',')}}`;
     }
     /* v8 ignore next */
@@ -174,7 +176,10 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         if (value === '{}') {
             return [];
         }
-        return value.substring(1, value.length - 1).split(',').map(v => {
+        return value
+            .substring(1, value.length - 1)
+            .split(',')
+            .map(v => {
             if (v === `""`) {
                 return '';
             }
@@ -218,7 +223,8 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         const cast = (key) => raw(type in types ? `(${key})::${types[type]}` : key);
         let lastOperator = '->>';
         // force `->` for operator payloads with array values
-        if (Utils.isPlainObject(value) && Object.keys(value).every(key => ARRAY_OPERATORS.includes(key) && Array.isArray(value[key]))) {
+        if (Utils.isPlainObject(value) &&
+            Object.keys(value).every(key => ARRAY_OPERATORS.includes(key) && Array.isArray(value[key]))) {
             lastOperator = '->';
         }
         if (path.length === 0) {
@@ -227,8 +233,7 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         return cast(`${root}->${path.map(a => this.quoteValue(a)).join('->')}${lastOperator}'${last}'`);
     }
     getJsonIndexDefinition(index) {
-        return index.columnNames
-            .map(column => {
+        return index.columnNames.map(column => {
             if (!column.includes('.')) {
                 return column;
             }
@@ -286,26 +291,26 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
     getDefaultMappedType(type) {
         const normalizedType = this.extractSimpleType(type);
         const map = {
-            'int2': 'smallint',
-            'smallserial': 'smallint',
-            'int': 'integer',
-            'int4': 'integer',
-            'serial': 'integer',
-            'serial4': 'integer',
-            'int8': 'bigint',
-            'bigserial': 'bigint',
-            'serial8': 'bigint',
-            'numeric': 'decimal',
-            'bool': 'boolean',
-            'real': 'float',
-            'float4': 'float',
-            'float8': 'double',
-            'timestamp': 'datetime',
-            'timestamptz': 'datetime',
-            'bytea': 'blob',
-            'jsonb': 'json',
+            int2: 'smallint',
+            smallserial: 'smallint',
+            int: 'integer',
+            int4: 'integer',
+            serial: 'integer',
+            serial4: 'integer',
+            int8: 'bigint',
+            bigserial: 'bigint',
+            serial8: 'bigint',
+            numeric: 'decimal',
+            bool: 'boolean',
+            real: 'float',
+            float4: 'float',
+            float8: 'double',
+            timestamp: 'datetime',
+            timestamptz: 'datetime',
+            bytea: 'blob',
+            jsonb: 'json',
             'character varying': 'varchar',
-            'bpchar': 'character',
+            bpchar: 'character',
         };
         return super.getDefaultMappedType(map[normalizedType] ?? type);
     }
@@ -339,9 +344,12 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
      */
     castColumn(prop) {
         switch (prop?.columnTypes?.[0]) {
-            case this.getUuidTypeDeclarationSQL({}): return '::text';
-            case this.getBooleanTypeDeclarationSQL(): return '::int';
-            default: return '';
+            case this.getUuidTypeDeclarationSQL({}):
+                return '::text';
+            case this.getBooleanTypeDeclarationSQL():
+                return '::int';
+            default:
+                return '';
         }
     }
     getDefaultClientUrl() {

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -1,4 +1,4 @@
-import { DeferMode, EnumType, Type, Utils } from '@mikro-orm/core';
+import { DeferMode, EnumType, Type, Utils, } from '@mikro-orm/core';
 import { SchemaHelper } from '../../schema/SchemaHelper.js';
 /** PostGIS system views that should be automatically ignored */
 const POSTGIS_VIEWS = ['geography_columns', 'geometry_columns'];
@@ -22,24 +22,24 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         return `create database ${name}`;
     }
     getListTablesSQL() {
-        return `select table_name, table_schema as schema_name, `
-            + `(select pg_catalog.obj_description(c.oid) from pg_catalog.pg_class c
-          where c.oid = (select ('"' || table_schema || '"."' || table_name || '"')::regclass::oid) and c.relname = table_name) as table_comment `
-            + `from information_schema.tables `
-            + `where ${this.getIgnoredNamespacesConditionSQL('table_schema')} `
-            + `and table_name != 'geometry_columns' and table_name != 'spatial_ref_sys' and table_type != 'VIEW' `
-            + `and table_name not in (select inhrelid::regclass::text from pg_inherits) `
-            + `order by table_name`;
+        return (`select table_name, table_schema as schema_name, ` +
+            `(select pg_catalog.obj_description(c.oid) from pg_catalog.pg_class c
+          where c.oid = (select ('"' || table_schema || '"."' || table_name || '"')::regclass::oid) and c.relname = table_name) as table_comment ` +
+            `from information_schema.tables ` +
+            `where ${this.getIgnoredNamespacesConditionSQL('table_schema')} ` +
+            `and table_name != 'geometry_columns' and table_name != 'spatial_ref_sys' and table_type != 'VIEW' ` +
+            `and table_name not in (select inhrelid::regclass::text from pg_inherits) ` +
+            `order by table_name`);
     }
     getIgnoredViewsCondition() {
         return POSTGIS_VIEWS.map(v => `table_name != '${v}'`).join(' and ');
     }
     getListViewsSQL() {
-        return `select table_name as view_name, table_schema as schema_name, view_definition `
-            + `from information_schema.views `
-            + `where ${this.getIgnoredNamespacesConditionSQL('table_schema')} `
-            + `and ${this.getIgnoredViewsCondition()} `
-            + `order by table_name`;
+        return (`select table_name as view_name, table_schema as schema_name, view_definition ` +
+            `from information_schema.views ` +
+            `where ${this.getIgnoredNamespacesConditionSQL('table_schema')} ` +
+            `and ${this.getIgnoredViewsCondition()} ` +
+            `order by table_name`);
     }
     async loadViews(schema, connection) {
         const views = await connection.execute(this.getListViewsSQL());
@@ -51,10 +51,10 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         }
     }
     getListMaterializedViewsSQL() {
-        return `select matviewname as view_name, schemaname as schema_name, definition as view_definition `
-            + `from pg_matviews `
-            + `where ${this.getIgnoredNamespacesConditionSQL('schemaname')} `
-            + `order by matviewname`;
+        return (`select matviewname as view_name, schemaname as schema_name, definition as view_definition ` +
+            `from pg_matviews ` +
+            `where ${this.getIgnoredNamespacesConditionSQL('schemaname')} ` +
+            `order by matviewname`);
     }
     async loadMaterializedViews(schema, connection, schemaName) {
         const views = await connection.execute(this.getListMaterializedViewsSQL());
@@ -78,9 +78,9 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         return `refresh materialized view${concurrent} ${this.quote(this.getTableName(name, schema))}`;
     }
     async getNamespaces(connection) {
-        const sql = `select schema_name from information_schema.schemata `
-            + `where ${this.getIgnoredNamespacesConditionSQL()} `
-            + `order by schema_name`;
+        const sql = `select schema_name from information_schema.schemata ` +
+            `where ${this.getIgnoredNamespacesConditionSQL()} ` +
+            `order by schema_name`;
         const res = await connection.execute(sql);
         return res.map(row => row.schema_name);
     }
@@ -90,13 +90,11 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             'tiger',
             'topology',
             /* v8 ignore next */
-            ...this.platform.getConfig().get('schemaGenerator').ignoreSchema ?? [],
-        ].map(s => this.platform.quoteValue(s)).join(', ');
-        const ignoredPrefixes = [
-            'pg_',
-            'crdb_',
-            '_timescaledb_',
-        ].map(p => `"${column}" not like '${p}%'`).join(' and ');
+            ...(this.platform.getConfig().get('schemaGenerator').ignoreSchema ?? []),
+        ]
+            .map(s => this.platform.quoteValue(s))
+            .join(', ');
+        const ignoredPrefixes = ['pg_', 'crdb_', '_timescaledb_'].map(p => `"${column}" not like '${p}%'`).join(' and ');
         return `${ignoredPrefixes} and "${column}" not in (${ignored})`;
     }
     async loadInformationSchema(schema, connection, tables, schemas) {
@@ -130,9 +128,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             const key = this.getTableKey(index);
             // Extract INCLUDE columns from expression first, to filter them from key columns
             const includeMatch = index.expression?.match(/include\s*\(([^)]+)\)/i);
-            const includeColumns = includeMatch
-                ? includeMatch[1].split(',').map((col) => unquote(col.trim()))
-                : [];
+            const includeColumns = includeMatch ? includeMatch[1].split(',').map((col) => unquote(col.trim())) : [];
             // Filter out INCLUDE columns from the column definitions to get only key columns
             const keyColumnDefs = index.index_def.filter((col) => !includeColumns.includes(unquote(col)));
             // Parse sort order and NULLS ordering from the full expression
@@ -268,17 +264,18 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
       where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(table_schema = ${this.platform.quoteValue(schema)} and table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}))`).join(' or ')})
       order by ordinal_position`;
         const allColumns = await connection.execute(sql);
-        const str = (val) => val != null ? '' + val : val;
+        const str = (val) => (val != null ? '' + val : val);
         const ret = {};
         for (const col of allColumns) {
             const mappedType = connection.getPlatform().getMappedType(col.data_type);
-            const increments = (col.column_default?.includes('nextval') || col.is_identity === 'YES') && connection.getPlatform().isNumericColumn(mappedType);
+            const increments = (col.column_default?.includes('nextval') || col.is_identity === 'YES') &&
+                connection.getPlatform().isNumericColumn(mappedType);
             const key = this.getTableKey(col);
             ret[key] ??= [];
-            let type = col.data_type.toLowerCase() === 'array'
-                ? col.udt_name.replace(/^_(.*)$/, '$1[]')
-                : col.udt_name;
-            if (col.data_type === 'USER-DEFINED' && col.udt_schema && col.udt_schema !== this.platform.getDefaultSchemaName()) {
+            let type = col.data_type.toLowerCase() === 'array' ? col.udt_name.replace(/^_(.*)$/, '$1[]') : col.udt_name;
+            if (col.data_type === 'USER-DEFINED' &&
+                col.udt_schema &&
+                col.udt_schema !== this.platform.getDefaultSchemaName()) {
                 type = `${col.udt_schema}.${type}`;
             }
             if (type === 'bpchar') {
@@ -305,7 +302,13 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                 default: str(this.normalizeDefaultValue(col.column_default, col.length)),
                 unsigned: increments,
                 autoincrement: increments,
-                generated: col.is_identity === 'YES' ? (col.identity_generation === 'BY DEFAULT' ? 'by default as identity' : 'identity') : (col.generation_expression ? col.generation_expression + ' stored' : undefined),
+                generated: col.is_identity === 'YES'
+                    ? col.identity_generation === 'BY DEFAULT'
+                        ? 'by default as identity'
+                        : 'identity'
+                    : col.generation_expression
+                        ? col.generation_expression + ' stored'
+                        : undefined,
                 comment: col.column_comment,
             };
             if (nativeEnums?.[column.type]) {
@@ -365,12 +368,17 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             }
             /* v8 ignore next */
             switch (value) {
-                case 'r': return 'RESTRICT';
-                case 'c': return 'CASCADE';
-                case 'n': return 'SET NULL';
-                case 'd': return 'SET DEFAULT';
+                case 'r':
+                    return 'RESTRICT';
+                case 'c':
+                    return 'CASCADE';
+                case 'n':
+                    return 'SET NULL';
+                case 'd':
+                    return 'SET DEFAULT';
                 case 'a':
-                default: return 'NO ACTION';
+                default:
+                    return 'NO ACTION';
             }
         }
         for (const fk of allFks) {
@@ -651,7 +659,8 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
      */
     getIndexColumns(index) {
         if (index.columns?.length) {
-            return index.columns.map(col => {
+            return index.columns
+                .map(col => {
                 let colDef = this.quote(col.name);
                 // PostgreSQL supports collation with double quotes
                 if (col.collation) {
@@ -666,7 +675,8 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                     colDef += ` nulls ${col.nulls}`;
                 }
                 return colDef;
-            }).join(', ');
+            })
+                .join(', ');
         }
         return index.columnNames.map(c => this.quote(c)).join(', ');
     }

package/dialects/sqlite/BaseSqliteConnection.js

@@ -2,8 +2,8 @@ import { CompiledQuery } from 'kysely';
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export class BaseSqliteConnection extends AbstractSqlConnection {
     createKyselyDialect(options) {
-        throw new Error('No SQLite dialect configured. Pass a Kysely dialect via the `driverOptions` config option, '
-            + 'e.g. `new NodeSqliteDialect(...)` for node:sqlite or a custom dialect for other libraries.');
+        throw new Error('No SQLite dialect configured. Pass a Kysely dialect via the `driverOptions` config option, ' +
+            'e.g. `new NodeSqliteDialect(...)` for node:sqlite or a custom dialect for other libraries.');
     }
     async connect(options) {
         await super.connect(options);

package/dialects/sqlite/NodeSqliteDialect.js

@@ -33,7 +33,9 @@ export class NodeSqliteDialect extends SqliteDialect {
                             get: (params) => stmt.get(...params),
                         };
                     },
-                    close() { db.close(); },
+                    close() {
+                        db.close();
+                    },
                 };
             },
         });

package/dialects/sqlite/SqlitePlatform.js

@@ -125,7 +125,10 @@ export class SqlitePlatform extends AbstractSqlPlatform {
     convertVersionValue(value, prop) {
         if (prop.runtimeType === 'Date') {
             const ts = +value;
-            const str = new Date(ts).toISOString().replace('T', ' ').replace(/\.\d{3}Z$/, '');
+            const str = new Date(ts)
+                .toISOString()
+                .replace('T', ' ')
+                .replace(/\.\d{3}Z$/, '');
             return { $in: [ts, str] };
         }
         return value;

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -31,8 +31,8 @@ export class SqliteSchemaHelper extends SchemaHelper {
         return '';
     }
     getListTablesSQL() {
-        return `select name as table_name from sqlite_master where type = 'table' and name != 'sqlite_sequence' and name != 'geometry_columns' and name != 'spatial_ref_sys' `
-            + `union all select name as table_name from sqlite_temp_master where type = 'table' order by name`;
+        return (`select name as table_name from sqlite_master where type = 'table' and name != 'sqlite_sequence' and name != 'geometry_columns' and name != 'spatial_ref_sys' ` +
+            `union all select name as table_name from sqlite_temp_master where type = 'table' order by name`);
     }
     async getAllTables(connection, schemas) {
         const databases = await this.getDatabaseList(connection);
@@ -183,9 +183,11 @@ export class SqliteSchemaHelper extends SchemaHelper {
     getDropColumnsSQL(tableName, columns, schemaName) {
         /* v8 ignore next */
         const name = this.quote((schemaName && schemaName !== this.platform.getDefaultSchemaName() ? schemaName + '.' : '') + tableName);
-        return columns.map(column => {
+        return columns
+            .map(column => {
             return `alter table ${name} drop column ${this.quote(column.name)}`;
-        }).join(';\n');
+        })
+            .join(';\n');
     }
     getCreateIndexSQL(tableName, index) {
         /* v8 ignore next */
@@ -453,10 +455,10 @@ export class SqliteSchemaHelper extends SchemaHelper {
     alterTable(diff, safe) {
         const ret = [];
         const [schemaName, tableName] = this.splitTableName(diff.name);
-        if (Utils.hasObjectKeys(diff.removedChecks)
-            || Utils.hasObjectKeys(diff.changedChecks)
-            || Utils.hasObjectKeys(diff.changedForeignKeys)
-            || Utils.hasObjectKeys(diff.changedColumns)) {
+        if (Utils.hasObjectKeys(diff.removedChecks) ||
+            Utils.hasObjectKeys(diff.changedChecks) ||
+            Utils.hasObjectKeys(diff.changedForeignKeys) ||
+            Utils.hasObjectKeys(diff.changedColumns)) {
             return this.getAlterTempTableSQL(diff);
         }
         for (const index of Object.values(diff.removedIndexes)) {
@@ -496,7 +498,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         return ret;
     }
     getAlterTempTableSQL(changedTable) {
-        const tempName = `${(changedTable.toTable.name)}__temp_alter`;
+        const tempName = `${changedTable.toTable.name}__temp_alter`;
         const quotedName = this.quote(changedTable.toTable.name);
         const quotedTempName = this.quote(tempName);
         const [first, ...rest] = this.createTable(changedTable.toTable);

package/package.json

@@ -1,44 +1,44 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.300",
+  "version": "7.0.0-dev.301",
   "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.",
-  "type": "module",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
-  },
   "keywords": [
-    "orm",
+    "data-mapper",
+    "ddd",
+    "entity",
+    "identity-map",
+    "javascript",
+    "js",
+    "mariadb",
+    "mikro-orm",
     "mongo",
     "mongodb",
     "mysql",
-    "mariadb",
+    "orm",
     "postgresql",
     "sqlite",
     "sqlite3",
     "ts",
     "typescript",
-    "js",
-    "javascript",
-    "entity",
-    "ddd",
-    "mikro-orm",
-    "unit-of-work",
-    "data-mapper",
-    "identity-map"
+    "unit-of-work"
   ],
-  "author": "Martin Adámek",
-  "license": "MIT",
+  "homepage": "https://mikro-orm.io",
   "bugs": {
     "url": "https://github.com/mikro-orm/mikro-orm/issues"
   },
-  "homepage": "https://mikro-orm.io",
-  "engines": {
-    "node": ">= 22.17.0"
+  "license": "MIT",
+  "author": "Martin Adámek",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
+  },
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./index.js"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "yarn compile && yarn copy",
@@ -46,9 +46,6 @@
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
     "kysely": "0.28.11"
   },
@@ -56,6 +53,9 @@
     "@mikro-orm/core": "^6.6.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.300"
+    "@mikro-orm/core": "7.0.0-dev.301"
+  },
+  "engines": {
+    "node": ">= 22.17.0"
   }
 }

package/plugin/transformer.js

@@ -79,12 +79,8 @@ export class MikroTransformer extends OperationNodeTransformer {
                     }
                 }
             }
-            const nodeWithHooks = this.options.processOnCreateHooks && entityMeta
-                ? this.processOnCreateHooks(node, entityMeta)
-                : node;
-            const nodeWithConvertedValues = this.options.convertValues && entityMeta
-                ? this.processInsertValues(nodeWithHooks, entityMeta)
-                : nodeWithHooks;
+            const nodeWithHooks = this.options.processOnCreateHooks && entityMeta ? this.processOnCreateHooks(node, entityMeta) : node;
+            const nodeWithConvertedValues = this.options.convertValues && entityMeta ? this.processInsertValues(nodeWithHooks, entityMeta) : nodeWithHooks;
             // Handle ON CONFLICT clause
             let finalNode = nodeWithConvertedValues;
             if (node.onConflict?.updates && entityMeta) {
@@ -150,12 +146,8 @@ export class MikroTransformer extends OperationNodeTransformer {
                     this.processJoinNode(join, currentContext);
                 }
             }
-            const nodeWithHooks = this.options.processOnUpdateHooks && entityMeta
-                ? this.processOnUpdateHooks(node, entityMeta)
-                : node;
-            const nodeWithConvertedValues = this.options.convertValues && entityMeta
-                ? this.processUpdateValues(nodeWithHooks, entityMeta)
-                : nodeWithHooks;
+            const nodeWithHooks = this.options.processOnUpdateHooks && entityMeta ? this.processOnUpdateHooks(node, entityMeta) : node;
+            const nodeWithConvertedValues = this.options.convertValues && entityMeta ? this.processUpdateValues(nodeWithHooks, entityMeta) : nodeWithHooks;
             return super.transformUpdateQuery(nodeWithConvertedValues, queryId);
         }
         finally {
@@ -217,7 +209,9 @@ export class MikroTransformer extends OperationNodeTransformer {
         }
         // Transform column names when columnNamingStrategy is 'property'
         // Support ColumnNode, ColumnUpdateNode, and ReferenceNode (for JOIN conditions)
-        if (this.options.columnNamingStrategy === 'property' && parent && (ColumnNode.is(parent) || ColumnUpdateNode.is(parent) || ReferenceNode.is(parent))) {
+        if (this.options.columnNamingStrategy === 'property' &&
+            parent &&
+            (ColumnNode.is(parent) || ColumnUpdateNode.is(parent) || ReferenceNode.is(parent))) {
             const ownerMeta = this.findOwnerEntityInContext();
             if (ownerMeta) {
                 const prop = ownerMeta.properties[node.name];
@@ -480,7 +474,11 @@ export class MikroTransformer extends OperationNodeTransformer {
             }
         }
         if (prop.customType && !isRaw(value)) {
-            return prop.customType.convertToDatabaseValue(value, this.platform, { fromQuery: true, key: prop.name, mode: 'query-data' });
+            return prop.customType.convertToDatabaseValue(value, this.platform, {
+                fromQuery: true,
+                key: prop.name,
+                mode: 'query-data',
+            });
         }
         if (value instanceof Date) {
             return this.platform.processDateProperty(value);
@@ -723,7 +721,9 @@ export class MikroTransformer extends OperationNodeTransformer {
      */
     transformResult(rows, entityMap) {
         // Only transform if columnNamingStrategy is 'property' or convertValues is true, and we have data
-        if ((this.options.columnNamingStrategy !== 'property' && !this.options.convertValues) || !rows || rows.length === 0) {
+        if ((this.options.columnNamingStrategy !== 'property' && !this.options.convertValues) ||
+            !rows ||
+            rows.length === 0) {
             return rows;
         }
         // If no entities found (e.g. raw query without known tables), return rows as is
@@ -870,7 +870,8 @@ export class MikroTransformer extends OperationNodeTransformer {
             }
             // For non-local timezone, check if value already has timezone info
             // Number (timestamp) doesn't need timezone handling, string needs check
-            if (typeof value === 'number' || (typeof value === 'string' && (value.includes('+') || value.lastIndexOf('-') > 10 || value.endsWith('Z')))) {
+            if (typeof value === 'number' ||
+                (typeof value === 'string' && (value.includes('+') || value.lastIndexOf('-') > 10 || value.endsWith('Z')))) {
                 return this.platform.parseDate(value);
             }
             // Append timezone if not present (only for string values)

package/query/CriteriaNode.js

@@ -53,22 +53,34 @@ export class CriteriaNode {
         const type = this.prop ? this.prop.kind : null;
         const composite = this.prop?.joinColumns ? this.prop.joinColumns.length > 1 : false;
         const rawField = RawQueryFragment.isKnownFragmentSymbol(this.key);
-        const scalar = payload === null || Utils.isPrimaryKey(payload) || payload instanceof RegExp || payload instanceof Date || rawField;
+        const scalar = payload === null ||
+            Utils.isPrimaryKey(payload) ||
+            payload instanceof RegExp ||
+            payload instanceof Date ||
+            rawField;
         const operator = Utils.isPlainObject(payload) && Utils.getObjectQueryKeys(payload).every(k => Utils.isOperator(k, false));
         if (composite) {
             return true;
         }
         switch (type) {
-            case ReferenceKind.MANY_TO_ONE: return false;
-            case ReferenceKind.ONE_TO_ONE: return !this.prop.owner;
-            case ReferenceKind.ONE_TO_MANY: return scalar || operator;
-            case ReferenceKind.MANY_TO_MANY: return scalar || operator;
-            default: return false;
+            case ReferenceKind.MANY_TO_ONE:
+                return false;
+            case ReferenceKind.ONE_TO_ONE:
+                return !this.prop.owner;
+            case ReferenceKind.ONE_TO_MANY:
+                return scalar || operator;
+            case ReferenceKind.MANY_TO_MANY:
+                return scalar || operator;
+            default:
+                return false;
         }
     }
     renameFieldToPK(qb, ownerAlias) {
         const joinAlias = qb.getAliasForJoinPath(this.getPath(), { matchPopulateJoins: true });
-        if (!joinAlias && this.parent && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) && this.prop.owner) {
+        if (!joinAlias &&
+            this.parent &&
+            [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) &&
+            this.prop.owner) {
             const alias = qb.getAliasForJoinPath(this.parent.getPath()) ?? ownerAlias ?? qb.alias;
             return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
         }
@@ -84,7 +96,9 @@ export class CriteriaNode {
         const parentPath = opts?.parentPath ?? this.parent?.getPath({ addIndex: addParentIndex }) ?? Utils.className(this.entityName);
         const index = opts?.addIndex && this.index != null ? `[${this.index}]` : '';
         // ignore group operators to allow easier mapping (e.g. for orderBy)
-        const key = this.key && !RawQueryFragment.isKnownFragmentSymbol(this.key) && !['$and', '$or', '$not'].includes(this.key) ? '.' + this.key : '';
+        const key = this.key && !RawQueryFragment.isKnownFragmentSymbol(this.key) && !['$and', '$or', '$not'].includes(this.key)
+            ? '.' + this.key
+            : '';
         const ret = parentPath + index + key;
         if (this.isPivotJoin()) {
             // distinguish pivot table join from target entity join
@@ -97,7 +111,11 @@ export class CriteriaNode {
             return false;
         }
         const rawField = RawQueryFragment.isKnownFragmentSymbol(this.key);
-        const scalar = this.payload === null || Utils.isPrimaryKey(this.payload) || this.payload instanceof RegExp || this.payload instanceof Date || rawField;
+        const scalar = this.payload === null ||
+            Utils.isPrimaryKey(this.payload) ||
+            this.payload instanceof RegExp ||
+            this.payload instanceof Date ||
+            rawField;
         const operator = Utils.isObject(this.payload) && Utils.getObjectQueryKeys(this.payload).every(k => Utils.isOperator(k, false));
         return this.prop.kind === ReferenceKind.MANY_TO_MANY && (scalar || operator);
     }
@@ -116,7 +134,7 @@ export class CriteriaNode {
         const o = {};
         ['entityName', 'key', 'index', 'payload']
             .filter(k => this[k] !== undefined)
-            .forEach(k => o[k] = this[k]);
+            .forEach(k => (o[k] = this[k]));
         return `${this.constructor.name} ${inspect(o)}`;
     }
 }

package/query/CriteriaNodeFactory.js

@@ -8,7 +8,11 @@ import { ScalarCriteriaNode } from './ScalarCriteriaNode.js';
 export class CriteriaNodeFactory {
     static createNode(metadata, entityName, payload, parent, key, validate = true) {
         const rawField = RawQueryFragment.isKnownFragmentSymbol(key);
-        const scalar = Utils.isPrimaryKey(payload) || isRaw(payload) || payload instanceof RegExp || payload instanceof Date || rawField;
+        const scalar = Utils.isPrimaryKey(payload) ||
+            isRaw(payload) ||
+            payload instanceof RegExp ||
+            payload instanceof Date ||
+            rawField;
         if (Array.isArray(payload) && !scalar) {
             return this.createArrayNode(metadata, entityName, payload, parent, key, validate);
         }