@mikro-orm/mssql 6.4.16-dev.11 → 6.4.16-dev.13

package/MsSqlDriver.js

@@ -46,7 +46,7 @@ class MsSqlDriver extends knex_1.AbstractSqlDriver {
                 return `set identity_insert ${tableName} on; ${sql}; set identity_insert ${tableName} off`;
             });
         }
-        return super.nativeInsertMany(entityName, data, options, sql => meta.hasTriggers ? this.appendOutputTable(entityName, sql) : sql);
+        return super.nativeInsertMany(entityName, data, options, sql => meta.hasTriggers ? this.appendOutputTable(entityName, data, sql) : sql);
     }
     createQueryBuilder(entityName, ctx, preferredConnectionType, convertCustomTypes, loggerContext, alias, em) {
         // do not compute the connectionType if EM is provided as it will be computed from it in the QB later on
@@ -57,10 +57,16 @@ class MsSqlDriver extends knex_1.AbstractSqlDriver {
         }
         return qb;
     }
-    appendOutputTable(entityName, sql) {
+    appendOutputTable(entityName, data, sql) {
         const meta = this.metadata.get(entityName);
-        const returningProps = meta.props.filter(prop => prop.primary || prop.defaultRaw);
+        const returningProps = meta.props
+            .filter(prop => prop.persist !== false && prop.defaultRaw || prop.autoincrement || prop.generated)
+            .filter(prop => !(prop.name in data[0]) || core_1.Utils.isRawSql(data[0][prop.name]));
         const returningFields = core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames));
+        /* istanbul ignore next */
+        if (returningFields.length === 0) {
+            return sql;
+        }
         const tableName = this.getTableName(meta, {}, true);
         const selections = returningFields
             .map((field) => `[t].${this.platform.quoteIdentifier(field)}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "6.4.16-dev.11",
+  "version": "6.4.16-dev.13",
   "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",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.4.16-dev.11",
+    "@mikro-orm/knex": "6.4.16-dev.13",
     "tedious": "19.0.0",
     "tsqlstring": "1.0.1"
   },
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^6.4.15"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.16-dev.11"
+    "@mikro-orm/core": "6.4.16-dev.13"
   }
 }