From abb6167caab09d56b36bde1fd99eeff8b6cb22b0 Mon Sep 17 00:00:00 2001 From: monacoremo <59358383+monacoremo@users.noreply.github.com> Date: Sun, 7 Nov 2021 13:47:53 +0100 Subject: [PATCH] refactor: Remove Protolude.Conv from DbStructure --- src/PostgREST/DbStructure.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/PostgREST/DbStructure.hs b/src/PostgREST/DbStructure.hs index b2f21f09b..5fbb88a83 100644 --- a/src/PostgREST/DbStructure.hs +++ b/src/PostgREST/DbStructure.hs @@ -54,8 +54,7 @@ import PostgREST.DbStructure.Relationship (Cardinality (..), Relationship (..)) import PostgREST.DbStructure.Table (Column (..), Table (..)) -import Protolude hiding (toS) -import Protolude.Conv (toS) +import Protolude import Protolude.Unsafe (unsafeHead) @@ -225,12 +224,12 @@ decodeProcs = | otherwise = Volatile -- only 'v' can happen here allProcs :: Bool -> SQL.Statement [Schema] ProcsMap -allProcs = SQL.Statement (toS sql) (arrayParam HE.text) decodeProcs +allProcs = SQL.Statement sql (arrayParam HE.text) decodeProcs where sql = procsSqlQuery <> " WHERE pn.nspname = ANY($1)" accessibleProcs :: Bool -> SQL.Statement Schema ProcsMap -accessibleProcs = SQL.Statement (toS sql) (param HE.text) decodeProcs +accessibleProcs = SQL.Statement sql (param HE.text) decodeProcs where sql = procsSqlQuery <> " WHERE pn.nspname = $1 AND has_function_privilege(p.oid, 'execute')"