Pass query args properly
This commit is contained in:
@@ -111,8 +111,8 @@ doesProcExist =
|
|||||||
FROM pg_catalog.pg_namespace n
|
FROM pg_catalog.pg_namespace n
|
||||||
JOIN pg_catalog.pg_proc p
|
JOIN pg_catalog.pg_proc p
|
||||||
ON pronamespace = n.oid
|
ON pronamespace = n.oid
|
||||||
WHERE nspname = ?
|
WHERE nspname = $1
|
||||||
AND proname = ?
|
AND proname = $2
|
||||||
) |]
|
) |]
|
||||||
|
|
||||||
doesProcReturnJWT :: H.Query QualifiedIdentifier Bool
|
doesProcReturnJWT :: H.Query QualifiedIdentifier Bool
|
||||||
@@ -124,8 +124,8 @@ doesProcReturnJWT =
|
|||||||
FROM pg_catalog.pg_namespace n
|
FROM pg_catalog.pg_namespace n
|
||||||
JOIN pg_catalog.pg_proc p
|
JOIN pg_catalog.pg_proc p
|
||||||
ON pronamespace = n.oid
|
ON pronamespace = n.oid
|
||||||
WHERE nspname = ?
|
WHERE nspname = $1
|
||||||
AND proname = ?
|
AND proname = $2
|
||||||
AND pg_catalog.pg_get_function_result(p.oid) like '%jwt_claims'
|
AND pg_catalog.pg_get_function_result(p.oid) like '%jwt_claims'
|
||||||
) |]
|
) |]
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ import Data.Tree (Tree(..))
|
|||||||
import qualified Data.Vector as V
|
import qualified Data.Vector as V
|
||||||
import PostgREST.Types
|
import PostgREST.Types
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import Text.InterpolatedString.Perl6 (qc, q)
|
import Text.InterpolatedString.Perl6 (qc)
|
||||||
import Text.Regex.TDFA ((=~))
|
import Text.Regex.TDFA ((=~))
|
||||||
import qualified Data.ByteString.Char8 as BS
|
import qualified Data.ByteString.Char8 as BS
|
||||||
import Data.Scientific ( FPFormat (..)
|
import Data.Scientific ( FPFormat (..)
|
||||||
@@ -210,8 +210,8 @@ callProc :: QualifiedIdentifier -> JSON.Object -> H.Query () (Maybe JSON.Value)
|
|||||||
callProc qi params =
|
callProc qi params =
|
||||||
H.statement sql HE.unit decodeObj True
|
H.statement sql HE.unit decodeObj True
|
||||||
where
|
where
|
||||||
sql = [q| SELECT array_to_json(
|
sql = [qc| SELECT array_to_json(
|
||||||
coalesce(array_agg(row_to_json(t)), '{}')
|
coalesce(array_agg(row_to_json(t)), '\{}')
|
||||||
)::character varying
|
)::character varying
|
||||||
from ({_callSql}) t |]
|
from ({_callSql}) t |]
|
||||||
_args = intercalate "," $ map _assignment (HM.toList params)
|
_args = intercalate "," $ map _assignment (HM.toList params)
|
||||||
|
|||||||
Reference in New Issue
Block a user