[#118] Refactor database functions to use queryNamed and executeNamed

Resolves #118

src/IW/Db/Issue.hs

@@ -8,28 +8,29 @@ module IW.Db.Issue
        , upsertIssues
        ) where
 
+import IW.App (WithError)
 import IW.Core.Issue (Issue (..), Label (..))
 import IW.Core.SqlArray (SqlArray (..))
 import IW.Core.WithId (WithId)
-import IW.Db.Functions (WithDb, executeMany, query, queryRaw)
+import IW.Db.Functions (WithDb, executeMany, queryNamed, queryRaw)
 
 
 -- | Returns all issues in the database.
-getIssues :: (WithDb env m) => m [WithId Issue]
+getIssues :: WithDb env m => m [WithId Issue]
 getIssues = queryRaw [sql|
     SELECT id, repo_owner, repo_name, number, title, body, labels
     FROM issues
     LIMIT 100
 |]
 
 -- | Returns all issues with at least one label in the given list.
-getIssuesByLabels :: (WithDb env m) => [Label] -> m [WithId Issue]
-getIssuesByLabels = query [sql|
+getIssuesByLabels :: (WithDb env m, WithError m) => [Label] -> m [WithId Issue]
+getIssuesByLabels labels = queryNamed [sql|
     SELECT id, repo_owner, repo_name, number, title, body, labels
     FROM issues
-    WHERE ? && labels
+    WHERE labels && ?labels
     LIMIT 100
-|] . Only . SqlArray
+|] [ "labels" =? SqlArray labels ]
 
 -- | Insert a list of issues into the database, but update on conflict.
 upsertIssues :: (WithDb env m) => [Issue] -> m ()

src/IW/Db/Repo.hs

@@ -9,10 +9,11 @@ module IW.Db.Repo
        , updateRepoCategories
        ) where
 
+import IW.App (WithError)
 import IW.Core.Repo (Repo, RepoOwner, RepoName, Category)
 import IW.Core.SqlArray (SqlArray (..))
 import IW.Core.WithId (WithId)
-import IW.Db.Functions (WithDb, executeMany, execute, query, queryRaw)
+import IW.Db.Functions (WithDb, executeMany, executeNamed, queryNamed, queryRaw)
 
 
 -- | Returns all repos in the database.
@@ -24,13 +25,13 @@ getRepos = queryRaw [sql|
 |]
 
 -- | Returns all repos with at least one category in the given list.
-getReposByCategories :: WithDb env m => [Category] -> m [WithId Repo]
-getReposByCategories = query [sql|
+getReposByCategories :: (WithDb env m, WithError m) => [Category] -> m [WithId Repo]
+getReposByCategories categories = queryNamed [sql|
     SELECT id, owner, name, descr, categories
     FROM repos
-    WHERE ? && categories
+    WHERE categories && ?categories
     LIMIT 100
-|] . Only . SqlArray
+|] [ "categories" =? SqlArray categories ]
 
 -- | Insert a list of repos into the database, but update on conflict.
 upsertRepos :: WithDb env m => [Repo] -> m ()
@@ -47,14 +48,19 @@ upsertRepos = executeMany [sql|
 
 -- | Update a repo's categories field.
 updateRepoCategories
-    :: WithDb env m
+    :: ( WithDb env m
+       , WithError m
+       )
     => RepoOwner
     -> RepoName
     -> [Category]
     -> m ()
-updateRepoCategories repoOwner repoName categories = execute [sql|
+updateRepoCategories repoOwner repoName categories = void $ executeNamed [sql|
     UPDATE repos
-    SET categories = ?
-    WHERE owner = ?
-      AND name = ?
-|] (SqlArray categories, repoOwner, repoName)
+    SET categories = ?categories
+    WHERE owner = ?owner
+      AND name = ?name
+|] [ "categories" =? SqlArray categories
+   , "owner" =? repoOwner
+   , "name" =? repoName
+   ]

src/IW/Server/Issue.hs

@@ -7,6 +7,7 @@ module IW.Server.Issue
        , issuesHandler
        ) where
 
+import IW.App (WithError)
 import IW.Core.Issue (Issue (..), Label (..))
 import IW.Core.WithId (WithId (..))
 import IW.Db (WithDb, getIssuesByLabels)
@@ -29,6 +30,7 @@ issueServer = IssueSite
 
 issuesHandler
     :: ( WithDb env m
+       , WithError m
        )
     => [Label]
     -> m [WithId Issue]

src/Prelude.hs

@@ -30,6 +30,7 @@ import Database.PostgreSQL.Simple.SqlQQ as Sql (sql)
 import Database.PostgreSQL.Simple.ToField as Sql (ToField (toField))
 import Database.PostgreSQL.Simple.ToRow as Sql (ToRow (toRow))
 import Database.PostgreSQL.Simple.Types as Sql (Only (..))
+import PgNamed as Sql ((=?))
 
 import Servant.API as Web ((:>), Capture, Get, Header, Header', JSON, NoContent (NoContent), Post,
                            QueryFlag, QueryParam, QueryParam', ReqBody)