fix(core): skip 1:1 owner auto-joins for lazy properties

mikro-orm · Apr 10, 2024 · 6442e57 · 6442e57
1 parent ccdf018
commit 6442e57
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/packages/knex/src/AbstractSqlDriver.ts b/packages/knex/src/AbstractSqlDriver.ts
@@ -1021,7 +1021,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
 
     const relationsToPopulate = populate.map(({ field }) => field.split(':')[0]);
     const toPopulate: PopulateOptions<T>[] = meta.relations
-      .filter(prop => prop.kind === ReferenceKind.ONE_TO_ONE && !prop.owner && !relationsToPopulate.includes(prop.name))
+      .filter(prop => prop.kind === ReferenceKind.ONE_TO_ONE && !prop.owner && !prop.lazy && !relationsToPopulate.includes(prop.name))
       .filter(prop => fields.length === 0 || fields.some(f => prop.name === f || prop.name.startsWith(`${String(f)}.`)))
       .map(prop => ({ field: `${prop.name}:ref` as any, strategy: prop.strategy }));
 
@@ -1541,7 +1541,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
       if (!options.fields.includes('*') && !options.fields.includes(`${qb.alias}.*`)) {
         ret.unshift(...meta.primaryKeys.filter(pk => !options.fields!.includes(pk)));
       }
-    } else if (!Utils.isEmpty(options.exclude) || lazyProps.some(p => !p.formula)) {
+    } else if (!Utils.isEmpty(options.exclude) || lazyProps.some(p => !p.formula && (p.kind !== '1:1' || p.owner))) {
       const props = meta.props.filter(prop => this.platform.shouldHaveColumn(prop, populate, options.exclude as string[], false));
       ret.push(...props.filter(p => !lazyProps.includes(p)).map(p => p.name));
       addFormulas = true;

diff --git a/tests/bootstrap.ts b/tests/bootstrap.ts
@@ -198,7 +198,6 @@ export async function initORMMsSql(additionalOptions: Partial<Options<MsSqlDrive
     password: 'Root.Root',
     debug: true,
     forceUtcTimezone: true,
-    autoJoinOneToOneOwner: false,
     logger: i => i,
     extensions: [Migrator, SeedManager, EntityGenerator],
     ...additionalOptions,

diff --git a/tests/entities-mssql/Author2.ts b/tests/entities-mssql/Author2.ts
@@ -56,7 +56,7 @@ export class Author2 extends BaseEntity2 {
   @OneToMany({ entity: () => Book2, mappedBy: 'author', strategy: LoadStrategy.JOINED, orderBy: { title: QueryOrder.ASC } })
   books2 = new Collection<Book2>(this);
 
-  @OneToOne({ entity: () => Address2, mappedBy: address => address.author, cascade: [Cascade.ALL] })
+  @OneToOne({ entity: () => Address2, mappedBy: address => address.author, cascade: [Cascade.ALL], lazy: true })
   address?: Address2;
 
   @ManyToMany({ entity: () => Author2, pivotTable: 'author_to_friend' })

diff --git a/tests/entities-mssql/Book2.ts b/tests/entities-mssql/Book2.ts
@@ -44,7 +44,7 @@ export class Book2 {
   @ManyToOne(() => Publisher2, { cascade: [Cascade.PERSIST, Cascade.REMOVE], nullable: true, ref: true })
   publisher?: Ref<Publisher2>;
 
-  @OneToOne({ cascade: [], mappedBy: 'book', nullable: true })
+  @OneToOne({ cascade: [], mappedBy: 'book', nullable: true, lazy: true })
   test?: Test2;
 
   @ManyToMany({ entity: () => BookTag2, cascade: [], fixedOrderColumn: 'order' })

diff --git a/tests/entities-mssql/FooBaz2.ts b/tests/entities-mssql/FooBaz2.ts
@@ -10,7 +10,7 @@ export class FooBaz2 {
   @Property()
   name: string;
 
-  @OneToOne(() => FooBar2, 'baz')
+  @OneToOne(() => FooBar2, 'baz', { lazy: true })
   bar?: FooBar2;
 
   @Property({ version: true })