Bring packages up to date (#722)

* Bring packages up to date

* New LTS includes deps now

Use stack to select most versions

* Alphabetize packages

* Strip down packages

Switch tests to protolude

* Appease cabal check with base version constraint
This commit is contained in:
Joe Nelson
2016-10-19 22:25:58 -07:00
committed by GitHub
parent 726b2b9d18
commit 74e68408e6
19 changed files with 72 additions and 123 deletions
+2 -2
View File
@@ -19,7 +19,6 @@ module PostgREST.Config ( prettyVersion
)
where
import Control.Applicative
import qualified Data.ByteString.Char8 as BS
import qualified Data.CaseInsensitive as CI
import Data.List (lookup)
@@ -29,7 +28,8 @@ import Network.Wai
import Network.Wai.Middleware.Cors (CorsResourcePolicy (..))
import Options.Applicative
import Paths_postgrest (version)
import Protolude hiding (intercalate)
import Protolude hiding (intercalate
, (<>))
import Safe (readMay)
-- | Data type to store all command line options
-1
View File
@@ -15,7 +15,6 @@ import qualified Hasql.Query as H
import Control.Applicative
import Data.List (elemIndex)
import Data.Maybe (fromJust)
import Data.Monoid
import Data.Text (split, strip,
breakOn, dropAround)
import qualified Data.Text as T
+1 -2
View File
@@ -35,7 +35,6 @@ import qualified Hasql.Decoders as HD
import qualified Data.Aeson as JSON
import PostgREST.RangeQuery (NonnegRange, rangeLimit, rangeOffset, allRange)
import Control.Error (note, hush)
import Data.Functor.Contravariant (contramap)
import qualified Data.HashMap.Strict as HM
import Data.Text (intercalate, unwords, replace, isInfixOf, toLower, split)
@@ -361,7 +360,7 @@ requestToQuery schema isParent (DbRead (Node (Select colSelects tbls conditions
<> "FROM (" <> subquery <> ") " <> pgFmtIdent table
<> "), '[]') AS " <> pgFmtIdent (fromMaybe name alias)
where subquery = requestToQuery schema False (DbRead (Node n forst))
getQueryParts (Node n@(_, (name, Just r@Relation{relType=Parent,relTable=Table{tableName=table}}, alias)) forst) (j,s) = (joi:j,sel:s)
where
node_name = fromMaybe name alias