Test

Author: stephencelis

Sources/StructuredQueriesCore/QueryFragment.swift

@@ -64,15 +64,20 @@ public struct QueryFragment: Hashable, Sendable {
   public func prepare(
     _ template: (_ offset: Int) -> String
   ) -> (sql: String, bindings: [QueryBinding]) {
-    segments.enumerated().reduce(into: (sql: "", bindings: [QueryBinding]())) {
-      switch $1.element {
-      case .sql(let sql):
-        $0.sql.append(sql)
+    var sql = ""
+    var bindings: [QueryBinding] = []
+    var offset = 1
+    for segment in segments {
+      switch segment {
+      case .sql(let fragment):
+        sql.append(fragment)
       case .binding(let binding):
-        $0.sql.append(template($0.bindings.count + 1))
-        $0.bindings.append(binding)
+        defer { offset += 1 }
+        sql.append(template(offset))
+        bindings.append(binding)
       }
     }
+    return (sql, bindings)
   }
 }
 

Tests/StructuredQueriesTests/QueryFragmentTests.swift

@@ -46,5 +46,27 @@ extension SnapshotTests {
         """
       }
     }
+    @Test func prepare() {
+      let query = #sql(
+        """
+        SELECT \(Reminder.id) FROM \(Reminder.self)
+        WHERE \(Reminder.id) > \(1) AND \(Reminder.title) COLLATE NOCASE LIKE \(bind: "%get%")
+        """
+      )
+      .query
+
+      #expect(
+        query.prepare { "$\($0)" } == (
+          """
+          SELECT "reminders"."id" FROM "reminders"
+          WHERE "reminders"."id" > $1 AND "reminders"."title" COLLATE NOCASE LIKE $2
+          """,
+          [
+            .int(1),
+            .text("%get%")
+          ]
+        )
+      )
+    }
   }
 }