@mikro-orm/sql 7.0.0-dev.115 → 7.0.0-dev.116

package/AbstractSqlDriver.js

@@ -25,7 +25,8 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const connectionType = this.resolveConnectionType({ ctx: options.ctx, connectionType: options.connectionType });
         const populate = this.autoJoinOneToOneOwner(meta, options.populate, options.fields);
         const joinedProps = this.joinedProps(meta, populate, options);
-        const qb = this.createQueryBuilder(meta.class, options.ctx, connectionType, false, options.logging, undefined, options.em);
+        const qb = this.createQueryBuilder(meta.class, options.ctx, connectionType, false, options.logging, undefined, options.em)
+            .withSchema(this.getSchemaName(meta, options));
         const fields = this.buildFields(meta, populate, joinedProps, qb, qb.alias, options);
         const orderBy = this.buildOrderBy(qb, meta, populate, options);
         const populateWhere = this.buildPopulateWhere(meta, joinedProps, options);
@@ -44,8 +45,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             .having(options.having)
             .indexHint(options.indexHint)
             .comment(options.comments)
-            .hintComment(options.hintComments)
-            .withSchema(this.getSchemaName(meta, options));
+            .hintComment(options.hintComments);
         if (isCursorPagination) {
             const { orderBy: newOrderBy, where } = this.processCursorOptions(meta, options, orderBy);
             qb.andWhere(where).orderBy(newOrderBy);

package/dialects/postgresql/BasePostgreSqlPlatform.js

@@ -172,6 +172,7 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         const quote = (v) => v === '' || v.match(/["{},\\]/) ? JSON.stringify(v) : v;
         return `{${values.map(v => quote('' + v)).join(',')}}`;
     }
+    /* v8 ignore next */
     unmarshallArray(value) {
         if (value === '{}') {
             return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.115",
+  "version": "7.0.0-dev.116",
   "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": {
@@ -53,9 +53,9 @@
     "kysely": "0.28.9"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.6.2"
+    "@mikro-orm/core": "^6.6.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.115"
+    "@mikro-orm/core": "7.0.0-dev.116"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -35,7 +35,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
                         throw new Error('Mixing collection operators with other filters is not allowed.');
                     }
                     const payload = this.payload[key].unwrap();
-                    const qb2 = qb.clone(true);
+                    const qb2 = qb.clone(true, ['_schema']);
                     const sub = qb2
                         .from(parentMeta.class)
                         .innerJoin(this.key, qb2.getNextAlias(this.prop.targetMeta.class))

package/query/QueryBuilder.d.ts

@@ -314,7 +314,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * You can provide the target entity name as the first parameter and use the second parameter to point to an existing property to infer its field name.
      */
     as<T>(targetEntity: EntityName<T>, alias: EntityKey<T>): NativeQueryBuilder;
-    clone(reset?: boolean | string[]): QueryBuilder<Entity>;
+    clone(reset?: boolean | string[], preserve?: string[]): QueryBuilder<Entity>;
     /**
      * Sets logger context for this query builder.
      */

package/query/QueryBuilder.js

@@ -874,11 +874,8 @@ export class QueryBuilder {
         Object.defineProperty(qb, '__as', { enumerable: false, value: finalAlias });
         return qb;
     }
-    clone(reset) {
+    clone(reset, preserve) {
         const qb = new QueryBuilder(this.mainAlias.entityName, this.metadata, this.driver, this.context, this.mainAlias.aliasName, this.connectionType, this.em);
-        if (reset === true) {
-            return qb;
-        }
         reset = reset || [];
         // clone array/object properties
         const properties = [
@@ -887,13 +884,13 @@ export class QueryBuilder {
             '_comments', '_hintComments', 'aliasCounter',
         ];
         for (const prop of Object.keys(this)) {
-            if (reset.includes(prop) || ['_helper', '_query'].includes(prop)) {
+            if (!preserve?.includes(prop) && (reset === true || reset.includes(prop) || ['_helper', '_query'].includes(prop))) {
                 continue;
             }
             qb[prop] = properties.includes(prop) ? Utils.copy(this[prop]) : this[prop];
         }
         /* v8 ignore next */
-        if (this._fields && !reset.includes('_fields')) {
+        if (this._fields && reset !== true && !reset.includes('_fields')) {
             qb._fields = [...this._fields];
         }
         qb._aliases = { ...this._aliases };