Fix handling of inserts with both unless conflict and a with block (#1291)

Fixes #788, and should also fix #679

Author: jaclarke

integration-tests/lts/dbschema/default.esdl

@@ -50,6 +50,12 @@ module default {
     multi link villains := .<nemesis[IS Villain];
   }
 
+  type Director {
+    required property name -> str {
+      constraint exclusive;
+    };
+  }
+
   scalar type year extending int16 {
     constraint min_value(1878);
   }
@@ -67,6 +73,7 @@ module default {
     link profile -> Profile {
       constraint exclusive;
     }
+    multi link directors -> Director;
     constraint exclusive on ((.title, .release_year));
   }
 

integration-tests/lts/dbschema/migrations/00031-m1hbukk.edgeql

@@ -0,0 +1,12 @@
+CREATE MIGRATION m1hbukk7q7j6plwsmgronpimcotrc3uq2i457xronjbre6dt6ie23q
+    ONTO m14ccrzhfjulgoy3mdub7s7cfw5neuoxawxlwos2efvwv2si66mbka
+{
+  CREATE TYPE default::Director {
+      CREATE REQUIRED PROPERTY name: std::str {
+          CREATE CONSTRAINT std::exclusive;
+      };
+  };
+  ALTER TYPE default::Movie {
+      CREATE MULTI LINK directors: default::Director;
+  };
+};

integration-tests/lts/gel.toml

@@ -1,2 +1,2 @@
 [edgedb]
-server-version = "3"
+server-version = "6"

integration-tests/lts/insert.test.ts

@@ -165,6 +165,51 @@ describe("insert", () => {
     assert.equal(result, 42);
   });
 
+  test("with block on insert with unless conflict", async () => {
+    // test that the 'bulk inserts with conflict handling' query we show in
+    // the docs works in the query builder
+    // https://docs.geldata.com/reference/using/js/querybuilder#handling-conflicts-in-bulk-inserts
+    const query = e.params(
+      {
+        movies: e.array(
+          e.tuple({
+            title: e.str,
+            directors: e.array(e.str),
+          }),
+        ),
+      },
+      ($) => {
+        const directors = e.for(
+          e.op("distinct", e.array_unpack(e.array_unpack($.movies).directors)),
+          (director_name) =>
+            e
+              .insert(e.Director, { name: director_name })
+              .unlessConflict((d) => ({ on: d.name, else: d })),
+        );
+
+        return e.with(
+          [directors],
+          e.for(e.array_unpack($.movies), (movie) =>
+            e
+              .insert(e.Movie, {
+                title: movie.title,
+                directors: e.select(directors, (director) => ({
+                  filter: e.op(
+                    director.name,
+                    "in",
+                    e.array_unpack(movie.directors),
+                  ),
+                })),
+              })
+              .unlessConflict((m) => ({ on: m.title, else: m })),
+          ),
+        );
+      },
+    );
+
+    await query.run(client, { movies: [] });
+  });
+
   test("nested insert", async () => {
     const q1 = e.insert(e.Villain, {
       name: e.str("villain"),

integration-tests/lts/interfaces.test.ts

@@ -27,8 +27,12 @@ export interface test_Person extends BaseObject {
   height?: string | null;
   isAdult?: boolean | null;
 }
+export interface test_Director extends BaseObject {
+  name: string;
+}
 export interface test_Movie extends BaseObject {
   characters: test_Person[];
+  directors: test_Director[];
   profile?: test_Profile | null;
   genre?: Genre | null;
   rating?: number | null;

packages/generate/src/syntax/toEdgeQL.ts

@@ -606,7 +606,10 @@ function walkExprTree(
         );
       }
 
-      walkExprTree(expr.__expr__, parentScope, ctx);
+      childExprs.push(
+        ...walkExprTree(expr.__expr__, parentScope, ctx),
+        ...insertChildExprs,
+      );
       ctx.seen
         .get(expr.__expr__ as $expr_Insert)!
         .childExprs.push(...insertChildExprs);