diff --git a/src/PostgREST/DbStructure.hs b/src/PostgREST/DbStructure.hs index dc620ed1d..1c8738781 100644 --- a/src/PostgREST/DbStructure.hs +++ b/src/PostgREST/DbStructure.hs @@ -111,8 +111,8 @@ doesProcExist = FROM pg_catalog.pg_namespace n JOIN pg_catalog.pg_proc p ON pronamespace = n.oid - WHERE nspname = ? - AND proname = ? + WHERE nspname = $1 + AND proname = $2 ) |] doesProcReturnJWT :: H.Query QualifiedIdentifier Bool @@ -124,8 +124,8 @@ doesProcReturnJWT = FROM pg_catalog.pg_namespace n JOIN pg_catalog.pg_proc p ON pronamespace = n.oid - WHERE nspname = ? - AND proname = ? + WHERE nspname = $1 + AND proname = $2 AND pg_catalog.pg_get_function_result(p.oid) like '%jwt_claims' ) |] diff --git a/src/PostgREST/QueryBuilder.hs b/src/PostgREST/QueryBuilder.hs index 4eb7d2dee..8f1916c99 100644 --- a/src/PostgREST/QueryBuilder.hs +++ b/src/PostgREST/QueryBuilder.hs @@ -53,7 +53,7 @@ import Data.Tree (Tree(..)) import qualified Data.Vector as V import PostgREST.Types import qualified Data.Map as M -import Text.InterpolatedString.Perl6 (qc, q) +import Text.InterpolatedString.Perl6 (qc) import Text.Regex.TDFA ((=~)) import qualified Data.ByteString.Char8 as BS import Data.Scientific ( FPFormat (..) @@ -210,8 +210,8 @@ callProc :: QualifiedIdentifier -> JSON.Object -> H.Query () (Maybe JSON.Value) callProc qi params = H.statement sql HE.unit decodeObj True where - sql = [q| SELECT array_to_json( - coalesce(array_agg(row_to_json(t)), '{}') + sql = [qc| SELECT array_to_json( + coalesce(array_agg(row_to_json(t)), '\{}') )::character varying from ({_callSql}) t |] _args = intercalate "," $ map _assignment (HM.toList params)