From 28f771324d807bef285dbca5d7ab8112853cd1bc Mon Sep 17 00:00:00 2001 From: Joe Nelson Date: Sun, 16 Aug 2015 10:46:25 -0700 Subject: [PATCH] Nest response JSON more shallowly --- src/PostgREST/App.hs | 3 --- src/PostgREST/PgQuery.hs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs index b90cce8c2..4dae952ed 100644 --- a/src/PostgREST/App.hs +++ b/src/PostgREST/App.hs @@ -295,9 +295,6 @@ csvMT = "text/csv" jsonH :: Header jsonH = (hContentType, jsonMT) -textH :: Header -textH = (hContentType, "text/plain") - contentTypeForAccept :: Maybe BS.ByteString -> Maybe BS.ByteString contentTypeForAccept accept | isNothing accept || hasJson = Just jsonMT diff --git a/src/PostgREST/PgQuery.hs b/src/PostgREST/PgQuery.hs index c03d6b92c..741cf94a3 100644 --- a/src/PostgREST/PgQuery.hs +++ b/src/PostgREST/PgQuery.hs @@ -176,7 +176,7 @@ update t cols vals = B.Stmt callProc :: QualifiedIdentifier -> JSON.Object -> PStmt callProc qi params = do let args = T.intercalate "," $ map assignment (H.toList params) - B.Stmt ("select " <> fromQi qi <> "(" <> args <> ")") empty True + B.Stmt ("select * from " <> fromQi qi <> "(" <> args <> ")") empty True where assignment (n,v) = pgFmtIdent n <> ":=" <> insertableValue v