@mikro-orm/knex 7.0.0-dev.7 → 7.0.0-dev.71

package/AbstractSqlPlatform.js

@@ -43,13 +43,13 @@ export class AbstractSqlPlatform extends Platform {
         return 'rollback';
     }
     getSavepointSQL(savepointName) {
-        return `savepoint ${savepointName}`;
+        return `savepoint ${this.quoteIdentifier(savepointName)}`;
     }
     getRollbackToSavepointSQL(savepointName) {
-        return `rollback to savepoint ${savepointName}`;
+        return `rollback to savepoint ${this.quoteIdentifier(savepointName)}`;
     }
     getReleaseSavepointSQL(savepointName) {
-        return `release savepoint ${savepointName}`;
+        return `release savepoint ${this.quoteIdentifier(savepointName)}`;
     }
     quoteValue(value) {
         if (isRaw(value)) {

package/PivotCollectionPersister.d.ts

@@ -1,16 +1,17 @@
-import { type EntityMetadata, type EntityProperty, type Primary, type Transaction } from '@mikro-orm/core';
+import { type Dictionary, type EntityMetadata, type EntityProperty, type Primary, type Transaction } from '@mikro-orm/core';
 import { type AbstractSqlDriver } from './AbstractSqlDriver.js';
 export declare class PivotCollectionPersister<Entity extends object> {
     private readonly meta;
     private readonly driver;
     private readonly ctx?;
     private readonly schema?;
+    private readonly loggerContext?;
     private readonly platform;
     private readonly inserts;
     private readonly deletes;
     private readonly batchSize;
     private order;
-    constructor(meta: EntityMetadata<Entity>, driver: AbstractSqlDriver, ctx?: Transaction | undefined, schema?: string | undefined);
+    constructor(meta: EntityMetadata<Entity>, driver: AbstractSqlDriver, ctx?: Transaction | undefined, schema?: string | undefined, loggerContext?: Dictionary | undefined);
     enqueueUpdate(prop: EntityProperty<Entity>, insertDiff: Primary<Entity>[][], deleteDiff: Primary<Entity>[][] | boolean, pks: Primary<Entity>[]): void;
     private enqueueInsert;
     private enqueueDelete;

package/PivotCollectionPersister.js

@@ -1,4 +1,3 @@
-import { Utils, } from '@mikro-orm/core';
 class InsertStatement {
     keys;
     data;
@@ -38,16 +37,18 @@ export class PivotCollectionPersister {
     driver;
     ctx;
     schema;
+    loggerContext;
     platform;
     inserts = new Map();
     deletes = new Map();
     batchSize;
     order = 0;
-    constructor(meta, driver, ctx, schema) {
+    constructor(meta, driver, ctx, schema, loggerContext) {
         this.meta = meta;
         this.driver = driver;
         this.ctx = ctx;
         this.schema = schema;
+        this.loggerContext = loggerContext;
         this.platform = this.driver.getPlatform();
         this.batchSize = this.driver.config.get('batchSize');
     }
@@ -99,6 +100,7 @@ export class PivotCollectionPersister {
                 await this.driver.nativeDelete(this.meta.className, cond, {
                     ctx: this.ctx,
                     schema: this.schema,
+                    loggerContext: this.loggerContext,
                 });
             }
         }
@@ -110,26 +112,15 @@ export class PivotCollectionPersister {
             items[insert.order] = insert.getData();
         }
         items = items.filter(i => i);
-        if (this.platform.allowsMultiInsert()) {
-            for (let i = 0; i < items.length; i += this.batchSize) {
-                const chunk = items.slice(i, i + this.batchSize);
-                await this.driver.nativeInsertMany(this.meta.className, chunk, {
-                    ctx: this.ctx,
-                    schema: this.schema,
-                    convertCustomTypes: false,
-                    processCollections: false,
-                });
-            }
-            /* v8 ignore start */
-        }
-        else {
-            await Utils.runSerial(items, item => {
-                return this.driver.createQueryBuilder(this.meta.className, this.ctx, 'write')
-                    .withSchema(this.schema)
-                    .insert(item)
-                    .execute('run', false);
+        for (let i = 0; i < items.length; i += this.batchSize) {
+            const chunk = items.slice(i, i + this.batchSize);
+            await this.driver.nativeInsertMany(this.meta.className, chunk, {
+                ctx: this.ctx,
+                schema: this.schema,
+                convertCustomTypes: false,
+                processCollections: false,
+                loggerContext: this.loggerContext,
             });
         }
-        /* v8 ignore stop */
     }
 }

package/README.md

@@ -11,7 +11,6 @@ TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-or
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
 [![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
-[![Maintainability](https://api.codeclimate.com/v1/badges/27999651d3adc47cfa40/maintainability)](https://codeclimate.com/github/mikro-orm/mikro-orm/maintainability)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
 ## 🤔 Unit of What?
@@ -141,7 +140,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
 - [Filters](https://mikro-orm.io/docs/filters)
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Populating relations](https://mikro-orm.io/docs/populating-relations)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
 - [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
@@ -382,6 +381,8 @@ See also the list of contributors who [participated](https://github.com/mikro-or
 
 Please ⭐️ this repository if this project helped you!
 
+> If you'd like to support my open-source work, consider sponsoring me directly at [github.com/sponsors/b4nan](https://github.com/sponsors/b4nan).
+
 ## 📝 License
 
 Copyright © 2018 [Martin Adámek](https://github.com/b4nan).

package/SqlEntityManager.d.ts

@@ -1,8 +1,13 @@
-import { EntityManager, type AnyEntity, type ConnectionType, type EntityData, type EntityName, type EntityRepository, type GetRepository, type QueryResult, type FilterQuery, type LoggingOptions, type RawQueryFragment } from '@mikro-orm/core';
+import { type EntitySchemaWithMeta, EntityManager, type AnyEntity, type ConnectionType, type EntityData, type EntityName, type EntityRepository, type GetRepository, type QueryResult, type FilterQuery, type LoggingOptions, type RawQueryFragment } from '@mikro-orm/core';
 import type { AbstractSqlDriver } from './AbstractSqlDriver.js';
 import type { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 import type { QueryBuilder } from './query/QueryBuilder.js';
 import type { SqlEntityRepository } from './SqlEntityRepository.js';
+import type { Kysely } from 'kysely';
+import type { InferKyselyDB } from './typings.js';
+export interface GetKyselyOptions {
+    type?: ConnectionType;
+}
 /**
  * @inheritDoc
  */
@@ -18,8 +23,10 @@ export declare class SqlEntityManager<Driver extends AbstractSqlDriver = Abstrac
     /**
      * Returns configured Kysely instance.
      */
-    getKysely(type?: ConnectionType): import("kysely").Kysely<any>;
+    getKysely<TDB = undefined, TOptions extends GetKyselyOptions = GetKyselyOptions>(options?: TOptions): Kysely<TDB extends undefined ? InferKyselyDB<EntitiesFromManager<this>, TOptions> : TDB>;
     execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params?: any[], method?: 'all' | 'get' | 'run', loggerContext?: LoggingOptions): Promise<T>;
     getRepository<T extends object, U extends EntityRepository<T> = SqlEntityRepository<T>>(entityName: EntityName<T>): GetRepository<T, U>;
     protected applyDiscriminatorCondition<Entity extends object>(entityName: string, where: FilterQuery<Entity>): FilterQuery<Entity>;
 }
+type EntitiesFromManager<TEntityManager extends EntityManager<any>> = NonNullable<TEntityManager['~entities']> extends any[] ? (Extract<NonNullable<TEntityManager['~entities']>[number], EntitySchemaWithMeta>) : never;
+export {};

package/SqlEntityManager.js

@@ -19,8 +19,8 @@ export class SqlEntityManager extends EntityManager {
     /**
      * Returns configured Kysely instance.
      */
-    getKysely(type) {
-        return this.getConnection(type).getClient();
+    getKysely(options = {}) {
+        return this.getConnection(options.type).getClient();
     }
     async execute(query, params = [], method = 'all', loggerContext) {
         return this.getDriver().execute(query, params, method, this.getContext(false).getTransactionContext(), loggerContext);

package/dialects/mssql/MsSqlNativeQueryBuilder.d.ts

@@ -5,6 +5,8 @@ export declare class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         sql: string;
         params: unknown[];
     };
+    protected compileInsert(): void;
+    private appendOutputTable;
     private compileUpsert;
     protected compileSelect(): void;
     protected addLockClause(): void;

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -12,6 +12,10 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         if (this.options.flags?.has(QueryFlag.IDENTITY_INSERT)) {
             this.parts.push(`set identity_insert ${this.getTableName()} on;`);
         }
+        const { prefix, suffix } = this.appendOutputTable();
+        if (prefix) {
+            this.parts.push(prefix);
+        }
         if (this.options.comment) {
             this.parts.push(...this.options.comment.map(comment => `/* ${comment} */`));
         }
@@ -37,7 +41,11 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
                     this.compileTruncate();
                     break;
             }
-            if ([QueryType.INSERT, QueryType.UPDATE, QueryType.DELETE].includes(this.type)) {
+            if (suffix) {
+                this.parts[this.parts.length - 1] += ';';
+                this.parts.push(suffix);
+            }
+            else if ([QueryType.INSERT, QueryType.UPDATE, QueryType.DELETE].includes(this.type)) {
                 this.parts[this.parts.length - 1] += '; select @@rowcount;';
             }
         }
@@ -46,6 +54,37 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         }
         return this.combineParts();
     }
+    compileInsert() {
+        if (!this.options.data) {
+            throw new Error('No data provided');
+        }
+        this.parts.push('insert');
+        this.addHintComment();
+        this.parts.push(`into ${this.getTableName()}`);
+        if (Object.keys(this.options.data).length === 0) {
+            this.addOutputClause('inserted');
+            this.parts.push('default values');
+            return;
+        }
+        const parts = this.processInsertData();
+        if (this.options.flags?.has(QueryFlag.OUTPUT_TABLE)) {
+            this.parts[this.parts.length - 2] += ' into #out ';
+        }
+        this.parts.push(parts.join(', '));
+    }
+    appendOutputTable() {
+        if (!this.options.flags?.has(QueryFlag.OUTPUT_TABLE)) {
+            return { prefix: '', suffix: '' };
+        }
+        const returningFields = this.options.returning;
+        const selections = returningFields
+            .map(field => `[t].${this.platform.quoteIdentifier(field)}`)
+            .join(',');
+        return {
+            prefix: `select top(0) ${selections} into #out from ${this.getTableName()} as t left join ${this.getTableName()} on 0 = 1;`,
+            suffix: `select ${selections} from #out as t; drop table #out`,
+        };
+    }
     compileUpsert() {
         const clause = this.options.onConflict;
         const dataAsArray = Utils.asArray(this.options.data);
@@ -82,7 +121,9 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             }
             this.parts.push('then update set');
             if (!clause.merge || Array.isArray(clause.merge)) {
-                const parts = keys.map((column) => `${this.quote(column)} = tsource.${this.quote(column)}`);
+                const parts = (clause.merge || keys)
+                    .filter(field => !Array.isArray(clause.fields) || !clause.fields.includes(field))
+                    .map((column) => `${this.quote(column)} = tsource.${this.quote(column)}`);
                 this.parts.push(parts.join(', '));
             }
             else if (typeof clause.merge === 'object') {

package/dialects/postgresql/PostgreSqlTableCompiler.d.ts

@@ -0,0 +1 @@
+export {};

package/dialects/postgresql/PostgreSqlTableCompiler.js

@@ -0,0 +1 @@
+export {};

package/dialects/sqlite/BaseSqliteConnection.d.ts

@@ -1,5 +1,7 @@
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export declare abstract class BaseSqliteConnection extends AbstractSqlConnection {
-    connect(): Promise<void>;
-    getClientUrl(): string;
+    connect(options?: {
+        skipOnConnect?: boolean;
+        simple?: boolean;
+    }): Promise<void>;
 }

package/dialects/sqlite/BaseSqliteConnection.js

@@ -3,12 +3,15 @@ import { CompiledQuery } from 'kysely';
 import { Utils } from '@mikro-orm/core';
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export class BaseSqliteConnection extends AbstractSqlConnection {
-    async connect() {
+    async connect(options) {
         await super.connect();
-        Utils.ensureDir(dirname(this.config.get('dbName')));
+        if (options?.simple) {
+            return;
+        }
+        const dbName = this.config.get('dbName');
+        if (dbName && dbName !== ':memory:') {
+            Utils.ensureDir(dirname(this.config.get('dbName')));
+        }
         await this.client.executeQuery(CompiledQuery.raw('pragma foreign_keys = on'));
     }
-    getClientUrl() {
-        return '';
-    }
 }

package/dialects/sqlite/BaseSqlitePlatform.js

@@ -1,4 +1,3 @@
-import { Utils } from '@mikro-orm/core';
 import { AbstractSqlPlatform } from '../../AbstractSqlPlatform.js';
 import { SqliteNativeQueryBuilder } from './SqliteNativeQueryBuilder.js';
 import { SqliteSchemaHelper } from './SqliteSchemaHelper.js';
@@ -29,7 +28,7 @@ export class BaseSqlitePlatform extends AbstractSqlPlatform {
         return ['begin'];
     }
     getEnumTypeDeclarationSQL(column) {
-        if (column.items?.every(item => Utils.isString(item))) {
+        if (column.items?.every(item => typeof item === 'string')) {
             return 'text';
         }
         /* v8 ignore next */

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -167,7 +167,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
             if (col.hidden > 1) {
                 /* v8 ignore next */
                 const storage = col.hidden === 2 ? 'virtual' : 'stored';
-                const re = `(generated always)? as \\((.*)\\)( ${storage})?$`;
+                const re = new RegExp(`(generated always)? as \\((.*)\\)( ${storage})?$`, 'i');
                 const match = columnDefinitions[col.name].definition.match(re);
                 if (match) {
                     generated = `${match[2]} ${storage}`;

package/index.d.ts

@@ -2,7 +2,6 @@
  * @packageDocumentation
  * @module knex
  */
-/** @ignore */
 export { Kysely } from 'kysely';
 export * from '@mikro-orm/core';
 export * from './AbstractSqlConnection.js';
@@ -11,6 +10,7 @@ export * from './AbstractSqlPlatform.js';
 export * from './SqlEntityManager.js';
 export * from './SqlEntityRepository.js';
 export * from './query/index.js';
+export { raw } from './query/index.js';
 export * from './schema/index.js';
 export * from './dialects/index.js';
 export * from './typings.js';

package/index.js

@@ -2,7 +2,6 @@
  * @packageDocumentation
  * @module knex
  */
-/** @ignore */
 export { Kysely } from 'kysely';
 export * from '@mikro-orm/core';
 export * from './AbstractSqlConnection.js';
@@ -11,6 +10,7 @@ export * from './AbstractSqlPlatform.js';
 export * from './SqlEntityManager.js';
 export * from './SqlEntityRepository.js';
 export * from './query/index.js';
+export { raw } from './query/index.js';
 export * from './schema/index.js';
 export * from './dialects/index.js';
 export * from './typings.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.7",
+  "version": "7.0.0-dev.71",
   "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": {
@@ -38,7 +38,7 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 22.17.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy",
@@ -50,13 +50,13 @@
     "access": "public"
   },
   "dependencies": {
-    "kysely": "https://pkg.pr.new/kysely-org/kysely/kysely@2b7007e",
+    "kysely": "0.28.8",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.9"
+    "@mikro-orm/core": "^6.6.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.7"
+    "@mikro-orm/core": "7.0.0-dev.71"
   }
 }

package/query/ArrayCriteriaNode.d.ts

@@ -7,4 +7,5 @@ export declare class ArrayCriteriaNode<T extends object> extends CriteriaNode<T>
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
     unwrap(): any;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): any;
+    isStrict(): boolean;
 }

package/query/ArrayCriteriaNode.js

@@ -18,4 +18,7 @@ export class ArrayCriteriaNode extends CriteriaNode {
             return node.willAutoJoin(qb, alias, options);
         });
     }
+    isStrict() {
+        return this.strict || this.payload.some((node) => node.isStrict());
+    }
 }

package/query/CriteriaNode.d.ts

@@ -11,20 +11,22 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     readonly entityName: string;
     readonly parent?: ICriteriaNode<T> | undefined;
     readonly key?: EntityKey<T> | undefined;
+    readonly strict: boolean;
     payload: any;
     prop?: EntityProperty<T>;
     index?: number;
-    constructor(metadata: MetadataStorage, entityName: string, parent?: ICriteriaNode<T> | undefined, key?: EntityKey<T> | undefined, validate?: boolean);
+    constructor(metadata: MetadataStorage, entityName: string, parent?: ICriteriaNode<T> | undefined, key?: EntityKey<T> | undefined, validate?: boolean, strict?: boolean);
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
     unwrap(): any;
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
-    renameFieldToPK<T>(qb: IQueryBuilder<T>): string;
+    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
     getPath(addIndex?: boolean): string;
     private isPivotJoin;
     getPivotPath(path: string): string;
     aliased(field: string, alias?: string): string;
+    isStrict(): boolean;
     /** @ignore */
     [inspect.custom](): string;
 }

package/query/CriteriaNode.js

@@ -10,14 +10,16 @@ export class CriteriaNode {
     entityName;
     parent;
     key;
+    strict;
     payload;
     prop;
     index;
-    constructor(metadata, entityName, parent, key, validate = true) {
+    constructor(metadata, entityName, parent, key, validate = true, strict = false) {
         this.metadata = metadata;
         this.entityName = entityName;
         this.parent = parent;
         this.key = key;
+        this.strict = strict;
         const meta = parent && metadata.find(parent.entityName);
         if (meta && key) {
             const pks = Utils.splitPrimaryKeys(key);
@@ -65,13 +67,13 @@ export class CriteriaNode {
             default: return false;
         }
     }
-    renameFieldToPK(qb) {
-        let joinAlias = qb.getAliasForJoinPath(this.getPath());
+    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) {
-            joinAlias = qb.getAliasForJoinPath(this.parent.getPath());
-            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
+            const alias = qb.getAliasForJoinPath(this.parent.getPath()) ?? ownerAlias ?? qb.alias;
+            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
         }
-        const alias = joinAlias ?? qb.alias;
+        const alias = joinAlias ?? ownerAlias ?? qb.alias;
         if (this.prop.kind === ReferenceKind.MANY_TO_MANY) {
             return Utils.getPrimaryKeyHash(this.prop.inverseJoinColumns.map(col => `${alias}.${col}`));
         }
@@ -106,6 +108,9 @@ export class CriteriaNode {
     aliased(field, alias) {
         return alias ? `${alias}.${field}` : field;
     }
+    isStrict() {
+        return this.strict;
+    }
     /** @ignore */
     [inspect.custom]() {
         const o = {};

package/query/CriteriaNodeFactory.js

@@ -1,4 +1,4 @@
-import { isRaw, JsonType, RawQueryFragment, ReferenceKind, Utils, ValidationError, } from '@mikro-orm/core';
+import { GroupOperator, isRaw, JsonType, RawQueryFragment, ReferenceKind, Utils, ValidationError, } from '@mikro-orm/core';
 import { ObjectCriteriaNode } from './ObjectCriteriaNode.js';
 import { ArrayCriteriaNode } from './ArrayCriteriaNode.js';
 import { ScalarCriteriaNode } from './ScalarCriteriaNode.js';
@@ -36,7 +36,7 @@ export class CriteriaNodeFactory {
     }
     static createObjectNode(metadata, entityName, payload, parent, key) {
         const meta = metadata.find(entityName);
-        const node = new ObjectCriteriaNode(metadata, entityName, parent, key);
+        const node = new ObjectCriteriaNode(metadata, entityName, parent, key, true, payload.__strict);
         node.payload = {};
         for (const key of Object.keys(payload)) {
             node.payload[key] = this.createObjectItemNode(metadata, entityName, node, payload, key, meta);
@@ -46,10 +46,14 @@ export class CriteriaNodeFactory {
     static createObjectItemNode(metadata, entityName, node, payload, key, meta) {
         const prop = meta?.properties[key];
         const childEntity = prop && prop.kind !== ReferenceKind.SCALAR ? prop.type : entityName;
-        if (prop?.customType instanceof JsonType) {
+        const isNotEmbedded = prop?.kind !== ReferenceKind.EMBEDDED;
+        if (isNotEmbedded && prop?.customType instanceof JsonType) {
             return this.createScalarNode(metadata, childEntity, payload[key], node, key);
         }
-        if (prop?.kind !== ReferenceKind.EMBEDDED) {
+        if (prop?.kind === ReferenceKind.SCALAR && payload[key] != null && Object.keys(payload[key]).some(f => f in GroupOperator)) {
+            throw ValidationError.cannotUseGroupOperatorsInsideScalars(entityName, prop.name, payload);
+        }
+        if (isNotEmbedded) {
             return this.createNode(metadata, childEntity, payload[key], node, key);
         }
         if (payload[key] == null) {
@@ -66,11 +70,12 @@ export class CriteriaNodeFactory {
             throw ValidationError.cannotUseOperatorsInsideEmbeddables(entityName, prop.name, payload);
         }
         const map = Object.keys(payload[key]).reduce((oo, k) => {
-            if (!prop.embeddedProps[k] && !allowedOperators.includes(k)) {
+            const embeddedProp = prop.embeddedProps[k] ?? Object.values(prop.embeddedProps).find(p => p.name === k);
+            if (!embeddedProp && !allowedOperators.includes(k)) {
                 throw ValidationError.invalidEmbeddableQuery(entityName, k, prop.type);
             }
-            if (prop.embeddedProps[k]) {
-                oo[prop.embeddedProps[k].name] = payload[key][k];
+            if (embeddedProp) {
+                oo[embeddedProp.name] = payload[key][k];
             }
             else if (typeof payload[key][k] === 'object') {
                 oo[k] = JSON.stringify(payload[key][k]);

package/query/NativeQueryBuilder.js

@@ -261,7 +261,7 @@ export class NativeQueryBuilder {
         }
         if (this.options.where?.sql.trim()) {
             this.parts.push(`where ${this.options.where.sql}`);
-            this.params.push(...this.options.where.params);
+            this.options.where.params.forEach(p => this.params.push(p));
         }
         if (this.options.groupBy) {
             const fields = this.options.groupBy.map(field => this.quote(field));

package/query/ObjectCriteriaNode.d.ts

@@ -5,6 +5,7 @@ import type { ICriteriaNodeProcessOptions, IQueryBuilder } from '../typings.js';
  */
 export declare class ObjectCriteriaNode<T extends object> extends CriteriaNode<T> {
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
+    isStrict(): boolean;
     unwrap(): any;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldInline(payload: any): boolean;