fix(core): fix bulk-inserting entities with nullable embedded arrays

packages/knex/src/AbstractSqlDriver.ts

@@ -481,7 +481,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
       let value = row[prop.name];
 
       if (prop.kind === ReferenceKind.EMBEDDED && prop.object) {
-        if (prop.array) {
+        if (prop.array && value) {
           for (let i = 0; i < (value as Dictionary[]).length; i++) {
             const item = (value as Dictionary[])[i];
             value[i] = this.mapDataToFieldNames(item, false, prop.embeddedProps, options.convertCustomTypes);

tests/features/embeddables/__snapshots__/embedded-entities.postgres.test.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`embedded entities in postgresql schema: embeddables 1 1`] = `
-"create table "user" ("id" serial primary key, "email" varchar(255) not null, "address1_street" varchar(255) null, "address1_number" double precision not null, "address1_rank" real null, "address1_postal_code" varchar(255) null, "address1_city" varchar(255) null, "address1_country" varchar(255) null, "addr_street" varchar(255) null, "addr_postal_code" varchar(255) null, "addr_city" varchar(255) null, "addr_country" varchar(255) null, "street" varchar(255) null, "number" double precision not null, "rank" real null, "postal_code" varchar(255) null, "city" varchar(255) null, "country" varchar(255) null, "address4" jsonb not null, "addresses" jsonb not null, "after" int null);
+"create table "user" ("id" serial primary key, "email" varchar(255) not null, "address1_street" varchar(255) null, "address1_number" double precision not null, "address1_rank" real null, "address1_postal_code" varchar(255) null, "address1_city" varchar(255) null, "address1_country" varchar(255) null, "addr_street" varchar(255) null, "addr_postal_code" varchar(255) null, "addr_city" varchar(255) null, "addr_country" varchar(255) null, "street" varchar(255) null, "number" double precision not null, "rank" real null, "postal_code" varchar(255) null, "city" varchar(255) null, "country" varchar(255) null, "address4" jsonb not null, "addresses" jsonb null, "after" int null);
 alter table "user" add constraint "user_email_unique" unique ("email");
 
 create table "foo" ("id" serial primary key, "user_id" int not null);

tests/features/embeddables/embedded-entities.postgres.test.ts

@@ -102,8 +102,8 @@ class User {
   @Embedded({ object: true })
   address4: Address1 = new Address1();
 
-  @Embedded(() => Address1, { array: true })
-  addresses: Address1[] = [];
+  @Embedded(() => Address1, { array: true, nullable: true })
+  addresses: Address1[] | null = [];
 
   @Property({ nullable: true })
   after?: number; // property after embeddables to verify order props in resulting schema
@@ -188,20 +188,20 @@ describe('embedded entities in postgresql', () => {
 
     orm.em.assign(user, { addresses: [address1] });
     expect(user.addresses).toEqual([address1]);
-    expect(user.addresses[0]).toBeInstanceOf(Address1);
+    expect(user.addresses![0]).toBeInstanceOf(Address1);
 
     orm.em.assign(user, { addresses: [address1] });
     expect(user.addresses).toEqual([address1]);
-    expect(user.addresses[0]).toBeInstanceOf(Address1);
+    expect(user.addresses![0]).toBeInstanceOf(Address1);
 
     orm.em.assign(user, { addresses: [address2] });
     expect(user.addresses).toEqual([address2]);
-    expect(user.addresses[0]).toBeInstanceOf(Address1);
+    expect(user.addresses![0]).toBeInstanceOf(Address1);
 
     orm.em.assign(user, { addresses: address1 }); // push to existing array
     expect(user.addresses).toEqual([address2, address1]);
-    expect(user.addresses[0]).toBeInstanceOf(Address1);
-    expect(user.addresses[1]).toBeInstanceOf(Address1);
+    expect(user.addresses![0]).toBeInstanceOf(Address1);
+    expect(user.addresses![1]).toBeInstanceOf(Address1);
     expect(user.addresses).toHaveLength(2);
   });
 
@@ -491,7 +491,7 @@ describe('embedded entities in postgresql', () => {
   });
 
   test('array operators', async () => {
-    await createUser();
+    createUser();
     const qb = orm.em.createQueryBuilder(User).select('*').where({
       addresses: { $contains: [{ street: 'Downing street 13A' }] },
     });
@@ -515,4 +515,13 @@ describe('embedded entities in postgresql', () => {
     ]);
   });
 
+  test('nullable array property', async () => {
+    const user1 = createUser();
+    const user2 = createUser();
+    user1.addresses = null;
+    await orm.em.flush();
+    expect(user1.addresses).toBeNull();
+    expect(user2.addresses).toHaveLength(2);
+  });
+
 });