haskell/esqueleto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #141 from JoseD92/140-Fix-esqueleto-CI-failing

Browse Source 
Fix esqueleto CI failing
This commit is contained in:
Chris Allen 2019-09-20 09:07:21 -05:00 committed by GitHub
commit 3db6361d2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -16,7 +16,7 @@ addons:
env: env:
global: global:
- PGPORT=5433 - PGPORT=5432
matrix: matrix:
- GHCVER=8.2 - GHCVER=8.2
- GHCVER=8.4 - GHCVER=8.4
@ -28,7 +28,7 @@ install:
- export PATH=$HOME/.local/bin:$PATH - export PATH=$HOME/.local/bin:$PATH
- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
- stack --version - stack --version
- echo "CREATE USER esqutest WITH PASSWORD 'esqutest';" | psql postgres - psql -c "CREATE USER esqutest WITH PASSWORD 'esqutest';" -U postgres
- createdb -O esqutest esqutest - createdb -O esqutest esqutest
- mysql -e 'CREATE DATABASE esqutest;' - mysql -e 'CREATE DATABASE esqutest;'

2
examples/Main.hs
View File

@ -238,4 +238,4 @@ main = do
where where
say :: (MonadIO m, Show a) => a -> m () say :: (MonadIO m, Show a) => a -> m ()
say = liftIO . print say = liftIO . print
connection = "host=localhost port=5433 user=postgres dbname=esqueleto_blog_example password=***" connection = "host=localhost port=5432 user=postgres dbname=esqueleto_blog_example password=***"

2
test/PostgreSQL/Test.hs
View File

@ -1057,7 +1057,7 @@ migrateIt = do
withConn :: RunDbMonad m => (SqlBackend -> R.ResourceT m a) -> m a withConn :: RunDbMonad m => (SqlBackend -> R.ResourceT m a) -> m a
withConn = withConn =
R.runResourceT . withPostgresqlConn "host=localhost port=5433 user=esqutest password=esqutest dbname=esqutest" R.runResourceT . withPostgresqlConn "host=localhost port=5432 user=esqutest password=esqutest dbname=esqutest"
-- | Show the SQL generated by a query -- | Show the SQL generated by a query
showQuery :: (Monad m, ES.SqlSelect a r, BackendCompatible SqlBackend backend) showQuery :: (Monad m, ES.SqlSelect a r, BackendCompatible SqlBackend backend)