diff --git a/src/MyWebLog.Data/SQLite/SQLitePageData.fs b/src/MyWebLog.Data/SQLite/SQLitePageData.fs index fd390de..e76448c 100644 --- a/src/MyWebLog.Data/SQLite/SQLitePageData.fs +++ b/src/MyWebLog.Data/SQLite/SQLitePageData.fs @@ -53,7 +53,7 @@ type SQLitePageData(conn: SqliteConnection, log: ILogger) = let countListed webLogId = log.LogTrace "Page.countListed" conn.customScalar - $"""{Document.Query.countByWebLog Table.Page} AND {Query.whereByField pgListName EQ "'true'"}""" + $"""{Document.Query.countByWebLog Table.Page} AND {Query.whereByField pgListName EQ "true"}""" [ webLogParam webLogId ] (toCount >> int) @@ -116,7 +116,7 @@ type SQLitePageData(conn: SqliteConnection, log: ILogger) = let findListed webLogId = log.LogTrace "Page.findListed" conn.customList - $"""{Document.Query.selectByWebLog Table.Page} AND {Query.whereByField pgListName EQ "'true'"} + $"""{Document.Query.selectByWebLog Table.Page} AND {Query.whereByField pgListName EQ "true"} ORDER BY LOWER({titleField})""" [ webLogParam webLogId ] (fun rdr -> { fromData rdr with Text = "" }) diff --git a/src/MyWebLog.Data/SQLite/SQLiteWebLogUserData.fs b/src/MyWebLog.Data/SQLite/SQLiteWebLogUserData.fs index 61cae3b..216c29b 100644 --- a/src/MyWebLog.Data/SQLite/SQLiteWebLogUserData.fs +++ b/src/MyWebLog.Data/SQLite/SQLiteWebLogUserData.fs @@ -49,7 +49,7 @@ type SQLiteWebLogUserData(conn: SqliteConnection, log: ILogger) = /// Find the names of users by their IDs for the given web log let findNames webLogId (userIds: WebLogUserId list) = log.LogTrace "WebLogUser.findNames" - let nameSql, nameParams = inClause "AND data ->> 'Id'" "id" string userIds + let nameSql, nameParams = inClause $"AND data ->> '{nameof WebLogUser.Empty.Id}'" "id" string userIds conn.customList $"{Document.Query.selectByWebLog Table.WebLogUser} {nameSql}" (webLogParam webLogId :: nameParams)