@mikro-orm/sql 7.0.0-dev.177 → 7.0.0-dev.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.177",
+  "version": "7.0.0-dev.178",
   "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": {
@@ -56,6 +56,6 @@
     "@mikro-orm/core": "^6.6.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.177"
+    "@mikro-orm/core": "7.0.0-dev.178"
   }
 }

package/query/QueryBuilder.d.ts

@@ -325,7 +325,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
     getLoggerContext<T extends Dictionary & LoggingOptions = Dictionary>(): T;
     private fromVirtual;
     private joinReference;
-    protected prepareFields<T>(fields: Field<T>[], type?: 'where' | 'groupBy' | 'sub-query'): (string | RawQueryFragment)[];
+    protected prepareFields<T>(fields: Field<T>[], type?: 'where' | 'groupBy' | 'sub-query', schema?: string): (string | RawQueryFragment)[];
     private init;
     private getQueryBase;
     private applyDiscriminatorCondition;

package/query/QueryBuilder.js

@@ -555,9 +555,10 @@ export class QueryBuilder {
         this._query = {};
         this.finalize();
         const qb = this.getQueryBase(processVirtualEntity);
+        const schema = this.getSchema(this.mainAlias);
         const isNotEmptyObject = (obj) => Utils.hasObjectKeys(obj) || RawQueryFragment.hasObjectFragments(obj);
         Utils.runIfNotEmpty(() => this.helper.appendQueryCondition(this.type, this._cond, qb), this._cond && !this._onConflict);
-        Utils.runIfNotEmpty(() => qb.groupBy(this.prepareFields(this._groupBy, 'groupBy')), isNotEmptyObject(this._groupBy));
+        Utils.runIfNotEmpty(() => qb.groupBy(this.prepareFields(this._groupBy, 'groupBy', schema)), isNotEmptyObject(this._groupBy));
         Utils.runIfNotEmpty(() => this.helper.appendQueryCondition(this.type, this._having, qb, undefined, 'having'), isNotEmptyObject(this._having));
         Utils.runIfNotEmpty(() => {
             const queryOrder = this.helper.getQueryOrder(this.type, this._orderBy, this._populateMap);
@@ -1014,10 +1015,10 @@ export class QueryBuilder {
         }
         return { prop, key: aliasedName };
     }
-    prepareFields(fields, type = 'where') {
+    prepareFields(fields, type = 'where', schema) {
         const ret = [];
         const getFieldName = (name) => {
-            return this.helper.mapper(name, this.type, undefined, type === 'groupBy' ? null : undefined);
+            return this.helper.mapper(name, this.type, undefined, type === 'groupBy' ? null : undefined, schema);
         };
         fields.forEach(field => {
             if (typeof field !== 'string') {
@@ -1117,9 +1118,9 @@ export class QueryBuilder {
         }
         switch (this.type) {
             case QueryType.SELECT:
-                qb.select(this.prepareFields(this._fields));
+                qb.select(this.prepareFields(this._fields, 'where', schema));
                 if (this._distinctOn) {
-                    qb.distinctOn(this.prepareFields(this._distinctOn));
+                    qb.distinctOn(this.prepareFields(this._distinctOn, 'where', schema));
                 }
                 else if (this.flags.has(QueryFlag.DISTINCT)) {
                     qb.distinct();
@@ -1127,7 +1128,7 @@ export class QueryBuilder {
                 this.helper.processJoins(qb, this._joins, joinSchema);
                 break;
             case QueryType.COUNT: {
-                const fields = this._fields.map(f => this.helper.mapper(f, this.type));
+                const fields = this._fields.map(f => this.helper.mapper(f, this.type, undefined, undefined, schema));
                 qb.count(fields, this.flags.has(QueryFlag.DISTINCT));
                 this.helper.processJoins(qb, this._joins, joinSchema);
                 break;
@@ -1341,7 +1342,8 @@ export class QueryBuilder {
         });
     }
     wrapPaginateSubQuery(meta) {
-        const pks = this.prepareFields(meta.primaryKeys, 'sub-query');
+        const schema = this.getSchema(this.mainAlias);
+        const pks = this.prepareFields(meta.primaryKeys, 'sub-query', schema);
         const subQuery = this.clone(['_orderBy', '_fields', 'lockMode', 'lockTableAliases']).select(pks).groupBy(pks).limit(this._limit);
         // revert the on conditions added via populateWhere, we want to apply those only once
         for (const join of Object.values(subQuery._joins)) {
@@ -1456,7 +1458,8 @@ export class QueryBuilder {
         // https://stackoverflow.com/questions/45494/mysql-error-1093-cant-specify-target-table-for-update-in-from-clause
         const subSubQuery = this.platform.createNativeQueryBuilder();
         const method = this.flags.has(QueryFlag.UPDATE_SUB_QUERY) ? 'update' : 'delete';
-        const pks = this.prepareFields(meta.primaryKeys, 'sub-query');
+        const schema = this.getSchema(this.mainAlias);
+        const pks = this.prepareFields(meta.primaryKeys, 'sub-query', schema);
         this._cond = {}; // otherwise we would trigger validation error
         this._joins = {}; // included in the subquery
         subSubQuery.select(pks).from(subQuery.as(this.mainAlias.aliasName));