@mikro-orm/sql 7.2.1-dev.19 → 7.2.1-dev.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -772,9 +772,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
772
772
  ? '(' + fields.map(k => this.platform.quoteIdentifier(k)).join(', ') + ')'
773
773
  : `(${this.platform.quoteIdentifier(pks[0])})`;
774
774
  if (this.platform.usesOutputStatement()) {
775
- const returningProps = this.getTableProps(meta)
776
- .filter(prop => (prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated)
777
- .filter(prop => !(prop.name in data[0]) || isRaw(data[0][prop.name]));
775
+ const returningProps = this.getTableProps(meta).filter(prop => prop.returning ||
776
+ (((prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated) &&
777
+ (!(prop.name in data[0]) || isRaw(data[0][prop.name]))));
778
778
  const returningFields = Utils.flatten(returningProps.map(prop => prop.fieldNames));
779
779
  sql +=
780
780
  returningFields.length > 0
@@ -892,9 +892,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
892
892
  .join(', ');
893
893
  }
894
894
  if (meta && this.platform.usesReturningStatement()) {
895
- const returningProps = this.getTableProps(meta)
896
- .filter(prop => (prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated)
897
- .filter(prop => !(prop.name in data[0]) || isRaw(data[0][prop.name]));
895
+ const returningProps = this.getTableProps(meta).filter(prop => prop.returning ||
896
+ (((prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated) &&
897
+ (!(prop.name in data[0]) || isRaw(data[0][prop.name]))));
898
898
  const returningFields = Utils.flatten(returningProps.map(prop => prop.fieldNames));
899
899
  /* v8 ignore next */
900
900
  sql +=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mikro-orm/sql",
3
- "version": "7.2.1-dev.19",
3
+ "version": "7.2.1-dev.20",
4
4
  "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.",
5
5
  "keywords": [
6
6
  "data-mapper",
@@ -53,7 +53,7 @@
53
53
  "@mikro-orm/core": "^7.2.0"
54
54
  },
55
55
  "peerDependencies": {
56
- "@mikro-orm/core": "7.2.1-dev.19"
56
+ "@mikro-orm/core": "7.2.1-dev.20"
57
57
  },
58
58
  "engines": {
59
59
  "node": ">= 22.17.0"
@@ -909,7 +909,7 @@ export class QueryBuilder {
909
909
  .filter(prop => prop.returning || (prop.persist !== false && ((prop.primary && prop.autoincrement) || prop.defaultRaw)))
910
910
  // a TPT table can only return its own columns
911
911
  .filter(prop => meta.inheritanceType !== 'tpt' || prop.primary || meta.ownProps.some(p => p.name === prop.name))
912
- .filter(prop => !data || !(prop.name in data));
912
+ .filter(prop => prop.returning || !data || !(prop.name in data));
913
913
  if (returningProps.length > 0) {
914
914
  qb.returning(Utils.flatten(returningProps.map(prop => prop.fieldNames)));
915
915
  }