persistent-2.10 support (#122)

* persistent-2.10 support * ignore cabal file * 3.0.0 * update changelog [ci skip]
bitemyapp · Apr 23, 2019 · 7b7717b · 7b7717b
1 parent a0274e3
commit 7b7717b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 174 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 .cabal-sandbox/
 cabal.sandbox.config
 .hspec-failures
+esqueleto.cabal
diff --git a/.travis.yml b/.travis.yml
@@ -34,9 +34,7 @@ script:
   - stack setup
   - stack update
   - stack build
-  - stack test -- esqueleto:postgresql
-  - stack test -- esqueleto:sqlite
-  - stack test -- esqueleto:mysql || exit 0  # TODO: Remove that exit 0 when mysql tests are checking correctly
+  - stack test
   - cd test/expected-compile-failures/
   - bash test.sh
 

diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,13 @@
 Unreleased
 ========
 
+3.0.0
+=======
+
+- @parsonsmatt
+  - [#122](https://github.com/bitemyapp/esqueleto/pull/122): Support `persistent-2.10.0`. This is a breaking change due to the removal of deprecated exports from the `persistent` library.
+  - [#113](https://github.com/bitemyapp/esqueleto/pull/113): Remove the `esqueleto` type class. To migrate here, use `SqlExpr`, `SqlQuery`, and `SqlBackend` instead of using the polymorphic `Esqueleto sqlExpr sqlQuery sqlBackend => ...` types.
+
 2.7.0
 =======
 

diff --git a/esqueleto.cabal b/esqueleto.cabal
diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name: esqueleto
-version: 2.7.0
+version: 3.0.0
 synopsis: Type-safe EDSL for SQL queries on persistent backends.
 description: ! '@esqueleto@ is a bare bones, type-safe EDSL for SQL queries
   that works with unmodified @persistent@ SQL backends.  Its
@@ -51,7 +51,7 @@ dependencies:
   - bytestring
   - conduit >=1.3
   - monad-logger
-  - persistent >=2.8.0 && <2.10
+  - persistent >=2.8.0 && <2.11
   - resourcet >=1.2
   - tagged >=0.2
   - text >=0.11 && <1.3

diff --git a/src/Database/Esqueleto/Internal/PersistentImport.hs b/src/Database/Esqueleto/Internal/PersistentImport.hs
@@ -97,13 +97,11 @@ module Database.Esqueleto.Internal.PersistentImport
   RawSql(..),
   CautiousMigration,
   Column(..),
-  Connection,
   ConnectionPool,
   Migration,
   PersistentSqlException(..),
   Single(..),
   Sql,
-  SqlPersist,
   SqlPersistM,
   SqlPersistT,
   InsertSqlResult(..),

diff --git a/stack-8.6.yaml b/stack-8.6.yaml
@@ -1,5 +1,12 @@
-# TODO: switch resolver to lts-13.x once that is released
-resolver: nightly-2018-12-05
+resolver: lts-13.6
 
 packages:
 - '.'
+
+extra-deps:
+- persistent-2.10.0
+- persistent-template-2.7.0
+- persistent-mysql-2.10.0
+- persistent-postgresql-2.10.0
+- postgresql-simple-0.6.1
+- persistent-sqlite-2.10.0
diff --git a/stack.yaml b/stack.yaml
@@ -1 +1 @@
-stack-8.4.yaml
+stack-8.6.yaml
diff --git a/test/Common/Test.hs b/test/Common/Test.hs
@@ -2,6 +2,7 @@
 {-# OPTIONS_GHC -fno-warn-deprecations  #-}
 {-# LANGUAGE ConstraintKinds
            , CPP
+           , UndecidableInstances
            , EmptyDataDecls
            , FlexibleContexts
            , FlexibleInstances
@@ -88,7 +89,7 @@ share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistUpperCase|
     age Int Maybe
     weight Int Maybe
     favNum Int
-    deriving Eq Show
+    deriving Eq Show Ord
   BlogPost
     title String
     authorId PersonId
@@ -1123,8 +1124,7 @@ testListOfValues run = do
                      return (bp ^. BlogPostAuthorId)
                where_ (p ^. PersonId `in_` subList_select subquery)
                return p
-        liftIO $ ret `shouldBe` [ Entity p1k p1
-                                , Entity p3k p3 ]
+        liftIO $ L.sort ret `shouldBe` L.sort [Entity p1k p1, Entity p3k p3]
 
     it "NOT IN works for subList_select" $
       run $ do