typeorm · AlexMesser · Mar 29, 2021 · Mar 6, 2021 · Mar 6, 2021 · Mar 6, 2021
diff --git a/src/query-builder/transformer/RawSqlResultsToEntityTransformer.ts b/src/query-builder/transformer/RawSqlResultsToEntityTransformer.ts
@@ -41,7 +41,7 @@ export class RawSqlResultsToEntityTransformer {
         const entities: any[] = [];
         group.forEach(results => {
             const entity = this.transformRawResultsGroup(results, alias);
-            if (entity !== undefined)
+            if (entity !== undefined && !Object.values(entity).every((value) => value === null))
                 entities.push(entity);
         });
         return entities;

diff --git a/test/github-issues/7041/entity/Admin.ts b/test/github-issues/7041/entity/Admin.ts
@@ -0,0 +1,23 @@
+import {
+    BaseEntity,
+    Column,
+    Entity,
+    JoinColumn,
+    OneToOne,
+} from "../../../../src";
+import { User } from "./User";
+import { Organization } from "./Organization";
+
+@Entity()
+export class Admin extends BaseEntity {
+    @OneToOne(() => User, (user) => user.admin, { primary: true })
+    @JoinColumn()
+    user: User;
+
+    @OneToOne(() => Organization, (org) => org.admin)
+    @JoinColumn()
+    organization: Organization;
+
+    @Column()
+    randomField: string;
+}
diff --git a/test/github-issues/7041/entity/Organization.ts b/test/github-issues/7041/entity/Organization.ts
@@ -0,0 +1,28 @@
+import {
+    BaseEntity,
+    Column,
+    Entity,
+    OneToMany,
+    OneToOne,
+    PrimaryGeneratedColumn,
+} from "../../../../src";
+import { Admin } from "./Admin";
+import { OrganizationMembership } from "./OrganizationMembership";
+
+@Entity()
+export class Organization extends BaseEntity {
+    @PrimaryGeneratedColumn("uuid")
+    id: string;
+
+    @OneToOne(() => Admin, (admin) => admin.organization, { nullable: true })
+    admin: Admin;
+
+    @Column()
+    randomField: string;
+
+    @OneToMany(
+        () => OrganizationMembership,
+        (membership) => membership.organization
+    )
+    membership: OrganizationMembership[];
+}
diff --git a/test/github-issues/7041/entity/OrganizationMembership.ts b/test/github-issues/7041/entity/OrganizationMembership.ts
@@ -0,0 +1,19 @@
+import { BaseEntity, Column, Entity, ManyToOne } from "../../../../src";
+import { User } from "./User";
+import { Organization } from "./Organization";
+
+@Entity()
+export class OrganizationMembership extends BaseEntity {
+    @ManyToOne(() => User, (user) => user.membership, {
+        primary: true,
+    })
+    user: User;
+
+    @ManyToOne(() => Organization, (organization) => organization.membership, {
+        primary: true,
+    })
+    organization: Organization;
+
+    @Column()
+    accessLevel: string;
+}
diff --git a/test/github-issues/7041/entity/User.ts b/test/github-issues/7041/entity/User.ts
@@ -0,0 +1,27 @@
+import {
+    BaseEntity,
+    Column,
+    Entity,
+    OneToMany,
+    OneToOne,
+    PrimaryGeneratedColumn,
+} from "../../../../src";
+import { Admin } from "./Admin";
+import { OrganizationMembership } from "./OrganizationMembership";
+
+@Entity()
+export class User extends BaseEntity {
+    @PrimaryGeneratedColumn("uuid")
+    id: string;
+
+    @Column()
+    randomField: string;
+
+    @OneToOne(() => Admin, (admin) => admin.user, { nullable: true })
+    admin: Admin;
+
+    @OneToMany(() => OrganizationMembership, (membership) => membership.user, {
+        nullable: true,
+    })
+    membership: OrganizationMembership[];
+}
diff --git a/test/github-issues/7041/entity/index.ts b/test/github-issues/7041/entity/index.ts
@@ -0,0 +1,4 @@
+export { Admin } from "./Admin";
+export { Organization } from "./Organization";
+export { User } from "./User";
+export { OrganizationMembership } from "./OrganizationMembership";
diff --git a/test/github-issues/7041/issue-7041.ts b/test/github-issues/7041/issue-7041.ts
@@ -0,0 +1,53 @@
+import "reflect-metadata";
+import {
+    createTestingConnections,
+    closeTestingConnections,
+    reloadTestingDatabases,
+} from "../../utils/test-utils";
+import { Connection } from "../../../src";
+import { expect } from "chai";
+import { Organization, Admin, User, OrganizationMembership } from "./entity";
+
+describe("github issues > #7041 When requesting nested relations on foreign key primary entities, relation becomes empty entity rather than null", () => {
+    let connections: Connection[];
+    before(
+        async () =>
+            (connections = await createTestingConnections({
+                entities: [Organization, Admin, User, OrganizationMembership],
+                schemaCreate: true,
+                dropSchema: true,
+            }))
+    );
+    beforeEach(() => reloadTestingDatabases(connections));
+    after(() => closeTestingConnections(connections));
+
+    it("should return null when requested nested relations are empty on OneToOne relation", () =>
+        Promise.all(
+            connections.map(async (connection) => {
+                const userRepo = connection.getRepository(User);
+                const testUser = new User();
+                testUser.randomField = "foo";
+                await userRepo.save(testUser);
+                const foundUser = await userRepo.findOne(testUser.id, {
+                    relations: ["admin", "admin.organization"],
+                });
+                expect(foundUser?.randomField).eq("foo");
+                expect(foundUser?.admin).eq(null);
+            })
+        ));
+
+    it("should return [] when requested nested relations are empty on OneToMany relation", () =>
+        Promise.all(
+            connections.map(async (connection) => {
+                const userRepo = connection.getRepository(User);
+                const testUser = new User();
+                testUser.randomField = "foo";
+                await userRepo.save(testUser);
+                const foundUser = await userRepo.findOne(testUser.id, {
+                    relations: ["membership", "membership.organization"],
+                });
+                expect(foundUser?.randomField).eq("foo");
+                expect(foundUser?.membership).eql([]);
+            })
+        ));
+});