refactor: Remove Protolude.Conv from DbStructure

This commit is contained in:
monacoremo
2021-11-12 20:25:22 +01:00
committed by Remo
parent 15ea7dfe09
commit abb6167caa
+3 -4
View File
@@ -54,8 +54,7 @@ import PostgREST.DbStructure.Relationship (Cardinality (..),
Relationship (..)) Relationship (..))
import PostgREST.DbStructure.Table (Column (..), Table (..)) import PostgREST.DbStructure.Table (Column (..), Table (..))
import Protolude hiding (toS) import Protolude
import Protolude.Conv (toS)
import Protolude.Unsafe (unsafeHead) import Protolude.Unsafe (unsafeHead)
@@ -225,12 +224,12 @@ decodeProcs =
| otherwise = Volatile -- only 'v' can happen here | otherwise = Volatile -- only 'v' can happen here
allProcs :: Bool -> SQL.Statement [Schema] ProcsMap allProcs :: Bool -> SQL.Statement [Schema] ProcsMap
allProcs = SQL.Statement (toS sql) (arrayParam HE.text) decodeProcs allProcs = SQL.Statement sql (arrayParam HE.text) decodeProcs
where where
sql = procsSqlQuery <> " WHERE pn.nspname = ANY($1)" sql = procsSqlQuery <> " WHERE pn.nspname = ANY($1)"
accessibleProcs :: Bool -> SQL.Statement Schema ProcsMap accessibleProcs :: Bool -> SQL.Statement Schema ProcsMap
accessibleProcs = SQL.Statement (toS sql) (param HE.text) decodeProcs accessibleProcs = SQL.Statement sql (param HE.text) decodeProcs
where where
sql = procsSqlQuery <> " WHERE pn.nspname = $1 AND has_function_privilege(p.oid, 'execute')" sql = procsSqlQuery <> " WHERE pn.nspname = $1 AND has_function_privilege(p.oid, 'execute')"