Fixed swift gen not getting array from input

Author: wickwirew

Sources/Compiler/Gen/Language.swift

@@ -108,7 +108,7 @@ extension Language {
                 return text.description
             case let .rowParam(param):
                 let qs = interpolatedQuestionMarks(
-                    for: statement.parameters.count > 1 ? param.name : "input"
+                    for: statement.parameters.count > 1 ? "input.\(param.name)" : "input"
                 )
                 return "(\(qs))"
             }
@@ -173,8 +173,8 @@ extension Language {
                 )
             }
         case .array(let values):
-            result.append(.arrayStart(name: name ?? "input", elementName: "element"))
-            result.append(contentsOf: bindings(for: values, index: &index, owner: "element"))
+            result.append(.arrayStart(name: name ?? "input", owner: owner, elementName: "element"))
+            result.append(contentsOf: bindings(for: values, index: &index, name: "element"))
             result.append(.arrayEnd)
         case .encoded(let storage, _, let adapter):
             result.append(
@@ -448,7 +448,7 @@ public struct GeneratedQuery {
             isOptional: Bool = false,
             adapter: (adapter: AdapterReference, storage: String)? = nil
         )
-        case arrayStart(name: String, elementName: String)
+        case arrayStart(name: String, owner: String?, elementName: String)
         case arrayEnd
     }
 }

Sources/Compiler/Gen/SwiftLanguage.swift

@@ -775,8 +775,12 @@ public struct SwiftLanguage: Language {
             }
 
             writer.write(")")
-        case let .arrayStart(name, elementName):
-            writer.write(line: "for ", elementName, " in ", name, " {")
+        case let .arrayStart(name, owner, elementName):
+            writer.write(line: "for ", elementName, " in ")
+            if let owner {
+                writer.write(owner, ".")
+            }
+            writer.write(name, " {")
             writer.indent()
         case .arrayEnd:
             writer.unindent()

Tests/CompilerTests/Compiler/CompileInsert.sql

@@ -167,3 +167,24 @@ WHERE excluded.name = 'bob';
 -- CHECK:   TABLES
 -- CHECK:     user
 INSERT INTO user (name) VALUES ('joe') RETURNING id;
+
+CREATE TABLE foo (
+    bar INTEGER,
+    baz INTEGER,
+    PRIMARY KEY (bar, baz)
+);
+
+-- CHECK: SIGNATURE
+-- CHECK:   PARAMETERS
+-- CHECK:     PARAMETER
+-- CHECK:       TYPE INTEGER?
+-- CHECK:       INDEX 1
+-- CHECK:       NAME bar
+-- CHECK:     PARAMETER
+-- CHECK:       TYPE INTEGER?
+-- CHECK:       INDEX 2
+-- CHECK:       NAME baz
+-- CHECK:   TABLES
+-- CHECK:     foo
+INSERT INTO foo VALUES (?, ?)
+ON CONFLICT (bar, baz) DO NOTHING;

Tests/CompilerTests/CompilerTests.swift

