updated tests

Author: wickwirew

Sources/Compiler/Gen/SwiftLanguage.swift

@@ -109,7 +109,7 @@ public struct SwiftLanguage: Language2 {
     ) throws -> DeclSyntax {
         let inputTypeName = inputTypeName(for: query)
         let outputTypeName = outputTypeName(for: query)
-        let queryTypeName = "DatabaseQuery<\(inputTypeName), \(outputTypeName)>"
+        let queryTypeName = "any DatabaseQuery<\(inputTypeName), \(outputTypeName)>"
 
         let query = try VariableDeclSyntax("var \(raw: query.name): \(raw: queryTypeName)") {
             FunctionCallExprSyntax(

Sources/Feather/Queryable.swift

@@ -44,12 +44,12 @@ public struct DatabaseQueryImpl<Input, Output>: DatabaseQuery
     public let execute: @Sendable (Input, borrowing Transaction) throws -> Output
 
     public init(
+        _ transactionKind: TransactionKind,
         database: any Database,
-        tx: TransactionKind,
         execute: @escaping @Sendable (Input, borrowing Transaction) throws -> Output
     ) {
         self.database = database
-        self.transactionKind = tx
+        self.transactionKind = transactionKind
         self.execute = execute
     }
 

Tests/FeatherTests/QueryTests.swift

@@ -13,16 +13,17 @@ import Testing
 struct QueryTests {
     @Test func testQuery() async throws {
         let pool = try createDatabase()
+        let insert = insertQuery(database: pool)
 
         let foo1 = Foo(bar: 1, baz: "bar1")
         let foo2 = Foo(bar: 2, baz: "bar2")
         let foo3 = Foo(bar: 3, baz: "bar3")
 
-        try await insert.execute(with: foo1, in: pool)
-        try await insert.execute(with: foo2, in: pool)
-        try await insert.execute(with: foo3, in: pool)
+        try await insert.execute(with: foo1)
+        try await insert.execute(with: foo2)
+        try await insert.execute(with: foo3)
 
-        let foos = try await selectAllFoo.execute(in: pool)
+        let foos = try await selectAllFooQuery(database: pool).execute()
 
         #expect(foos.count == 3)
     }
@@ -53,22 +54,26 @@ struct QueryTests {
         }
     }
 
-    private var selectAllFoo: FetchManyQuery<(), [Foo]> {
-        return FetchManyQuery<(), [Foo]>(.read) { input, transaction in
-            try Statement(in: transaction) {
+    private func selectAllFooQuery(database: any Database) -> any DatabaseQuery<(), [Foo]> {
+        return DatabaseQueryImpl<(), [Foo]>(.read, database: database) { input, transaction in
+            let statement = try Statement(in: transaction) {
                 "SELECT * FROM foo;"
             }
+            
+            return try statement.fetchAll(of: Foo.self)
         }
     }
 
-    private var insert: VoidQuery<Foo> {
-        return VoidQuery<Foo>(.write) { input, transaction in
-            try Statement(in: transaction) {
+    private func insertQuery(database: any Database) -> any DatabaseQuery<Foo, ()> {
+        return DatabaseQueryImpl<Foo, ()>(.write, database: database) { input, transaction in
+            let statement = try Statement(in: transaction) {
                 "INSERT INTO foo (bar, baz) VALUES (?, ?)"
             } bind: { statement in
                 try statement.bind(value: input.bar, to: 1)
                 try statement.bind(value: input.baz, to: 2)
             }
+            
+            _ = try statement.step()
         }
     }