Skip to content

Commit 5865b99

Browse files
naushadhnaushadh
committed
Merged master into etl2.
Conflicts: - persistent-postgresql/Database/Persist/Postgresql.hs - persistent/Database/Persist/Sql/Orphan/PersistStore.hs
2 parents 81425c0 + b7f0194 commit 5865b99

33 files changed

Lines changed: 317 additions & 279 deletions

‎.travis.yml‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ addons:
55
apt:
66
packages:
77
- libgmp-dev
8-
- cabal-install-1.24
9-
sources:
10-
- hvr-ghc
118
postgresql: "9.6"
129

1310
services:
@@ -17,37 +14,28 @@ services:
1714

1815
matrix:
1916
include:
20-
- env: ARGS="--resolver lts-2" BACKEND=none
21-
- env: ARGS="--resolver lts-2" BACKEND=sqlite
22-
- env: ARGS="--resolver lts-2" BACKEND=mongodb
23-
- env: ARGS="--resolver lts-2" BACKEND=postgresql
24-
- env: ARGS="--resolver lts-2" BACKEND=mysql
25-
2617
- env: ARGS="--resolver lts-6" BACKEND=none
27-
- env: ARGS="--resolver lts-6" BACKEND=sqlite
28-
- env: ARGS="--resolver lts-6" BACKEND=mongodb
29-
- env: ARGS="--resolver lts-6" BACKEND=postgresql
30-
- env: ARGS="--resolver lts-6" BACKEND=mysql
18+
- env: ARGS="--resolver lts-7" BACKEND=none
19+
- env: ARGS="--resolver lts-9" BACKEND=none
20+
- env: ARGS="--resolver lts-10" BACKEND=none
21+
22+
- env: ARGS="--resolver lts-9" BACKEND=sqlite
23+
- env: ARGS="--resolver lts-9" BACKEND=mongodb
24+
- env: ARGS="--resolver lts-9" BACKEND=postgresql
25+
- env: ARGS="--resolver lts-9" BACKEND=mysql
3126

32-
- env: ARGS="" BACKEND=none
33-
- env: ARGS="" BACKEND=sqlite
34-
- env: ARGS="" BACKEND=mongodb
35-
- env: ARGS="" BACKEND=postgresql
36-
- env: ARGS="" BACKEND=mysql
27+
- env: ARGS="--resolver lts-10" BACKEND=sqlite
28+
- env: ARGS="--resolver lts-10" BACKEND=mongodb
29+
- env: ARGS="--resolver lts-10" BACKEND=postgresql
30+
- env: ARGS="--resolver lts-10" BACKEND=mysql
3731

3832
before_install:
3933
# Download and unpack the stack executable
4034
- mkdir -p ~/.local/bin
41-
- export PATH=$HOME/.local/bin:/opt/cabal/1.24/bin:$PATH
35+
- export PATH=$HOME/.local/bin:$PATH
4236
- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
4337

44-
# *TEMPORARY* A proposed change #717 uses haskell-src-meta, which requires
45-
# `happy` to build haskell-src-exts. This fails in lts-2. Revert to the
46-
# commented out line if #717 is not merged, or when testing lts-2 is dropped.
47-
# script: travis/run.sh
48-
script:
49-
- if [[ $ARGS =~ lts-2 ]]; then stack $ARGS --install-ghc install happy; fi
50-
- travis/run.sh
38+
script: travis/run.sh
5139