@@ -19,7 +19,7 @@ class CompilerTests: XCTestCase {
     }
 
     func testInsert() throws {
-        try checkQueries(compile: "CompileInsert")
+        try checkQueries(compile: "CompileInsert", dump: true)
     }
 
     func testUpdate() throws {

Tests/CompilerTests/Gen/Queries.sql

@@ -25,3 +25,9 @@ INNER JOIN bar ON foo.intPk = bar.intPk;
 
 selectWithManyInputs:
 SELECT * FROM foo WHERE intPk = ? AND textNotNull = ?;
+
+inputIsArray:
+DELETE FROM bar WHERE intPk IN ?;
+
+inputContainsArray:
+DELETE FROM bar WHERE intPk IN ? AND barNotNullText = ?;

Tests/CompilerTests/Gen/Swift.output

@@ -214,6 +214,11 @@ struct SelectWithManyInputsInput: Hashable, Sendable {
     let textNotNull: String
 }
 
+struct InputContainsArrayInput: Hashable, Sendable {
+    let intPks: [Int]
+    let barNotNullText: String
+}
+
 struct QueriesQueries: ConnectionWrapper, Sendable {
     let connection: any Connection
     var insertFooReturningFoo: any InsertFooReturningFooQuery
@@ -223,6 +228,8 @@ struct QueriesQueries: ConnectionWrapper, Sendable {
     var hasEmbeddedFoo: any HasEmbeddedFooQuery
     var bothColumnsShouldNotBeNullable: any BothColumnsShouldNotBeNullableQuery
     var selectWithManyInputs: any SelectWithManyInputsQuery
+    var inputIsArray: any InputIsArrayQuery
+    var inputContainsArray: any InputContainsArrayQuery
 
     static func noop(
         insertFooReturningFoo: any InsertFooReturningFooQuery = Queries.Fail(),
@@ -231,7 +238,9 @@ struct QueriesQueries: ConnectionWrapper, Sendable {
         selectSingleFoo: any SelectSingleFooQuery = Queries.Just(),
         hasEmbeddedFoo: any HasEmbeddedFooQuery = Queries.Just(),
         bothColumnsShouldNotBeNullable: any BothColumnsShouldNotBeNullableQuery = Queries.Just(),
-        selectWithManyInputs: any SelectWithManyInputsQuery = Queries.Just()
+        selectWithManyInputs: any SelectWithManyInputsQuery = Queries.Just(),
+        inputIsArray: any InputIsArrayQuery = Queries.Just(),
+        inputContainsArray: any InputContainsArrayQuery = Queries.Just()
     ) -> QueriesQueries {
         QueriesQueries(
             connection: NoopConnection(),
@@ -241,7 +250,9 @@ struct QueriesQueries: ConnectionWrapper, Sendable {
             selectSingleFoo: selectSingleFoo,
             hasEmbeddedFoo: hasEmbeddedFoo,
             bothColumnsShouldNotBeNullable: bothColumnsShouldNotBeNullable,
-            selectWithManyInputs: selectWithManyInputs
+            selectWithManyInputs: selectWithManyInputs,
+            inputIsArray: inputIsArray,
+            inputContainsArray: inputContainsArray
         )
     }
 
@@ -358,6 +369,39 @@ struct QueriesQueries: ConnectionWrapper, Sendable {
                 try statement.bind(value: input.intPk, to: 1)
                 try statement.bind(value: input.textNotNull, to: 2)
                 return try statement.fetchOne(adapters: adapters)
+            },
+            inputIsArray: DatabaseQuery<[Int], ()>(
+                .write,
+                in: connection,
+                watchingTables: ["bar"]
+            ) { input, tx in
+                let statement = try Otter.Statement(
+                    """
+                    DELETE FROM bar WHERE intPk IN (\(input.sqlQuestionMarks))
+                    """,
+                    transaction: tx
+                )
+                for element in input {
+                    try statement.bind(value: element, to: 1)
+                }
+                _ = try statement.step()
+            },
+            inputContainsArray: DatabaseQuery<InputContainsArrayInput, ()>(
+                .write,
+                in: connection,
+                watchingTables: ["bar"]
+            ) { input, tx in
+                let statement = try Otter.Statement(
+                    """
+                    DELETE FROM bar WHERE intPk IN (\(input.intPks.sqlQuestionMarks))AND barNotNullText = ?
+                    """,
+                    transaction: tx
+                )
+                for element in input.intPks {
+                    try statement.bind(value: element, to: 1)
+                }
+                try statement.bind(value: input.barNotNullText, to: 2)
+                _ = try statement.step()
             }
         )
     }
@@ -464,3 +508,19 @@ extension Query where Input == SelectWithManyInputsInput {
         observe(SelectWithManyInputsInput(intPk: intPk, textNotNull: textNotNull))
     }
 }
+
+typealias InputIsArrayQuery = Query<[Int], ()>
+typealias InputContainsArrayQuery = Query<InputContainsArrayInput, ()>
+extension Query where Input == InputContainsArrayInput {
+    func execute(intPks: [Int], barNotNullText: String) async throws -> Output {
+        try await execute(InputContainsArrayInput(intPks: intPks, barNotNullText: barNotNullText))
+    }
+    
+    func execute(intPks: [Int], barNotNullText: String, tx: borrowing Transaction) throws -> Output {
+        try execute(InputContainsArrayInput(intPks: intPks, barNotNullText: barNotNullText), tx: tx)
+    }
+    
+    func observe(intPks: [Int], barNotNullText: String) -> QueryStream<Output> {
+        observe(InputContainsArrayInput(intPks: intPks, barNotNullText: barNotNullText))
+    }
+}