Update for doc lib v4-rc4

2024-09-17 08:05:30 -04:00
parent 95be82cc84
commit 0032d15c0a
16 changed files with 119 additions and 188 deletions
@@ -111,15 +111,14 @@ type PostgresPageData(log: ILogger) =
        log.LogTrace "Page.findCurrentPermalink"
        if List.isEmpty permalinks then return None
        else
-            let linkSql, linkParam = arrayContains (nameof Page.Empty.PriorPermalinks) string permalinks
-            return!
-                Custom.single
-                    $"""SELECT data->>'{nameof Page.Empty.Permalink}' AS permalink
-                          FROM page
-                         WHERE {Query.whereDataContains "@criteria"}
-                           AND {linkSql}"""
-                    [ webLogContains webLogId; linkParam ]
-                    Map.toPermalink
+            let linkField =
+                Field.InArray (nameof Page.Empty.PriorPermalinks) Table.Page (List.map (string >> box) permalinks)
+            let query =
+                (Query.statementWhere
+                     (Query.find Table.Page)
+                     $"""{Query.whereDataContains "@criteria"} AND {Query.whereByFields All [ linkField ]}""")
+                    .Replace("SELECT data", $"SELECT data->>'{nameof Page.Empty.Permalink}' AS permalink")
+            return! Custom.single query (addFieldParams [ linkField ] [ webLogContains webLogId ]) Map.toPermalink
    }
    
    /// Get all complete pages for the given web log