Fixed ios build

Author: wickwirew

Sources/Compiler/Gen/SwiftLanguage.swift

@@ -283,7 +283,7 @@ public struct SwiftLanguage: Language {
     }
 
     private func queriesLive(name: String, queries: [GeneratedQuery]) {
-        writer.write(line: "static func live(connection: Connection, adapters: DB.Adapters) -> {")
+        writer.write(line: "static func live(connection: Connection, adapters: DB.Adapters) -> ", name," {")
         writer.indent()
 
         writer.write(line: "return ", name, "(")
@@ -336,15 +336,19 @@ public struct SwiftLanguage: Language {
                 }
             }
         }
-        writer.write(line: ")")
+        writer.write(line: ") -> ", name," {")
 
         writer.indent()
 
         writer.write(line: name, "(")
         writer.indent()
 
-        for query in queries {
-            writer.write(line: "self.", query.variableName, " = ", query.variableName)
+        for (position, query) in queries.positional() {
+            writer.write(line: query.variableName, ": ", query.variableName)
+            
+            if !position.isLast {
+                writer.write(",")
+            }
         }
 
         writer.unindent()
@@ -400,8 +404,20 @@ public struct SwiftLanguage: Language {
                 writer.write(line: "return try statement.fetchAll(")
             }
 
-            if query.output.requiresAdapters {
-                writer.write("adapters: adapters")
+            switch query.output {
+            case .encoded(let storage, _, let adapter),
+                .optional(.encoded(let storage, _, let adapter)),
+                .array(.encoded(let storage, _, let adapter)):
+                writer.write("adapter: adapters.", adapter.name, ", storage: ", typeName(for: storage), ".self")
+                break
+            case .model(let model),
+                .optional(.model(let model)),
+                .array(.model(let model)):
+                if model.requiresAdapters {
+                    writer.write("adapters: adapters")
+                }
+            default:
+                break
             }
 
             writer.write(")")

Sources/Otter/Cursor.swift

@@ -13,6 +13,19 @@ public struct Cursor<Element>: ~Copyable {
     public init(of statement: consuming Statement) {
         self.statement = statement
     }
+    
+    public mutating func next<Adapter: DatabaseValueAdapter, Storage: DatabasePrimitive>(
+        adapter: Adapter,
+        storage: Storage.Type
+    ) throws(OtterError) -> Element? where Adapter.Value == Element {
+        switch try statement.step() {
+        case .row:
+            let row = Row(sqliteStatement: statement.raw)
+            return try row.value(at: 0, using: adapter, storage: storage)
+        case .done:
+            return nil
+        }
+    }
 }
 
 extension Cursor where Element: RowDecodable {
@@ -88,6 +101,25 @@ public struct Row: ~Copyable {
         return try Value(row: self, optionallyAt: column)
     }
 
+    /// Decodes the struct embeeded at the start index as the `Value` type.
+    @inlinable public func embedded<Value: RowDecodableWithAdapters>(
+        at column: Int32,
+        as _: Value.Type = Value.self,
+        adapters: Value.Adapters
+    ) throws(OtterError) -> Value {
+        return try Value(row: self, startingAt: column, adapters: adapters)
+    }
+    
+    /// Decodes the struct embeeded at the start index as the `Value` type
+    /// if it exists
+    @inlinable public func optionallyEmbedded<Value: RowDecodableWithAdapters>(
+        at column: Int32,
+        as _: Value.Type = Value.self,
+        adapters: Value.Adapters
+    ) throws(OtterError) -> Value? {
+        return try Value(row: self, optionallyAt: column, adapters: adapters)
+    }
+    
     /// Whether or not the column has a non null table at the column index
     @inlinable public func hasValue(at column: Int32) -> Bool {
         sqlite3_column_type(sqliteStatement, column) != SQLITE_NULL

Sources/Otter/Database.swift

@@ -98,6 +98,7 @@ extension Adapters {
     public var uint: UIntDatabaseValueAdapter { UIntDatabaseValueAdapter() }
     public var float: FloatDatabaseValueAdapter { FloatDatabaseValueAdapter() }
     @available(macOS 11.0, *)
+    @available(iOS 14.0, *)
     public var float16: Float16DatabaseValueAdapter { Float16DatabaseValueAdapter() }
     public var uuid: UUIDDatabaseValueAdapter { UUIDDatabaseValueAdapter() }
     public var decimal: DecimalDatabaseValueAdapter { DecimalDatabaseValueAdapter() }

Sources/Otter/Statement.swift

@@ -188,3 +188,53 @@ extension Statement {
         return try cursor.next(adapters: adapters)
     }
 }
+
+// MARK: - Fetch with specific adapter
+
+extension Statement {
+    /// Fetches all rows returned by the statement
+    public consuming func fetchAll<Adapter: DatabaseValueAdapter, Storage: DatabasePrimitive>(
+        adapter: Adapter,
+        storage: Storage.Type
+    ) throws(OtterError) -> [Adapter.Value] {
+        return try fetchAll(of: Adapter.Value.self, adapter: adapter, storage: storage)
+    }
+    
+    /// Fetches all rows returned by the statement
+    public consuming func fetchAll<Adapter: DatabaseValueAdapter, Storage: DatabasePrimitive>(
+        of _: Adapter.Value.Type,
+        adapter: Adapter,
+        storage: Storage.Type
+    ) throws(OtterError) -> [Adapter.Value] {
+        var cursor = Cursor<Adapter.Value>(of: self)
+        var result: [Adapter.Value] = []
+        
+        while let element = try cursor.next(adapter: adapter, storage: storage) {
+            result.append(element)
+        }
+        
+        return result
+    }
+  
+    /// Fetches a single row returned by the statement
+    @_disfavoredOverload
+    public consuming func fetchOne<Adapter: DatabaseValueAdapter, Storage: DatabasePrimitive>(
+        adapter: Adapter,
+        storage: Storage.Type
+    ) throws(OtterError) -> Adapter.Value {
+        guard let row = try fetchOne(adapter: adapter, storage: storage) else {
+            throw OtterError.queryReturnedNoValue
+        }
+        
+        return row
+    }
+    
+    /// Fetches a single row returned by the statement
+    public consuming func fetchOne<Adapter: DatabaseValueAdapter, Storage: DatabasePrimitive>(
+        adapter: Adapter,
+        storage: Storage.Type
+    ) throws(OtterError) -> Adapter.Value? {
+        var cursor = Cursor<Adapter.Value>(of: self)
+        return try cursor.next(adapter: adapter, storage: storage)
+    }
+}

Tests/CompilerTests/Gen/Swift.output

@@ -205,20 +205,20 @@ struct QueriesQueries {
         selectUserWithManyInputs: any SelectUserWithManyInputsQuery = Queries.Just(),
         selectWithInterest: any SelectWithInterestQuery = Queries.Just(),
         selectWithOptionalInterest: any SelectWithOptionalInterestQuery = Queries.Just()
-    )
+    ) -> QueriesQueries {
         QueriesQueries(
-            self.insertUser = insertUser
-            self.selectUsers = selectUsers
-            self.selectUserById = selectUserById
-            self.selectUserByIds = selectUserByIds
-            self.selectUserByName = selectUserByName
-            self.selectUserWithManyInputs = selectUserWithManyInputs
-            self.selectWithInterest = selectWithInterest
-            self.selectWithOptionalInterest = selectWithOptionalInterest
+            insertUser: insertUser,
+            selectUsers: selectUsers,
+            selectUserById: selectUserById,
+            selectUserByIds: selectUserByIds,
+            selectUserByName: selectUserByName,
+            selectUserWithManyInputs: selectUserWithManyInputs,
+            selectWithInterest: selectWithInterest,
+            selectWithOptionalInterest: selectWithOptionalInterest
         )
     }
 
-    static func live(connection: Connection, adapters: DB.Adapters) -> {
+    static func live(connection: Connection, adapters: DB.Adapters) -> QueriesQueries {
         return QueriesQueries(
             insertUser: DatabaseQuery<InsertUserInput, Int>(
                 .write,