Changelog for 0.0.4.3

tchoutri · Jun 26, 2023 · bf72899 · bf72899
1 parent fedcd75
commit bf72899
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Revision history for Entity
 
-## 0.0.4.0 -- YYYY-mm-dd
+## 0.0.4.3 -- 2023-06-26
 * Fix the URL of the tutorial
+* Bump version bounds for `base`, `resource-pool` and `template-haskell` 
+* Bump supported minor GHC versions
+* Internalise `Database.PostgreSQL.Entity.Internal.BlogPost` for the tests
 
 ## 0.0.3.0 -- 2022-10-30
 

diff --git a/Makefile b/Makefile
@@ -21,8 +21,8 @@ lint: ## Run the code linter (HLint)
 	@find test src -name "*.hs" | xargs -P $(PROCS) -I {} hlint --refactor-options="-i" --refactor {}
 
 style: ## Run the code styler (stylish-haskell)
-	@find docs/src test src -name "*.hs" | xargs -P $(PROCS) -I {} fourmolu -q --mode inplace {}
 	@cabal-fmt -i *.cabal
+	@find docs/src test src -name "*.hs" | xargs -P $(PROCS) -I {} fourmolu -q --mode inplace {}
 
 docs-build: ## Generate the documentation
 	@cd docs; mkdocs build

diff --git a/environment.sh b/environment.sh
@@ -6,3 +6,5 @@ export DB_PORT="5432"
 
 export DB_CONNSTRING="host=${DB_HOST} dbname=${DB_DATABASE} \
   user=${DB_USER} password=${DB_PASSWORD} port=${DB_PORT}"
+
+export PGPASSWORD=${DB_PASSWORD}
diff --git a/pg-entity.cabal b/pg-entity.cabal
@@ -98,7 +98,6 @@ library
     Database.PostgreSQL.Entity
     Database.PostgreSQL.Entity.DBT
     Database.PostgreSQL.Entity.Internal
-    Database.PostgreSQL.Entity.Internal.BlogPost
     Database.PostgreSQL.Entity.Internal.QQ
     Database.PostgreSQL.Entity.Internal.Unsafe
     Database.PostgreSQL.Entity.Types
@@ -158,6 +157,7 @@ test-suite entity-test
   type:           exitcode-stdio-1.0
   main-is:        Main.hs
   other-modules:
+    BlogPost
     EntitySpec
     GenericsSpec
     Utils

diff --git a/...se/PostgreSQL/Entity/Internal/BlogPost.hs → test/BlogPost.hs b/...se/PostgreSQL/Entity/Internal/BlogPost.hs → test/BlogPost.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE StrictData #-}
 
 {-|
-  Module      : Database.PostgreSQL.Entity.Internal.BlogPost
+  Module      : BlogPost
   Copyright   : © Clément Delafargue, 2018
                   Théophile Choutri, 2021
                   Koz Ross, 2021
@@ -16,7 +16,7 @@
 
   The models described in this module are used throughout the library's tests and docspecs.
 -}
-module Database.PostgreSQL.Entity.Internal.BlogPost where
+module BlogPost where
 
 import Data.Text (Text)
 import Data.Time (UTCTime)

diff --git a/test/EntitySpec.hs b/test/EntitySpec.hs
@@ -4,6 +4,16 @@
 
 module EntitySpec where
 
+import BlogPost
+  ( Author (..)
+  , AuthorId (..)
+  , BlogPost (..)
+  , bulkInsertAuthors
+  , bulkInsertBlogPosts
+  , insertAuthor
+  , insertBlogPost
+  , upsertBlogPost
+  )
 import Control.Monad (void)
 import Control.Monad.IO.Class
 import Data.Text (Text)
@@ -26,16 +36,6 @@ import Database.PostgreSQL.Entity
   , _where
   )
 import Database.PostgreSQL.Entity.DBT (QueryNature (..), query)
-import Database.PostgreSQL.Entity.Internal.BlogPost
-  ( Author (..)
-  , AuthorId (..)
-  , BlogPost (..)
-  , bulkInsertAuthors
-  , bulkInsertBlogPosts
-  , insertAuthor
-  , insertBlogPost
-  , upsertBlogPost
-  )
 import Database.PostgreSQL.Simple (Only (Only))
 import Database.PostgreSQL.Transact (DBT)
 

diff --git a/test/GenericsSpec.hs b/test/GenericsSpec.hs
@@ -3,14 +3,14 @@
 
 module GenericsSpec where
 
+import BlogPost
 import Data.Aeson
 import Data.Text
 import Data.Time
 import Data.UUID
 import Data.Vector
 import Database.PostgreSQL.Entity
 import Database.PostgreSQL.Entity.Internal (getTableName)
-import Database.PostgreSQL.Entity.Internal.BlogPost
 import Database.PostgreSQL.Entity.Internal.Unsafe (Field (Field))
 import Database.PostgreSQL.Entity.Types
 import Database.PostgreSQL.Simple

diff --git a/test/Utils.hs b/test/Utils.hs
@@ -29,7 +29,7 @@ import Test.Tasty (TestTree)
 import qualified Test.Tasty as Test
 import qualified Test.Tasty.HUnit as Test
 
-import Database.PostgreSQL.Entity.Internal.BlogPost
+import BlogPost
 import qualified Database.PostgreSQL.Simple as PG
 import Database.PostgreSQL.Simple.Migration
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,5 @@ export DB_PORT="5432"

		export DB_CONNSTRING="host=${DB_HOST} dbname=${DB_DATABASE} \
		user=${DB_USER} password=${DB_PASSWORD} port=${DB_PORT}"

		export PGPASSWORD=${DB_PASSWORD}