Merge pull request #27 from brandonchinn178/test-other-dbs

Run integration tests in PostgreSQL

Author: brandonchinn178

.circleci/config.yml

@@ -9,16 +9,28 @@ executors:
       stack_yaml:
         type: string
         default: stack.yaml
-      latest:
-        type: boolean
-        default: false
 
     docker:
       - image: cimg/base:2020.01
     shell: /bin/bash -eux -o pipefail
     environment:
       STACK_YAML: << parameters.stack_yaml >>
-      CI_LATEST: <<# parameters.latest >>1<</ parameters.latest >>
+
+  ubuntu_with_databases:
+    parameters:
+      stack_yaml:
+        type: string
+        default: stack.yaml
+
+    docker:
+      - image: cimg/base:2020.01
+      - image: postgres:13.1
+        environment:
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: persistent_mtl
+    shell: /bin/bash -eux -o pipefail
+    environment:
+      STACK_YAML: << parameters.stack_yaml >>
 
 commands:
   install_stack:
@@ -30,6 +42,17 @@ commands:
             curl -sSL https://get.haskellstack.org/ | sh
             stack --version
 
+  build_stack_deps:
+    steps:
+      - run:
+          name: Install system dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y postgresql libpq-dev
+      - run:
+          name: Build stack dependencies
+          command: stack build --test --only-dependencies
+
   with_stack_cache:
     parameters:
       install_deps:
@@ -101,18 +124,15 @@ jobs:
         default: false
 
     executor:
-      name: ubuntu
+      name: ubuntu_with_databases
       stack_yaml: << parameters.stack_yaml >>
-      latest: << parameters.latest >>
 
     steps:
       - checkout
       - install_stack
       - with_stack_cache:
           install_deps:
-            - run:
-                name: Build external dependencies
-                command: stack build --test --only-dependencies
+            - build_stack_deps
             - when:
                 condition: << parameters.latest >>
                 steps:
@@ -140,6 +160,8 @@ jobs:
                 <<# parameters.latest >>--coverage<</ parameters.latest >>
             )
             stack build "${STACK_ARGS[@]}"
+          environment:
+            TEST_POSTGRESQL: 1
       - when:
           condition: << parameters.latest >>
           steps:
@@ -156,9 +178,7 @@ jobs:
       - install_stack
       - with_stack_cache:
           install_deps:
-            - run:
-                name: Build external dependencies
-                command: stack build --test --only-dependencies
+            - build_stack_deps
       - run:
           name: Build haddock
           command: stack haddock --no-haddock-deps

package.yaml

@@ -43,8 +43,10 @@ tests:
       - monad-logger
       - persistent
       - persistent-mtl
+      - persistent-postgresql
       - persistent-sqlite
       - persistent-template
+      - resource-pool
       - resourcet
       - tasty
       - tasty-golden

persistent-mtl.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 9b6ae20631ee5ad633b82ab405f64730ea1603ef8da2099ea41ef126cab9d817
+-- hash: a6b1252a25af52e3ddd10e843b4818e0255c269dfbc6a399eb29e41093ef0408
 
 name:           persistent-mtl
 version:        0.1.0.1
@@ -66,6 +66,7 @@ test-suite persistent-mtl-test
       Mocked
       MockSqlQueryT
       SqlQueryRepTest
+      TestUtils.DB
       TestUtils.Match
       Paths_persistent_mtl
   hs-source-dirs:
@@ -79,8 +80,10 @@ test-suite persistent-mtl-test
     , monad-logger
     , persistent
     , persistent-mtl
+    , persistent-postgresql
     , persistent-sqlite
     , persistent-template
+    , resource-pool
     , resourcet
     , tasty
     , tasty-golden

stack-ghc-8.10.yaml

@@ -5,6 +5,7 @@ extra-deps:
   # https://github.com/commercialhaskell/stackage/pull/5761
   - persistent-2.11.0.1
   - persistent-template-2.9.1.0
+  - persistent-postgresql-2.11.0.0
   - persistent-sqlite-2.11.0.0
 
 ghc-options:

test/Example.hs

@@ -40,11 +40,9 @@ module Example
 
 import Control.Arrow ((&&&))
 import Control.Monad.IO.Class (MonadIO(..))
-import Control.Monad.Logger (runNoLoggingT)
 import Control.Monad.Trans.Resource (MonadResource, ResourceT, runResourceT)
-import qualified Data.Text as Text
-import Database.Persist.Sql (Entity(..), EntityField, Key, Unique, toSqlKey)
-import Database.Persist.Sqlite (withSqlitePool)
+import Database.Persist.Sql
+    (Entity(..), EntityField, Key, SelectOpt(..), Unique, toSqlKey)
 import Database.Persist.TH
     ( mkDeleteCascade
     , mkMigrate
@@ -53,9 +51,10 @@ import Database.Persist.TH
     , share
     , sqlSettings
     )
-import UnliftIO (MonadUnliftIO(..), withSystemTempDirectory, wrappedWithRunInIO)
+import UnliftIO (MonadUnliftIO(..), wrappedWithRunInIO)
 
 import Database.Persist.Monad
+import TestUtils.DB (BackendType(..), withTestDB)
 
 share
   [ mkPersist sqlSettings
@@ -103,14 +102,12 @@ newtype TestApp a = TestApp
 instance MonadUnliftIO TestApp where
   withRunInIO = wrappedWithRunInIO TestApp unTestApp
 
-runTestApp :: TestApp a -> IO a
-runTestApp m =
-  withSystemTempDirectory "persistent-mtl-testapp" $ \dir -> do
-    let db = Text.pack $ dir ++ "/db.sqlite"
-    runNoLoggingT $ withSqlitePool db 5 $ \pool ->
-      liftIO . runResourceT . runSqlQueryT pool . unTestApp $ do
-        _ <- runMigrationSilent migration
-        m
+runTestApp :: BackendType -> TestApp a -> IO a
+runTestApp backendType m =
+  withTestDB backendType $ \pool ->
+    runResourceT . runSqlQueryT pool . unTestApp $ do
+      _ <- runMigrationSilent migration
+      m
 
 {- Person functions -}
 
@@ -121,7 +118,7 @@ getName :: Entity Person -> String
 getName = personName . entityVal
 
 getPeople :: MonadSqlQuery m => m [Person]
-getPeople = map entityVal <$> selectList [] []
+getPeople = map entityVal <$> selectList [] [Asc PersonId]
 
 getPeopleNames :: MonadSqlQuery m => m [String]
 getPeopleNames = map personName <$> getPeople