5240
cache:
5341
directories:
@@ -60,7 +48,3 @@ cache:
6048
# packages:
6149
# - libzookeeper-mt-dev
6250
# - zookeeperd
63-
64-
after_failure:
65-
- cat ~/.cabal/logs/*log
66-

‎persistent-mongoDB/ChangeLog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.8.0
2+
3+
* Switch from `MonadBaseControl` to `MonadUnliftIO`
4+
15
## 2.6.0
26

37
* Fix upsert behavior [#613](https://github.com/yesodweb/persistent/issues/613)

‎persistent-mongoDB/Database/Persist/MongoDB.hs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ import Data.Bits (shiftR)
152152
import Data.Word (Word16)
153153
import Data.Monoid (mappend)
154154
import Control.Monad.Trans.Reader (ask, runReaderT)
155-
import Control.Monad.Trans.Control (MonadBaseControl)
155+
import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO)
156156
import Numeric (readHex)
157157
import Unsafe.Coerce (unsafeCoerce)
158158

@@ -362,17 +362,21 @@ withMongoDBPool dbname hostname port mauth poolStripes stripeConnections connect
362362
connectionReader pool
363363

364364
-- | run a pool created with 'createMongoDBPipePool'
365-
runMongoDBPipePool :: (Trans.MonadIO m, MonadBaseControl IO m) => DB.AccessMode -> Database -> DB.Action m a -> PipePool -> m a
365+
runMongoDBPipePool :: MonadUnliftIO m => DB.AccessMode -> Database -> DB.Action m a -> PipePool -> m a
366366
runMongoDBPipePool accessMode db action pool =
367-
Pool.withResource pool $ \pipe -> DB.access pipe accessMode db action
367+
withRunInIO $ \run ->
368+
Pool.withResource pool $ \pipe ->
369+
run $ DB.access pipe accessMode db action
368370

369-
runMongoDBPool :: (Trans.MonadIO m, MonadBaseControl IO m) => DB.AccessMode -> DB.Action m a -> ConnectionPool -> m a
371+
runMongoDBPool :: MonadUnliftIO m => DB.AccessMode -> DB.Action m a -> ConnectionPool -> m a
370372
runMongoDBPool accessMode action pool =
371-
Pool.withResource pool $ \(Connection pipe db) -> DB.access pipe accessMode db action
373+
withRunInIO $ \run ->
374+
Pool.withResource pool $ \(Connection pipe db) ->
375+
run $ DB.access pipe accessMode db action
372376

373377

374378
-- | use default 'AccessMode'
375-
runMongoDBPoolDef :: (Trans.MonadIO m, MonadBaseControl IO m) => DB.Action m a -> ConnectionPool -> m a
379+
runMongoDBPoolDef :: MonadUnliftIO m => DB.Action m a -> ConnectionPool -> m a
376380
runMongoDBPoolDef = runMongoDBPool defaultAccessMode
377381

378382
queryByKey :: (PersistEntity record, PersistEntityBackend record ~ DB.MongoContext)

‎persistent-mongoDB/persistent-mongoDB.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: persistent-mongoDB
2-
version: 2.6.0
2+
version: 2.8.0
33
license: MIT
44
license-file: LICENSE
55
author: Greg Weber <greg@gregweber.info>
@@ -19,8 +19,8 @@ Flag high_precision_date
1919
Default: False
2020

2121
library
22-
build-depends: base >= 4.6 && < 5
23-
, persistent >= 2.5 && < 3
22+
build-depends: base >= 4.8 && < 5
23+
, persistent >= 2.8 && < 3
2424
, text >= 0.8
2525
, transformers >= 0.2.1
2626
, containers >= 0.2
@@ -33,12 +33,12 @@ library
3333
, cereal >= 0.3.0.0
3434
, path-pieces >= 0.1
3535
, http-api-data >= 0.2 && < 0.4
36-
, monad-control >= 0.3
3736
, aeson >= 0.6.2
3837
, attoparsec
3938
, time
4039
, bytestring
4140
, resource-pool < 0.3
41+
, unliftio-core
4242

4343
exposed-modules: Database.Persist.MongoDB
4444
ghc-options: -Wall

‎persistent-mysql/ChangeLog.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
## Unreleased
1+
## 2.8.0 (Unreleased)
22

3+
* Switch from `MonadBaseControl` to `MonadUnliftIO`
34
* Fix duplicate migrations when using `mediumtext`, `longtext`, `mediumblob`, `longblob`, and `double`s using a custom precision. [#754](https://github.com/yesodweb/persistent/pull/754)
45

56
-- This can be released as a minor change on the next update. Currently persistent-mysql can't be released because 2.6.2.2 depends on persistent-2.7.2 being released.
67

8+
* The `SomeField` type was renamed to `HandleUpdateCollision` and deprecated. Please migrate to using `HandleUpdateCollision`.
9+
* The `SomeField` constructor was deprecated, and a temporary pattern synonym introduced. Please migrate to using `copyField`.
10+
711
## 2.6.2.2 [UNRELEASED ON HACKAGE]
812

913
-- This version depends on persistent 2.7.2, which introduced breaking changes and is deprecated on hackage.

0 commit comments

Comments
 (0)