Add a couple of interpolations for SQLQueryString that take Fluent keypaths

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Ensure curl is available
         run: apt-get update -y && apt-get install -y curl
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Run unit tests
         env:
           TRAITS_FLAG: ${{ matrix.swift == 'swift:6.1-noble' && '--enable-all-traits' || '' }}
@@ -47,7 +47,7 @@ jobs:
         with:
           xcode-version: ${{ matrix.xcode-version }}
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Run unit tests
         run: |
           swift test --enable-code-coverage -Xswiftc -warnings-as-errors --enable-all-traits

Sources/FluentKitExtras/OptionalPointerProperty.swift

@@ -6,7 +6,8 @@ extension Model {
     public typealias OptionalPointer<To, ToProp> = OptionalPointerProperty<Self, To, ToProp>
         where
             To: FluentKit.Model,
-            ToProp: QueryableProperty, ToProp.Model == To, ToProp.Value: Hashable
+            ToProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype,
+            ToProp.Model == To, ToProp.Value: Hashable
 }
 
 // MARK: Type
@@ -30,7 +31,7 @@ extension Model {
 public final class OptionalPointerProperty<From, To, ToProp>: @unchecked Sendable
     where
         From: FluentKit.Model, To: FluentKit.Model,
-        ToProp: QueryableProperty, ToProp.Model == To, ToProp.Value: Hashable
+        ToProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, ToProp.Model == To, ToProp.Value: Hashable
 {
     @OptionalFieldProperty<From, ToProp.Value>
     public var ref: ToProp.Value?
@@ -185,7 +186,7 @@ extension OptionalPointerProperty: EagerLoadable {
 private struct OptionalPointerEagerLoader<From, To, ToProp>: EagerLoader
     where
         From: FluentKit.Model, To: FluentKit.Model,
-        ToProp: FluentKit.QueryableProperty, ToProp.Model == To, ToProp.Value: Hashable
+        ToProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, ToProp.Model == To, ToProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {
@@ -236,7 +237,7 @@ private struct ThroughOptionalPointerEagerLoader<From, Through, ThroughProp, Loa
     where
         From: FluentKit.Model,
         Loader: EagerLoader, Loader.Model == Through,
-        ThroughProp: QueryableProperty, ThroughProp.Model == Through, ThroughProp.Value: Hashable
+        ThroughProp: QueryableProperty & _SQLKitExtrasSendableMetatype, ThroughProp.Model == Through, ThroughProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {

Sources/FluentKitExtras/OptionalReferenceProperty.swift

@@ -5,7 +5,7 @@ extension Model {
     public typealias OptionalReference<To, FromProp> = OptionalReferenceProperty<Self, To, FromProp>
         where
             To: FluentKit.Model,
-            FromProp: QueryableProperty, FromProp.Model == Self, FromProp.Value: Hashable
+            FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, FromProp.Model == Self, FromProp.Value: Hashable
 }
 
 // MARK: Type
@@ -22,7 +22,7 @@ extension Model {
 @propertyWrapper
 public final class OptionalReferenceProperty<From, To, FromProp>: @unchecked Sendable
     where From: FluentKit.Model, To: FluentKit.Model,
-    FromProp: QueryableProperty, FromProp.Model == From, FromProp.Value: Hashable
+    FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, FromProp.Model == From, FromProp.Value: Hashable
 {
     public let parentKey: RelationPointerKey<From, To, FromProp>
     let fromKeypath: KeyPath<From, FromProp>
@@ -229,7 +229,8 @@ extension OptionalReferenceProperty: EagerLoadable {
 private struct OptionalReferenceEagerLoader<From, To, FromProp>: EagerLoader
     where
         From: FluentKit.Model, To: FluentKit.Model,
-        FromProp: QueryableProperty, FromProp.Model == From, FromProp.Value: Hashable
+        FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype,
+        FromProp.Model == From, FromProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {
@@ -270,7 +271,8 @@ private struct OptionalReferenceEagerLoader<From, To, FromProp>: EagerLoader
 private struct ThroughReferenceEagerLoader<From, Through, FromProp, Loader>: EagerLoader
     where
         From: FluentKit.Model,
-        Loader: EagerLoader, Loader.Model == Through, FromProp: QueryableProperty, FromProp.Model == From, FromProp.Value: Hashable
+        Loader: EagerLoader, Loader.Model == Through, FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype,
+        FromProp.Model == From, FromProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {

Sources/FluentKitExtras/PointerProperty.swift

@@ -6,7 +6,8 @@ extension Model {
     public typealias Pointer<To, ToProp> = PointerProperty<Self, To, ToProp>
         where
             To: FluentKit.Model,
-            ToProp: QueryableProperty, ToProp.Model == To, ToProp.Value: Hashable
+            ToProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype,
+            ToProp.Model == To, ToProp.Value: Hashable
 }
 
 // MARK: Type
@@ -29,7 +30,7 @@ extension Model {
 @propertyWrapper
 public final class PointerProperty<From, To, ToProp>: @unchecked Sendable
     where From: FluentKit.Model, To: FluentKit.Model,
-    ToProp: QueryableProperty, ToProp.Model == To, ToProp.Value: Hashable
+    ToProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, ToProp.Model == To, ToProp.Value: Hashable
 {
     @FieldProperty<From, ToProp.Value>
     public var ref: ToProp.Value
@@ -184,7 +185,7 @@ extension PointerProperty: EagerLoadable {
 private struct PointerEagerLoader<From, To, ToProp>: EagerLoader
     where
         From: FluentKit.Model, To: FluentKit.Model,
-        ToProp: FluentKit.QueryableProperty, ToProp.Model == To, ToProp.Value: Hashable
+        ToProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, ToProp.Model == To, ToProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {
@@ -222,7 +223,7 @@ private struct ThroughPointerEagerLoader<From, Through, ThroughProp, Loader>: Ea
     where
         From: FluentKit.Model,
         Loader: EagerLoader, Loader.Model == Through,
-        ThroughProp: QueryableProperty, ThroughProp.Model == Through, ThroughProp.Value: Hashable
+        ThroughProp: QueryableProperty & _SQLKitExtrasSendableMetatype, ThroughProp.Model == Through, ThroughProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {

Sources/FluentKitExtras/ReferencesProperty.swift

@@ -5,7 +5,8 @@ extension Model {
     public typealias References<To, FromProp> = ReferencesProperty<Self, To, FromProp>
         where
             To: FluentKit.Model,
-            FromProp: QueryableProperty, FromProp.Model == Self, FromProp.Value: Hashable
+            FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype,
+            FromProp.Model == Self, FromProp.Value: Hashable
 }
 
 // MARK: Type
@@ -23,7 +24,7 @@ extension Model {
 public final class ReferencesProperty<From, To, FromProp>: @unchecked Sendable
     where
         From: FluentKit.Model, To: FluentKit.Model,
-        FromProp: QueryableProperty, FromProp.Model == From, FromProp.Value: Hashable
+        FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, FromProp.Model == From, FromProp.Value: Hashable
 {
     public let parentKey: RelationPointerKey<From, To, FromProp>
     let fromKeypath: KeyPath<From, FromProp>
@@ -243,7 +244,7 @@ extension ReferencesProperty: EagerLoadable {
 private struct ReferencesEagerLoader<From, To, FromProp>: EagerLoader
     where
         From: FluentKit.Model, To: FluentKit.Model,
-        FromProp: QueryableProperty, FromProp.Model == From, FromProp.Value: Hashable
+        FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype, FromProp.Model == From, FromProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {
@@ -282,7 +283,8 @@ private struct ReferencesEagerLoader<From, To, FromProp>: EagerLoader
 private struct ThroughReferencesEagerLoader<From, Through, FromProp, Loader>: EagerLoader
     where
         From: FluentKit.Model,
-        Loader: EagerLoader, Loader.Model == Through, FromProp: QueryableProperty, FromProp.Model == From, FromProp.Value: Hashable
+        Loader: EagerLoader, Loader.Model == Through, FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype,
+        FromProp.Model == From, FromProp.Value: Hashable
 {
     // Needed because the extension that normally adds this inside FluentKit is not public.
     func anyRun(models: [any AnyModel], on database: any Database) -> EventLoopFuture<Void> {

Sources/FluentKitExtras/RelationPointerKey.swift

@@ -3,7 +3,8 @@ import FluentKit
 public enum RelationPointerKey<From, To, FromProp>: Sendable
     where
         From: FluentKit.Model, To: FluentKit.Model,
-        FromProp: QueryableProperty, FromProp.Model == From, FromProp.Value: Hashable
+        FromProp: FluentKit.QueryableProperty & _SQLKitExtrasSendableMetatype,
+        FromProp.Model == From, FromProp.Value: Hashable
 {
     case required(KeyPath<To, To.Pointer<From, FromProp>>)
     case optional(KeyPath<To, To.OptionalPointer<From, FromProp>>)

Sources/FluentKitExtras/SwiftCompatibility.swift

@@ -0,0 +1,9 @@
+import FluentKit
+
+#if compiler(>=6.2)
+@_marker public protocol _SQLKitExtrasSendableMetatype: SendableMetatype {}
+#else
+@_marker public protocol _SQLKitExtrasSendableMetatype {}
+#endif
+
+extension FluentKit.FieldProperty: _SQLKitExtrasSendableMetatype {}

Sources/SQLKitExtras/FluentSQLKitExtras/Builders/SQLJoinBuilder+FluentKeypaths.swift

@@ -46,7 +46,7 @@ extension SQLJoinBuilder {
         method: SQLJoinMethod = .inner,
         on expression: some SQLExpression
     ) -> Self {
-        if let alias = alias.map(String.init(_:)) ?? type.alias {
+        if let alias = alias.map({ String($0) }) ?? type.alias {
             self.join(.table(type.schema, space: type.space), as: alias, method: method, on: expression)
         } else {
             self.join(.table(type.schema, space: type.space), method: method, on: expression)
@@ -76,7 +76,7 @@ extension SQLJoinBuilder {
         method: SQLJoinMethod = .inner,
         using columns: some Sequence<any SQLExpression>
     ) -> Self {
-        if let alias = alias.map(String.init(_:)) ?? type.alias {
+        if let alias = alias.map({ String($0) }) ?? type.alias {
             self.join(.table(type.schema, space: type.space), as: alias, method: method, using: columns)
         } else {
             self.join(.table(type.schema, space: type.space), method: method, using: .list(columns))

Sources/SQLKitExtras/FluentSQLKitExtras/Expressions/SQLQueryString+FluentKeypaths.swift

@@ -0,0 +1,19 @@
+#if FluentSQLKitExtras
+import FluentKit
+import SQLKit
+
+extension SQLQueryString {
+    /// Allow specifying a Fluent keypath as an identifier interpolation in an `SQLQueryString`.
+    @inlinable
+    public mutating func appendInterpolation(ident: KeyPath<some Schema, some QueryAddressableProperty>) {
+        self.appendInterpolation(.identifier(ident))
+    }
+
+    /// Allow specifying a Fluent keypath as an column interpolation in an `SQLQueryString`.
+    @inlinable
+    public mutating func appendInterpolation(col: KeyPath<some Schema, some QueryAddressableProperty>) {
+        self.appendInterpolation(.column(col))
+    }
+}
+#endif
+

Sources/SQLKitExtras/SQLKitExtras/BuiltinExpressions/SQLColumn.swift

@@ -6,7 +6,7 @@ extension SQLExpression {
         _ name: some StringProtocol,
         table: (some StringProtocol)? = String?.none
     ) -> Self where Self == SQLColumn {
-        .init(String(name), table: table.map(String.init(_:)))
+        .init(String(name), table: table.map { String($0) })
     }
 
     /// A convenience method for creating an `SQLColumn` from a column name and table expression.

Tests/SQLKitExtrasTests/FluentSQLKitExtrasTests.swift

@@ -306,6 +306,12 @@ struct FluentSQLKitExtrasTests {
             #expect(MockSQLDatabase(dialect: "mysql").serialize(.cast(\FooModel.$field, to: "text")).sql == #"CAST("foos"."field" AS text)"#)
             #expect(MockSQLDatabase(dialect: "postgresql").serialize(.cast(\FooModel.$field, to: "text")).sql == #"CAST("foos"."field" AS "text")"#)
         }
+
+        @Test
+        func queryStringExpression() {
+            #expect(serialize("foo \(ident: \FooModel.$field) bar" as SQLQueryString) == #"foo "field" bar"#)
+            #expect(serialize("foo \(col: \FooModel.$field) bar" as SQLQueryString) == #"foo "foos"."field" bar"#)
+        }
     }
 }