TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-28 01:35:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace sql"" with fr"" to ensure trailing spaces

Browse Source 
Thanks to @eikek for the suggestion. This PR replaces all occurrences of
`sql""` with `fr""` (cf.
[interpolators](https://tpolecat.github.io/doobie/docs/08-Fragments.html#whitespace-handling).

Fixes: #2367
Signed-off-by: martin f. krafft <madduck@madduck.net>
This commit is contained in:
martin f. krafft 2023-11-10 16:40:26 +01:00
parent fe56ee0d5c
commit f1986fc518
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRepository.scala
View File

@ -20,7 +20,7 @@ object FtsRepository extends DoobieMeta {
val table = fr"ftspsql_search"
def containsData: ConnectionIO[Boolean] =
sql"select id from $table limit 1".query[String].option.map(_.isDefined)
fr"select id from $table limit 1".query[String].option.map(_.isDefined)
def containsNoData: ConnectionIO[Boolean] =
containsData.map(!_)
@ -31,7 +31,7 @@ object FtsRepository extends DoobieMeta {
val selectRank = mkSelectRank(rn)
val query = mkQueryPart(pq, q)
sql"""select count(id), coalesce(max($selectRank), 0)
fr"""select count(id), coalesce(max($selectRank), 0)
|from $table, $query
|where ${mkCondition(q)} AND query @@ text_index
|""".stripMargin
@ -64,7 +64,7 @@ object FtsRepository extends DoobieMeta {
val query = mkQueryPart(pq, q)
val sqlFrag =
sql"""select $select
fr"""select $select
|from $table, $query
|where ${mkCondition(q)} AND query @@ text_index
|order by rank desc
@ -99,7 +99,7 @@ object FtsRepository extends DoobieMeta {
}
private def mkSelectRank(rn: RankNormalization): Fragment = {
val bits = rn.value.toNonEmptyList.map(n => sql"$n").reduceLeft(_ ++ sql"|" ++ _)
val bits = rn.value.toNonEmptyList.map(n => fr"$n").reduceLeft(_ ++ sql"|" ++ _)
fr"ts_rank_cd(text_index, query, $bits)"
}
@ -111,36 +111,36 @@ object FtsRepository extends DoobieMeta {
)(r: FtsRecord): ConnectionIO[Int] =
(fr"INSERT INTO $table (id,item_id,collective,lang,attach_id,folder_id,attach_name,attach_content,item_name,item_notes,fts_config) VALUES (" ++
commas(
sql"${r.id}",
sql"${r.itemId}",
sql"${r.collective}",
sql"${r.language}",
sql"${r.attachId}",
sql"${r.folderId}",
sql"${r.attachName}",
sql"${r.attachContent}",
sql"${r.itemName}",
sql"${r.itemNotes}",
sql"${pgConfig(r.language)}::regconfig"
) ++ sql") on conflict (id) do update set " ++ commas(
sql"lang = ${r.language}",
sql"folder_id = ${r.folderId}",
sql"attach_name = ${r.attachName}",
sql"attach_content = ${r.attachContent}",
sql"item_name = ${r.itemName}",
sql"item_notes = ${r.itemNotes}",
sql"fts_config = ${pgConfig(r.language)}::regconfig"
fr"${r.id}",
fr"${r.itemId}",
fr"${r.collective}",
fr"${r.language}",
fr"${r.attachId}",
fr"${r.folderId}",
fr"${r.attachName}",
fr"${r.attachContent}",
fr"${r.itemName}",
fr"${r.itemNotes}",
fr"${pgConfig(r.language)}::regconfig"
) ++ fr") on conflict (id) do update set " ++ commas(
fr"lang = ${r.language}",
fr"folder_id = ${r.folderId}",
fr"attach_name = ${r.attachName}",
fr"attach_content = ${r.attachContent}",
fr"item_name = ${r.itemName}",
fr"item_notes = ${r.itemNotes}",
fr"fts_config = ${pgConfig(r.language)}::regconfig"
)).update.run
def update(pgConfig: Language => String)(r: FtsRecord): ConnectionIO[Int] =
(fr"UPDATE $table SET" ++ commas(
sql"lang = ${r.language}",
sql"folder_id = ${r.folderId}",
sql"attach_name = ${r.attachName}",
sql"attach_content = ${r.attachContent}",
sql"item_name = ${r.itemName}",
sql"item_notes = ${r.itemNotes}",
sql"fts_config = ${pgConfig(r.language)}::regconfig"
fr"lang = ${r.language}",
fr"folder_id = ${r.folderId}",
fr"attach_name = ${r.attachName}",
fr"attach_content = ${r.attachContent}",
fr"item_name = ${r.itemName}",
fr"item_notes = ${r.itemNotes}",
fr"fts_config = ${pgConfig(r.language)}::regconfig"
) ++ fr"WHERE id = ${r.id}").update.run
def updateChunk(pgConfig: Language => String)(r: Chunk[FtsRecord]): ConnectionIO[Int] =
@ -151,25 +151,25 @@ object FtsRepository extends DoobieMeta {
collective: CollectiveId,
folder: Option[Ident]
): ConnectionIO[Int] =
(sql"UPDATE $table" ++
(fr"UPDATE $table" ++
fr"SET folder_id = $folder" ++
fr"WHERE item_id = $itemId AND collective = $collective").update.run
def deleteByItemId(itemId: Ident): ConnectionIO[Int] =
sql"DELETE FROM $table WHERE item_id = $itemId".update.run
fr"DELETE FROM $table WHERE item_id = $itemId".update.run
def deleteByAttachId(attachId: Ident): ConnectionIO[Int] =
sql"DELETE FROM $table WHERE attach_id = $attachId".update.run
fr"DELETE FROM $table WHERE attach_id = $attachId".update.run
def deleteAll: ConnectionIO[Int] =
sql"DELETE FROM $table".update.run
fr"DELETE FROM $table".update.run
def delete(collective: CollectiveId): ConnectionIO[Int] =
sql"DELETE FROM $table WHERE collective = $collective".update.run
fr"DELETE FROM $table WHERE collective = $collective".update.run
def resetAll: ConnectionIO[Int] = {
val dropFlyway = sql"DROP TABLE IF EXISTS flyway_fts_history".update.run
val dropSearch = sql"DROP TABLE IF EXISTS $table".update.run
val dropFlyway = fr"DROP TABLE IF EXISTS flyway_fts_history".update.run
val dropSearch = fr"DROP TABLE IF EXISTS $table".update.run
for {
a <- dropFlyway
b <- dropSearch