code cleanup

src/PostgREST/PgQuery.hs

@@ -329,6 +329,13 @@ paramFilter :: JSON.Value -> T.Text
 paramFilter JSON.Null = "is.null"
 paramFilter v = "eq." <> unquoted v
 
+wrapQuery :: T.Text -> [T.Text] -> Maybe NonnegRange -> T.Text
+wrapQuery source selectColumns range =
+  withSourceF source <>
+  " SELECT " <>
+  T.intercalate ", " selectColumns <>
+  " " <>
+  fromF ( limitF range )
 
 withSourceF :: T.Text -> T.Text
 withSourceF s = "WITH source AS (" <> s <>")"
@@ -378,7 +385,6 @@ locationF :: [T.Text] -> T.Text
 locationF pKeys =
     "(" <>
     " WITH s AS (SELECT row_to_json(source) as r from source limit 1)" <>
---    " SELECT string_agg(json_data.key || '=eq.' || json_data.value, '&')" <>
     " SELECT string_agg(json_data.key || '=' || coalesce( 'eq.' || json_data.value, 'is.null'), '&')" <>
     " FROM s, json_each_text(s.r) AS json_data" <>
     (