Correct openapi preparing statements by default

This commit is contained in:
steve-chavez
2021-01-19 13:49:40 -05:00
committed by Steve Chavez
parent ba86b479f8
commit 15039553db
2 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -330,9 +330,9 @@ app dbStructure conf apiRequest =
encodeApi ti sd procs = encodeOpenAPI (concat $ M.elems procs) (toTableInfo ti) uri' sd $ dbPrimaryKeys dbStructure
body <- encodeApi <$>
H.statement tSchema accessibleTables <*>
H.statement tSchema schemaDescription <*>
H.statement tSchema accessibleProcs
H.statement tSchema (accessibleTables prepared) <*>
H.statement tSchema (schemaDescription prepared) <*>
H.statement tSchema (accessibleProcs prepared)
return $ responseLBS status200 (catMaybes [Just $ toHeader CTOpenAPI, profileH]) (if headersOnly then mempty else toS body)
_ -> return notFound
+6 -6
View File
@@ -172,8 +172,8 @@ allProcs = H.Statement (toS sql) (arrayParam HE.text) decodeProcs
where
sql = procsSqlQuery <> " WHERE pn.nspname = ANY($1)"
accessibleProcs :: H.Statement Schema ProcsMap
accessibleProcs = H.Statement (toS sql) (param HE.text) decodeProcs True
accessibleProcs :: Bool -> H.Statement Schema ProcsMap
accessibleProcs = H.Statement (toS sql) (param HE.text) decodeProcs
where
sql = procsSqlQuery <> " WHERE pn.nspname = $1 AND has_function_privilege(p.oid, 'execute')"
@@ -244,9 +244,9 @@ procsSqlQuery = [q|
LEFT JOIN pg_catalog.pg_description as d ON d.objoid = p.oid
|]
schemaDescription :: H.Statement Schema (Maybe Text)
schemaDescription :: Bool -> H.Statement Schema (Maybe Text)
schemaDescription =
H.Statement sql (param HE.text) (join <$> HD.rowMaybe (nullableColumn HD.text)) True
H.Statement sql (param HE.text) (join <$> HD.rowMaybe (nullableColumn HD.text))
where
sql = [q|
select
@@ -257,9 +257,9 @@ schemaDescription =
where
n.nspname = $1 |]
accessibleTables :: H.Statement Schema [Table]
accessibleTables :: Bool -> H.Statement Schema [Table]
accessibleTables =
H.Statement sql (param HE.text) decodeTables True
H.Statement sql (param HE.text) decodeTables
where
sql = [q|
select