@mikro-orm/knex 6.6.3-dev.1 → 6.6.3-dev.11

package/AbstractSqlDriver.js

@@ -31,7 +31,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         const populate = this.autoJoinOneToOneOwner(meta, options.populate, options.fields);
         const joinedProps = this.joinedProps(meta, populate, options);
-        const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false, options.logging);
+        const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false, options.logging)
+            .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);
@@ -50,8 +51,7 @@ class AbstractSqlDriver extends core_1.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.6.3-dev.1",
+  "version": "6.6.3-dev.11",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.6.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.6.3-dev.1",
+    "@mikro-orm/core": "6.6.3-dev.11",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/ObjectCriteriaNode.js

@@ -38,7 +38,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.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.className)
                         .innerJoin(this.key, qb2.getNextAlias(this.prop.type))

package/query/QueryBuilder.d.ts

@@ -278,7 +278,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * You can provide `EntityName.propName` as alias, then the field name will be used based on the metadata
      */
     as(alias: string): Knex.QueryBuilder;
-    clone(reset?: boolean | string[]): QueryBuilder<Entity>;
+    clone(reset?: boolean | string[], preserve?: string[]): QueryBuilder<Entity>;
     getKnex(processVirtualEntity?: boolean): Knex.QueryBuilder;
     /**
      * Sets logger context for this query builder.

package/query/QueryBuilder.js

@@ -833,11 +833,8 @@ class QueryBuilder {
         Object.defineProperty(ret, '__as', { enumerable: false, value: alias });
         return ret;
     }
-    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 = [
@@ -847,14 +844,14 @@ class QueryBuilder {
         ];
         core_1.RawQueryFragment.cloneRegistry = this.rawFragments;
         for (const prop of Object.keys(this)) {
-            if (reset.includes(prop) || prop === '_helper') {
+            if (!preserve?.includes(prop) && (reset === true || reset.includes(prop) || prop === '_helper')) {
                 continue;
             }
             qb[prop] = properties.includes(prop) ? core_1.Utils.copy(this[prop]) : this[prop];
         }
         delete core_1.RawQueryFragment.cloneRegistry;
         /* istanbul ignore else */
-        if (this._fields && !reset.includes('_fields')) {
+        if (this._fields && reset !== true && !reset.includes('_fields')) {
             qb._fields = [...this._fields];
         }
         qb._aliases = { ...this._aliases };

package/schema/SqlSchemaGenerator.js

@@ -187,7 +187,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         options.dropTables ??= true;
         const toSchema = this.getTargetSchema(options.schema);
         const schemas = toSchema.getNamespaces();
-        const fromSchema = options.fromSchema ?? await DatabaseSchema_1.DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas);
+        const fromSchema = options.fromSchema ?? await DatabaseSchema_1.DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas, undefined, this.options.skipTables);
         const wildcardSchemaTables = Object.values(this.metadata.getAll()).filter(meta => meta.schema === '*').map(meta => meta.tableName);
         fromSchema.prune(options.schema, wildcardSchemaTables);
         toSchema.prune(options.schema, wildcardSchemaTables);

package/typings.d.ts

@@ -160,11 +160,12 @@ export interface IQueryBuilder<T> {
     getAliasForJoinPath(path: string, options?: ICriteriaNodeProcessOptions): string | undefined;
     getJoinForPath(path?: string, options?: ICriteriaNodeProcessOptions): JoinOptions | undefined;
     getNextAlias(entityName?: string): string;
-    clone(reset?: boolean): IQueryBuilder<T>;
+    clone(reset?: boolean | string[], preserve?: string[]): IQueryBuilder<T>;
     setFlag(flag: QueryFlag): this;
     unsetFlag(flag: QueryFlag): this;
     hasFlag(flag: QueryFlag): boolean;
     scheduleFilterCheck(path: string): void;
+    withSchema(schema: string): this;
 }
 export interface ICriteriaNodeProcessOptions {
     alias?: string;