From 6c16395dfb9903c569005f034482f338965317b3 Mon Sep 17 00:00:00 2001 From: Ruslan Talpa Date: Fri, 4 Sep 2015 19:04:39 +0300 Subject: [PATCH] change fn name from selectT to select --- src/PostgREST/App.hs | 6 +++--- src/PostgREST/PgQuery.hs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs index 554c7cb20..05bf8e822 100644 --- a/src/PostgREST/App.hs +++ b/src/PostgREST/App.hs @@ -64,7 +64,7 @@ app conf reqBody req = else do let qt = qualify table from = fromMaybe 0 $ rangeOffset <$> range - select = B.Stmt "select " V.empty True <> + query = B.Stmt "select " V.empty True <> parentheticT ( whereT qt qq $ countRows qt ) <> commaq <> ( @@ -72,9 +72,9 @@ app conf reqBody req = . limitT range . orderT (orderParse qq) . whereT qt qq - $ selectT qt qq + $ select qt qq ) - row <- H.maybeEx select + row <- H.maybeEx query let (tableTotal, queryTotal, body) = fromMaybe (0, 0, Just "" :: Maybe Text) row to = from+queryTotal-1 diff --git a/src/PostgREST/PgQuery.hs b/src/PostgREST/PgQuery.hs index a6d61be42..ecac65768 100644 --- a/src/PostgREST/PgQuery.hs +++ b/src/PostgREST/PgQuery.hs @@ -129,8 +129,8 @@ asJsonRow s = s { B.stmtTemplate = "row_to_json(t) from (" <> B.stmtTemplate s < selectStar :: QualifiedIdentifier -> PStmt selectStar t = B.Stmt ("select * from " <> fromQi t) empty True -selectT :: QualifiedIdentifier -> Net.Query -> PStmt -selectT table params = +select :: QualifiedIdentifier -> Net.Query -> PStmt +select table params = if L.null cols then selectStar table else B.Stmt "select " empty True <> conjunction <> B.Stmt (" from " <> fromQi table ) empty True