fix(knex): ensure virtual properties are never part of returning cl…

…ause Closes #3664
mikro-orm · Oct 31, 2022 · 35d51fe · 35d51fe
1 parent b1a867d
commit 35d51fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/packages/knex/src/AbstractSqlDriver.ts b/packages/knex/src/AbstractSqlDriver.ts
@@ -354,7 +354,7 @@ export abstract class AbstractSqlDriver<C extends AbstractSqlConnection = Abstra
 
     if (this.platform.usesReturningStatement()) {
       /* istanbul ignore next */
-      const returningProps = meta!.props.filter(prop => prop.primary || prop.defaultRaw);
+      const returningProps = meta!.hydrateProps.filter(prop => prop.primary || prop.defaultRaw);
       const returningFields = Utils.flatten(returningProps.map(prop => prop.fieldNames));
       /* istanbul ignore next */
       sql += returningFields.length > 0 ? ` returning ${returningFields.map(field => this.platform.quoteIdentifier(field)).join(', ')}` : '';

diff --git a/packages/knex/src/query/QueryBuilderHelper.ts b/packages/knex/src/query/QueryBuilderHelper.ts
@@ -566,7 +566,7 @@ export class QueryBuilderHelper {
     const useReturningStatement = type === QueryType.INSERT && this.platform.usesReturningStatement() && meta && !meta.compositePK;
 
     if (useReturningStatement) {
-      const returningProps = meta!.props.filter(prop => prop.primary || prop.defaultRaw);
+      const returningProps = meta!.hydrateProps.filter(prop => prop.primary || prop.defaultRaw);
       qb.returning(Utils.flatten(returningProps.map(prop => prop.fieldNames)));
     }
   }

diff --git a/tests/issues/GH1626.test.ts b/tests/issues/GH1626.test.ts
@@ -29,6 +29,11 @@ export class Author {
   @Property({ nullable: true })
   name?: string;
 
+  @Property({ persist: false })
+  get nickname(): string {
+    return this.name ?? '~';
+  }
+
 }
 
 describe('GH issue 1626', () => {