Merge branch 'main' into jsongrouparray-filter-fix

Author: stephencelis

Sources/StructuredQueriesCore/Documentation.docc/Extensions/QueryExpression.md

@@ -28,6 +28,7 @@
 
 - ``jsonArrayLength()``
 - ``jsonGroupArray(order:filter:)``
+- ``jsonPatch(_:)``
 
 ### Optionality
 

Sources/StructuredQueriesCore/QueryFragment.swift

@@ -209,6 +209,18 @@ extension QueryFragment: ExpressibleByStringInterpolation {
       segments.append(.binding(binding))
     }
 
+    /// Append a query representable output to the interpolation.
+    ///
+    /// - Parameters:
+    ///   - queryOutput: A query representable output.
+    ///   - representableType: The type of query representation.
+    public mutating func appendInterpolation<QueryValue: QueryBindable>(
+      _ queryOutput: QueryValue.QueryOutput,
+      as representableType: QueryValue.Type
+    ) {
+      appendInterpolation(QueryValue(queryOutput: queryOutput))
+    }
+
     /// Append a query fragment to the interpolation.
     ///
     /// - Parameter fragment: A query fragment.

Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift

@@ -2,6 +2,17 @@ import Foundation
 import StructuredQueriesSupport
 
 extension QueryExpression {
+  /// Passes this expression and the given one to the `json_patch` function.
+  ///
+  /// - Parameter other: A JSON object to patch this object with.
+  /// - Returns: A JSON expression of the result of the invoking the `json_patch` function.
+  public func jsonPatch<QueryOutput: Codable>(
+    _ other: some QueryExpression<QueryValue>
+  ) -> some QueryExpression<QueryValue>
+  where QueryValue == _CodableJSONRepresentation<QueryOutput> {
+    QueryFunction("json_patch", self, other)
+  }
+
   /// Wraps this expression with the `json_array_length` function.
   ///
   /// ```swift

Tests/StructuredQueriesTests/JSONFunctionsTests.swift

@@ -318,6 +318,27 @@ extension SnapshotTests {
         """
       }
     }
+
+    @Test func jsonPatch() {
+      assertQuery(Values(#bind(["a": 1]).jsonPatch(#bind(["b": 2])))) {
+        """
+        SELECT json_patch('{
+          "a" : 1
+        }', '{
+          "b" : 2
+        }')
+        """
+      } results: {
+        """
+        ┌───────────┐
+        │ [         │
+        │   "a": 1, │
+        │   "b": 2  │
+        │ ]         │
+        └───────────┘
+        """
+      }
+    }
   }
 }