Add Postgres support for nested subpath (JSON) expressions (#246)

Implement the new SQLDialect.nestedSubpathExpression(in:for:) method for Postgres syntax.
vapor · Jul 11, 2023 · b69f427 · b69f427
1 parent a88d025
commit b69f427
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Package.swift b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/vapor/postgres-nio.git", from: "1.14.2"),
-        .package(url: "https://github.com/vapor/sql-kit.git", from: "3.26.0"),
+        .package(url: "https://github.com/vapor/sql-kit.git", from: "3.28.0"),
         .package(url: "https://github.com/vapor/async-kit.git", from: "1.14.0"),
         .package(url: "https://github.com/apple/swift-atomics.git", from: "1.1.0")
     ],

diff --git a/Sources/PostgresKit/PostgresDialect.swift b/Sources/PostgresKit/PostgresDialect.swift
@@ -54,4 +54,19 @@ public struct PostgresDialect: SQLDialect {
     public var sharedSelectLockExpression: (any SQLExpression)? { SQLRaw("FOR SHARE") }
 
     public var exclusiveSelectLockExpression: (any SQLExpression)? { SQLRaw("FOR UPDATE") }
+
+    public func nestedSubpathExpression(in column: any SQLExpression, for path: [String]) -> (any SQLExpression)? {
+        guard !path.isEmpty else { return nil }
+
+        let descender = SQLList(
+            [column] + path.dropLast().map(SQLLiteral.string(_:)),
+            separator: SQLRaw("->")
+        )
+        let accessor = SQLList(
+            [descender, SQLLiteral.string(path.last!)],
+            separator: SQLRaw("->>")
+        )
+
+        return SQLGroupExpression(accessor)
+    }
 }