@mikro-orm/sql 7.2.2-dev.1 → 7.2.2-dev.3

package/AbstractSqlDriver.d.ts

@@ -17,7 +17,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     /** Evaluates a formula callback, handling both string and Raw return values. */
     evaluateFormula(formula: (...args: any[]) => string | Raw, columns: any, table: FormulaTable): string;
     /** For TPT entities, returns ownProps (columns in this table); otherwise returns all props. */
-    private getTableProps;
+    protected getTableProps<T extends object>(meta: EntityMetadata<T>): EntityProperty<T>[];
     /** Creates a FormulaTable object for use in formula callbacks. */
     private createFormulaTable;
     private validateSqlOptions;

package/dialects/mssql/MsSqlNativeQueryBuilder.d.ts

@@ -6,6 +6,7 @@ export declare class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         params: unknown[];
     };
     protected compileInsert(): void;
+    protected addOutputClause(type: 'inserted' | 'deleted'): void;
     private appendOutputTable;
     private compileUpsert;
     protected compileSelect(): void;

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -22,6 +22,9 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         this.compileCtes();
         if (this.options.onConflict && !Utils.isEmpty(Utils.asArray(this.options.data)[0])) {
             this.compileUpsert();
+            if (suffix) {
+                this.parts.push(suffix);
+            }
         }
         else {
             switch (this.type) {
@@ -72,20 +75,23 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             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(', '));
     }
+    addOutputClause(type) {
+        super.addOutputClause(type);
+        if (this.options.returning?.length && this.options.flags?.has(QueryFlag.OUTPUT_TABLE)) {
+            this.parts[this.parts.length - 1] += ' into #out';
+        }
+    }
     appendOutputTable() {
-        if (!this.options.flags?.has(QueryFlag.OUTPUT_TABLE)) {
+        if (!this.options.flags?.has(QueryFlag.OUTPUT_TABLE) || !this.options.returning?.length) {
             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`,
+            suffix: `select ${selections} from #out as t; select @@rowcount as [__mikro_orm_row_count__]; drop table #out`,
         };
     }
     compileUpsert() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.2-dev.1",
+  "version": "7.2.2-dev.3",
   "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.2.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.2-dev.1"
+    "@mikro-orm/core": "7.2.2-dev.3"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.js

@@ -2010,9 +2010,11 @@ export class QueryBuilder {
             }))
                 .forEach(field => this.#state.fields.push(raw(field)));
         }
-        QueryHelper.processObjectParams(this.#state.data);
-        QueryHelper.processObjectParams(this.#state.cond);
-        QueryHelper.processObjectParams(this.#state.having);
+        if (this.#state.data) {
+            this.#state.data = QueryHelper.processObjectParams(this.#state.data);
+        }
+        this.#state.cond = QueryHelper.processObjectParams(this.#state.cond);
+        this.#state.having = QueryHelper.processObjectParams(this.#state.having);
         // automatically enable paginate flag when we detect to-many joins, but only if there is no `group by` clause
         if (!this.#state.flags.has(QueryFlag.DISABLE_PAGINATE) &&
             this.#state.groupBy.length === 0 &&