@DatabaseFunction: Custom SQLite Functions

Package.swift

@@ -21,12 +21,16 @@ let package = Package(
       targets: ["StructuredQueriesCore"]
     ),
     .library(
-      name: "StructuredQueriesTestSupport",
-      targets: ["StructuredQueriesTestSupport"]
+      name: "StructuredQueriesSQLite",
+      targets: ["StructuredQueriesSQLite"]
     ),
     .library(
-      name: "_StructuredQueriesSQLite",
-      targets: ["StructuredQueriesSQLite"]
+      name: "StructuredQueriesSQLiteCore",
+      targets: ["StructuredQueriesSQLiteCore"]
+    ),
+    .library(
+      name: "StructuredQueriesTestSupport",
+      targets: ["StructuredQueriesTestSupport"]
     ),
   ],
   traits: [
@@ -46,6 +50,13 @@ let package = Package(
     .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"602.0.0"),
   ],
   targets: [
+    .target(
+      name: "StructuredQueries",
+      dependencies: [
+        "StructuredQueriesCore",
+        "StructuredQueriesMacros",
+      ]
+    ),
     .target(
       name: "StructuredQueriesCore",
       dependencies: [
@@ -58,13 +69,6 @@ let package = Package(
       ],
       exclude: ["Symbolic Links/README.md"]
     ),
-    .target(
-      name: "StructuredQueries",
-      dependencies: [
-        "StructuredQueriesCore",
-        "StructuredQueriesMacros",
-      ]
-    ),
     .macro(
       name: "StructuredQueriesMacros",
       dependencies: [
@@ -73,12 +77,29 @@ let package = Package(
       ],
       exclude: ["Symbolic Links/README.md"]
     ),
+
     .target(
       name: "StructuredQueriesSQLite",
       dependencies: [
-        "StructuredQueries"
+        "StructuredQueriesSQLiteCore",
+        "StructuredQueriesSQLiteMacros",
+      ]
+    ),
+    .target(
+      name: "StructuredQueriesSQLiteCore",
+      dependencies: [
+        "StructuredQueriesCore",
+        .product(name: "IssueReporting", package: "xctest-dynamic-overlay")
+      ]
+    ),
+    .macro(
+      name: "StructuredQueriesSQLiteMacros",
+      dependencies: [
+        .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+        .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
       ]
     ),
+
     .target(
       name: "StructuredQueriesTestSupport",
       dependencies: [
@@ -90,8 +111,8 @@ let package = Package(
     .testTarget(
       name: "StructuredQueriesMacrosTests",
       dependencies: [
-        "StructuredQueries",
         "StructuredQueriesMacros",
+        "StructuredQueriesSQLiteMacros",
         .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
         .product(name: "MacroTesting", package: "swift-macro-testing"),
       ]
@@ -102,11 +123,19 @@ let package = Package(
         "StructuredQueries",
         "StructuredQueriesSQLite",
         "StructuredQueriesTestSupport",
+        "_StructuredQueriesSQLite",
         .product(name: "CustomDump", package: "swift-custom-dump"),
         .product(name: "Dependencies", package: "swift-dependencies"),
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
       ]
     ),
+
+    .target(
+      name: "_StructuredQueriesSQLite",
+      dependencies: [
+        "StructuredQueriesSQLite"
+      ]
+    ),
   ],
   swiftLanguageModes: [.v6]
 )
@@ -128,14 +157,14 @@ for index in package.targets.indices {
 #if !canImport(Darwin)
   package.targets.append(
     .systemLibrary(
-      name: "StructuredQueriesSQLite3",
+      name: "_StructuredQueriesSQLite3",
       providers: [.apt(["libsqlite3-dev"])]
     )
   )
 
   for index in package.targets.indices {
-    if package.targets[index].name == "StructuredQueriesSQLite" {
-      package.targets[index].dependencies.append("StructuredQueriesSQLite3")
+    if package.targets[index].name == "_StructuredQueriesSQLite" {
+      package.targets[index].dependencies.append("_StructuredQueriesSQLite3")
     }
   }
 #endif

Package@swift-6.0.swift

@@ -25,9 +25,17 @@ let package = Package(
       targets: ["StructuredQueriesTestSupport"]
     ),
     .library(
-      name: "_StructuredQueriesSQLite",
+      name: "StructuredQueriesSQLite",
       targets: ["StructuredQueriesSQLite"]
     ),
+    .library(
+      name: "StructuredQueriesSQLiteCore",
+      targets: ["StructuredQueriesSQLiteCore"]
+    ),
+    .library(
+      name: "StructuredQueriesTestSupport",
+      targets: ["StructuredQueriesTestSupport"]
+    ),
   ],
   dependencies: [
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
@@ -38,20 +46,20 @@ let package = Package(
     .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"602.0.0"),
   ],
   targets: [
-    .target(
-      name: "StructuredQueriesCore",
-      dependencies: [
-        .product(name: "IssueReporting", package: "xctest-dynamic-overlay")
-      ],
-      exclude: ["Symbolic Links/README.md"]
-    ),
     .target(
       name: "StructuredQueries",
       dependencies: [
         "StructuredQueriesCore",
         "StructuredQueriesMacros",
       ]
     ),
+    .target(
+      name: "StructuredQueriesCore",
+      dependencies: [
+        .product(name: "IssueReporting", package: "xctest-dynamic-overlay")
+      ],
+      exclude: ["Symbolic Links/README.md"]
+    ),
     .macro(
       name: "StructuredQueriesMacros",
       dependencies: [
@@ -60,12 +68,29 @@ let package = Package(
       ],
       exclude: ["Symbolic Links/README.md"]
     ),
+
     .target(
       name: "StructuredQueriesSQLite",
       dependencies: [
-        "StructuredQueries"
+        "StructuredQueriesSQLiteCore",
+        "StructuredQueriesSQLiteMacros",
       ]
     ),
+    .target(
+      name: "StructuredQueriesSQLiteCore",
+      dependencies: [
+        "StructuredQueriesCore",
+        .product(name: "IssueReporting", package: "xctest-dynamic-overlay")
+      ]
+    ),
+    .macro(
+      name: "StructuredQueriesSQLiteMacros",
+      dependencies: [
+        .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+        .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+      ],
+    ),
+
     .target(
       name: "StructuredQueriesTestSupport",
       dependencies: [
@@ -74,11 +99,12 @@ let package = Package(
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
       ]
     ),
+
     .testTarget(
       name: "StructuredQueriesMacrosTests",
       dependencies: [
-        "StructuredQueries",
         "StructuredQueriesMacros",
+        "StructuredQueriesSQLiteMacros",
         .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
         .product(name: "MacroTesting", package: "swift-macro-testing"),
       ]
@@ -87,13 +113,20 @@ let package = Package(
       name: "StructuredQueriesTests",
       dependencies: [
         "StructuredQueries",
-        "StructuredQueriesSQLite",
         "StructuredQueriesTestSupport",
+        "_StructuredQueriesSQLite",
         .product(name: "CustomDump", package: "swift-custom-dump"),
         .product(name: "Dependencies", package: "swift-dependencies"),
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
       ]
     ),
+
+    .target(
+      name: "_StructuredQueriesSQLite",
+      dependencies: [
+        "StructuredQueriesSQLite"
+      ]
+    ),
   ],
   swiftLanguageModes: [.v6]
 )
@@ -115,14 +148,14 @@ for index in package.targets.indices {
 #if !os(Darwin)
   package.targets.append(
     .systemLibrary(
-      name: "StructuredQueriesSQLite3",
+      name: "_StructuredQueriesSQLite3",
       providers: [.apt(["libsqlite3-dev"])]
     )
   )
 
   for index in package.targets.indices {
-    if package.targets[index].name == "StructuredQueriesSQLite" {
-      package.targets[index].dependencies.append("StructuredQueriesSQLite3")
+    if package.targets[index].name == "_StructuredQueriesSQLite" {
+      package.targets[index].dependencies.append("_StructuredQueriesSQLite3")
     }
   }
 #endif

Sources/StructuredQueriesCore/Optional.swift

@@ -27,6 +27,10 @@ extension Optional: QueryBindable where Wrapped: QueryBindable {
   public var queryBinding: QueryBinding {
     self?.queryBinding ?? .null
   }
+
+  public init?(queryBinding: QueryBinding) {
+    self = Wrapped(queryBinding: queryBinding)
+  }
 }
 
 extension Optional: QueryDecodable where Wrapped: QueryDecodable {

Sources/StructuredQueriesCore/QueryBindable.swift

@@ -9,14 +9,25 @@ public protocol QueryBindable: QueryRepresentable, QueryExpression where QueryVa
 
   /// A value that can be bound to a parameter of a SQL statement.
   var queryBinding: QueryBinding { get }
+
+  init?(queryBinding: QueryBinding)
 }
 
 extension QueryBindable {
   public var queryFragment: QueryFragment { "\(queryBinding)" }
+
+  public init?(queryBinding: QueryBinding) {
+    guard let queryValue = QueryValue(queryBinding: queryBinding) else { return nil }
+    self.init(queryBinding: queryValue.queryBinding)
+  }
 }
 
 extension [UInt8]: QueryBindable, QueryExpression {
   public var queryBinding: QueryBinding { .blob(self) }
+  public init?(queryBinding: QueryBinding) {
+    guard case .blob(let value) = queryBinding else { return nil }
+    self = value
+  }
 }
 
 extension Bool: QueryBindable {
@@ -25,10 +36,18 @@ extension Bool: QueryBindable {
 
 extension Double: QueryBindable {
   public var queryBinding: QueryBinding { .double(self) }
+  public init?(queryBinding: QueryBinding) {
+    guard case .double(let value) = queryBinding else { return nil }
+    self = value
+  }
 }
 
 extension Date: QueryBindable {
   public var queryBinding: QueryBinding { .date(self) }
+  public init?(queryBinding: QueryBinding) {
+    guard case .date(let value) = queryBinding else { return nil }
+    self = value
+  }
 }
 
 extension Float: QueryBindable {
@@ -53,10 +72,18 @@ extension Int32: QueryBindable {
 
 extension Int64: QueryBindable {
   public var queryBinding: QueryBinding { .int(self) }
+  public init?(queryBinding: QueryBinding) {
+    guard case .int(let value) = queryBinding else { return nil }
+    self = value
+  }
 }
 
 extension String: QueryBindable {
   public var queryBinding: QueryBinding { .text(self) }
+  public init?(queryBinding: QueryBinding) {
+    guard case let .text(value) = queryBinding else { return nil }
+    self = value
+  }
 }
 
 extension UInt8: QueryBindable {
@@ -83,6 +110,10 @@ extension UInt64: QueryBindable {
 
 extension UUID: QueryBindable {
   public var queryBinding: QueryBinding { .uuid(self) }
+  public init?(queryBinding: QueryBinding) {
+    guard case .uuid(let value) = queryBinding else { return nil }
+    self = value
+  }
 }
 
 extension DefaultStringInterpolation {

Sources/StructuredQueriesSQLite/Exports.swift

@@ -0,0 +1,2 @@
+@_exported import StructuredQueries
+@_exported import StructuredQueriesSQLiteCore

Sources/StructuredQueriesSQLite/Macros.swift

@@ -0,0 +1,11 @@
+import StructuredQueriesSQLiteCore
+
+@attached(peer, names: overloaded, prefixed(`$`))
+public macro DatabaseFunction(
+  _ name: String = "",
+  isDeterministic: Bool = false
+) =
+  #externalMacro(
+    module: "StructuredQueriesSQLiteMacros",
+    type: "DatabaseFunctionMacro"
+  )

Sources/StructuredQueriesSQLiteCore/DatabaseFunction.swift

@@ -0,0 +1,6 @@
+public protocol DatabaseFunction {
+  var name: String { get }
+  var argumentCount: Int? { get }
+  var isDeterministic: Bool { get }
+  func invoke(_ arguments: [QueryBinding]) -> QueryBinding
+}

Sources/StructuredQueriesSQLiteCore/Exports.swift

@@ -0,0 +1 @@
+@_exported import StructuredQueriesCore