@mikro-orm/sql 7.0.7-dev.6 → 7.0.7-dev.7

package/AbstractSqlPlatform.d.ts

@@ -36,6 +36,8 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     quoteJsonKey(key: string): string;
     getJsonIndexDefinition(index: IndexDef): string[];
     supportsUnionWhere(): boolean;
+    /** Whether the platform supports `count(distinct col1, col2)` with multiple columns. If false, a subquery wrapper is used instead. */
+    supportsMultiColumnCountDistinct(): boolean;
     supportsSchemas(): boolean;
     /** @inheritDoc */
     generateCustomOrder(escapedColumn: string, values: unknown[]): string;

package/AbstractSqlPlatform.js

@@ -91,6 +91,10 @@ export class AbstractSqlPlatform extends Platform {
     supportsUnionWhere() {
         return true;
     }
+    /** Whether the platform supports `count(distinct col1, col2)` with multiple columns. If false, a subquery wrapper is used instead. */
+    supportsMultiColumnCountDistinct() {
+        return false;
+    }
     supportsSchemas() {
         return false;
     }

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -137,13 +137,18 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         this.parts[this.parts.length - 1] += ';';
     }
     compileSelect() {
+        const wrapCountSubquery = this.needsCountSubquery();
+        if (wrapCountSubquery) {
+            this.parts.push(`select count(*) as ${this.quote('count')} from (`);
+        }
         this.parts.push('select');
-        if (this.options.limit != null && this.options.offset == null) {
+        // skip top(?) inside the count subquery — it would limit the distinct rows before counting
+        if (this.options.limit != null && this.options.offset == null && !wrapCountSubquery) {
             this.parts.push(`top (?)`);
             this.params.push(this.options.limit);
         }
         this.addHintComment();
-        this.parts.push(`${this.getFields()} from ${this.getTableName()}`);
+        this.parts.push(`${this.getFields(wrapCountSubquery)} from ${this.getTableName()}`);
         this.addLockClause();
         if (this.options.joins) {
             for (const join of this.options.joins) {
@@ -163,21 +168,27 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             this.parts.push(`having ${this.options.having.sql}`);
             this.params.push(...this.options.having.params);
         }
-        if (this.options.orderBy) {
-            this.parts.push(`order by ${this.options.orderBy}`);
-        }
-        if (this.options.offset != null) {
-            /* v8 ignore next */
-            if (!this.options.orderBy) {
-                throw new Error('Order by clause is required for pagination');
+        if (!wrapCountSubquery) {
+            if (this.options.orderBy) {
+                this.parts.push(`order by ${this.options.orderBy}`);
             }
-            this.parts.push(`offset ? rows`);
-            this.params.push(this.options.offset);
-            if (this.options.limit != null) {
-                this.parts.push(`fetch next ? rows only`);
-                this.params.push(this.options.limit);
+            if (this.options.offset != null) {
+                /* v8 ignore next */
+                if (!this.options.orderBy) {
+                    throw new Error('Order by clause is required for pagination');
+                }
+                this.parts.push(`offset ? rows`);
+                this.params.push(this.options.offset);
+                if (this.options.limit != null) {
+                    this.parts.push(`fetch next ? rows only`);
+                    this.params.push(this.options.limit);
+                }
             }
         }
+        if (wrapCountSubquery) {
+            const asKeyword = this.platform.usesAsKeyword() ? ' as ' : ' ';
+            this.parts.push(`)${asKeyword}${this.quote('dcnt')}`);
+        }
     }
     addLockClause() {
         if (!this.options.lockMode ||

package/dialects/mysql/BaseMySqlPlatform.d.ts

@@ -14,6 +14,7 @@ export declare class BaseMySqlPlatform extends AbstractSqlPlatform {
         readonly "desc nulls first": "is not null";
         readonly "desc nulls last": "is null";
     };
+    supportsMultiColumnCountDistinct(): boolean;
     /** @internal */
     createNativeQueryBuilder(): MySqlNativeQueryBuilder;
     getDefaultCharset(): string;

package/dialects/mysql/BaseMySqlPlatform.js

@@ -18,6 +18,9 @@ export class BaseMySqlPlatform extends AbstractSqlPlatform {
         [QueryOrder.desc_nulls_first]: 'is not null',
         [QueryOrder.desc_nulls_last]: 'is null',
     };
+    supportsMultiColumnCountDistinct() {
+        return true;
+    }
     /** @internal */
     createNativeQueryBuilder() {
         return new MySqlNativeQueryBuilder(this);

package/dialects/oracledb/OracleNativeQueryBuilder.js

@@ -213,9 +213,13 @@ export class OracleNativeQueryBuilder extends NativeQueryBuilder {
         }
     }
     compileSelect() {
+        const wrapCountSubquery = this.needsCountSubquery();
+        if (wrapCountSubquery) {
+            this.parts.push(`select count(*) as ${this.quote('count')} from (`);
+        }
         this.parts.push('select');
         this.addHintComment();
-        this.parts.push(`${this.getFields()} from ${this.getTableName()}`);
+        this.parts.push(`${this.getFields(wrapCountSubquery)} from ${this.getTableName()}`);
         if (this.options.joins) {
             for (const join of this.options.joins) {
                 this.parts.push(join.sql);
@@ -234,16 +238,22 @@ export class OracleNativeQueryBuilder extends NativeQueryBuilder {
             this.parts.push(`having ${this.options.having.sql}`);
             this.params.push(...this.options.having.params);
         }
-        if (this.options.orderBy) {
-            this.parts.push(`order by ${this.options.orderBy}`);
-        }
-        if (this.options.offset != null) {
-            this.parts.push(`offset ? rows`);
-            this.params.push(this.options.offset);
+        if (!wrapCountSubquery) {
+            if (this.options.orderBy) {
+                this.parts.push(`order by ${this.options.orderBy}`);
+            }
+            if (this.options.offset != null) {
+                this.parts.push(`offset ? rows`);
+                this.params.push(this.options.offset);
+            }
+            if (this.options.limit != null) {
+                this.parts.push(`fetch next ? rows only`);
+                this.params.push(this.options.limit);
+            }
         }
-        if (this.options.limit != null) {
-            this.parts.push(`fetch next ? rows only`);
-            this.params.push(this.options.limit);
+        if (wrapCountSubquery) {
+            const asKeyword = this.platform.usesAsKeyword() ? ' as ' : ' ';
+            this.parts.push(`)${asKeyword}${this.quote('dcnt')}`);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.7-dev.6",
+  "version": "7.0.7-dev.7",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.0.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.7-dev.6"
+    "@mikro-orm/core": "7.0.7-dev.7"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/NativeQueryBuilder.d.ts

@@ -121,7 +121,9 @@ export declare class NativeQueryBuilder implements Subquery {
     as(alias: string): this;
     toRaw(): RawQueryFragment;
     protected compileSelect(): void;
-    protected getFields(): string;
+    /** Whether this COUNT query needs a subquery wrapper for multi-column distinct. */
+    protected needsCountSubquery(): boolean;
+    protected getFields(countSubquery?: boolean): string;
     protected compileInsert(): void;
     protected addOutputClause(type: 'inserted' | 'deleted'): void;
     protected processInsertData(): string[];

package/query/NativeQueryBuilder.js

@@ -281,9 +281,13 @@ export class NativeQueryBuilder {
         return raw(sql, params);
     }
     compileSelect() {
+        const wrapCountSubquery = this.needsCountSubquery();
+        if (wrapCountSubquery) {
+            this.parts.push(`select count(*) as ${this.quote('count')} from (`);
+        }
         this.parts.push('select');
         this.addHintComment();
-        this.parts.push(`${this.getFields()} from ${this.getTableName()}`);
+        this.parts.push(`${this.getFields(wrapCountSubquery)} from ${this.getTableName()}`);
         if (this.options.joins) {
             for (const join of this.options.joins) {
                 this.parts.push(join.sql);
@@ -302,23 +306,40 @@ export class NativeQueryBuilder {
             this.parts.push(`having ${this.options.having.sql}`);
             this.params.push(...this.options.having.params);
         }
-        if (this.options.orderBy) {
-            this.parts.push(`order by ${this.options.orderBy}`);
-        }
-        if (this.options.limit != null) {
-            this.parts.push(`limit ?`);
-            this.params.push(this.options.limit);
+        if (!wrapCountSubquery) {
+            if (this.options.orderBy) {
+                this.parts.push(`order by ${this.options.orderBy}`);
+            }
+            if (this.options.limit != null) {
+                this.parts.push(`limit ?`);
+                this.params.push(this.options.limit);
+            }
+            if (this.options.offset != null) {
+                this.parts.push(`offset ?`);
+                this.params.push(this.options.offset);
+            }
         }
-        if (this.options.offset != null) {
-            this.parts.push(`offset ?`);
-            this.params.push(this.options.offset);
+        if (wrapCountSubquery) {
+            const asKeyword = this.platform.usesAsKeyword() ? ' as ' : ' ';
+            this.parts.push(`)${asKeyword}${this.quote('dcnt')}`);
         }
     }
-    getFields() {
+    /** Whether this COUNT query needs a subquery wrapper for multi-column distinct. */
+    needsCountSubquery() {
+        return (this.type === QueryType.COUNT &&
+            !!this.options.distinct &&
+            this.options.select.length > 1 &&
+            !this.platform.supportsMultiColumnCountDistinct());
+    }
+    getFields(countSubquery) {
         if (!this.options.select || this.options.select.length === 0) {
             throw new Error('No fields selected');
         }
         let fields = this.options.select.map(field => this.quote(field)).join(', ');
+        // count subquery emits just `distinct col1, col2` — the outer wrapper adds count(*)
+        if (countSubquery) {
+            return `distinct ${fields}`;
+        }
         if (this.options.distinct) {
             fields = `distinct ${fields}`;
         }