From cfe36707d9d022c2959940566cc03353ea7e3238 Mon Sep 17 00:00:00 2001 From: Adrien Duclos Date: Fri, 22 Jan 2021 13:04:50 +0100 Subject: Bump the LTS to 16.31 --- src/Squeal/PostgreSQL/Hspec.hs | 7 +++---- stack.yaml | 8 ++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Squeal/PostgreSQL/Hspec.hs b/src/Squeal/PostgreSQL/Hspec.hs index 32ab189..7e78fa7 100644 --- a/src/Squeal/PostgreSQL/Hspec.hs +++ b/src/Squeal/PostgreSQL/Hspec.hs @@ -24,8 +24,7 @@ import Control.Monad import Control.Monad.Base (liftBase) import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as BSC -import qualified Database.Postgres.Temp as Temp -import Generics.SOP (K) +import Database.Postgres.Temp as Temp import Squeal.PostgreSQL import System.Environment (lookupEnv) import Test.Hspec @@ -53,8 +52,8 @@ getOrCreateConnectionString = do createTempDB :: IO (ByteString, Maybe Temp.DB) createTempDB = do - tempDB <- either throwIO return =<< Temp.startAndLogToTmp [] - let connectionString = BSC.pack (Temp.connectionString tempDB) + tempDB <- either throwIO return =<< Temp.start + let connectionString = Temp.toConnectionString tempDB pure (connectionString, Just tempDB) -- | Start a temporary @postgres@ process and create a pool of connections to it diff --git a/stack.yaml b/stack.yaml index 029fe93..647da5a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,7 +18,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-13.20 +resolver: lts-16.31 # User packages to be built. # Various formats can be used as shown in the example below. @@ -41,13 +41,9 @@ packages: # (e.g., acme-missiles-0.3) extra-deps: - git: https://github.com/morphismtech/squeal - commit: 9b5c1f78097f531a66da8cca267e2ad6c1d227e6 + commit: 7557c2ddd32430ed82937a7864e5879b1ac77513 subdirs: - squeal-postgresql - - unliftio-pool-0.2.1.0@sha256:4de658feb1b10051c5af024c20cd7baa369c777716c54a7b3e2888a73286aecf - - free-categories-0.2.0.0 - - records-sop-0.1.0.2 - - tmp-postgres-0.1.1.0 # Override default flag values for local packages and extra-deps # flags: {} -- cgit v1.2.3