Merge origin/master into getByNullDocumentation

Author: jkeuhlen

.github/workflows/haskell.yml

@@ -86,7 +86,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
             ${{ runner.os }}-${{ matrix.ghc }}-
-      - run: cabal v2-build all --disable-optimization --only-dependencies $CONFIG
       - run: cabal v2-build all --disable-optimization $CONFIG
       - run: cabal v2-test all --disable-optimization $CONFIG --test-options "--fail-on-focus"
       - run: cabal v2-bench all --disable-optimization $CONFIG

cabal.project

@@ -18,6 +18,7 @@ allow-newer:
     , postgresql-simple:base
     , postgresql-simple:template-haskell
     , bytestring-lexing:base
+    , postgresql-simple-interval:persistent
 
 source-repository-package
     type: git

persistent-mysql/ChangeLog.md

@@ -1,5 +1,10 @@
 # Changelog for persistent-mysql
 
+##  2.13.1.6
+
+* [#1610](https://github.com/yesodweb/persistent/pull/1610)
+    * Added `NoAction` as a `CascadeAction` 
+
 ##  2.13.1.5
 
 * [#1526](https://github.com/yesodweb/persistent/pull/1526)

persistent-mysql/Database/Persist/MySQL.hs

@@ -854,7 +854,7 @@ getColumn
                         "CASCADE" -> Just Cascade
                         "SET NULL" -> Just SetNull
                         "SET DEFAULT" -> Just SetDefault
-                        "NO ACTION" -> Nothing
+                        "NO ACTION" -> Just NoAction
                         _ ->
                             error $ "Unexpected value in parseCascadeAction: " <> show txt
 
@@ -1506,15 +1506,18 @@ data HandleUpdateCollision record where
     -- | Only copy the field if it is not equal to the provided value.
     CopyUnlessEq
         :: (PersistField typ)
-        => EntityField record typ -> typ -> HandleUpdateCollision record
+        => EntityField record typ
+        -> typ
+        -> HandleUpdateCollision record
 
 -- | Copy the field into the database only if the value in the
 -- corresponding record is non-@NULL@.
 --
 -- @since  2.6.2
 copyUnlessNull
     :: (PersistField typ)
-    => EntityField record (Maybe typ) -> HandleUpdateCollision record
+    => EntityField record (Maybe typ)
+    -> HandleUpdateCollision record
 copyUnlessNull field = CopyUnlessEq field Nothing
 
 -- | Copy the field into the database only if the value in the
@@ -1527,7 +1530,8 @@ copyUnlessNull field = CopyUnlessEq field Nothing
 -- @since  2.6.2
 copyUnlessEmpty
     :: (Monoid.Monoid typ, PersistField typ)
-    => EntityField record typ -> HandleUpdateCollision record
+    => EntityField record typ
+    -> HandleUpdateCollision record
 copyUnlessEmpty field = CopyUnlessEq field Monoid.mempty
 
 -- | Copy the field into the database only if the field is not equal to the
@@ -1540,7 +1544,9 @@ copyUnlessEmpty field = CopyUnlessEq field Monoid.mempty
 -- @since  2.6.2
 copyUnlessEq
     :: (PersistField typ)
-    => EntityField record typ -> typ -> HandleUpdateCollision record
+    => EntityField record typ
+    -> typ
+    -> HandleUpdateCollision record
 copyUnlessEq = CopyUnlessEq
 
 -- | Copy the field directly from the record.

persistent-mysql/persistent-mysql.cabal

@@ -1,5 +1,5 @@
 name:               persistent-mysql
-version:            2.13.1.5
+version:            2.13.1.6
 license:            MIT
 license-file:       LICENSE
 author:             Felipe Lessa <felipe.lessa@gmail.com>, Michael Snoyman
@@ -40,7 +40,7 @@ library
     , monad-logger
     , mysql          >=0.2.1  && <0.3
     , mysql-simple   >=0.4.7  && <0.5
-    , persistent     >=2.13.3 && <3
+    , persistent     >=2.18   && <3
     , resource-pool
     , resourcet      >=1.1
     , text           >=1.2

persistent-postgresql/ChangeLog.md

@@ -1,5 +1,30 @@
 # Changelog for persistent-postgresql
 
+# 2.14.2.0
+
+* [#1614](https://github.com/yesodweb/persistent/pull/1614)
+  * Generate migrations to create foreign key constraints while adding new foreign key columns (previously you had to generate migrations twice to create foreign key constraints)
+
+# 2.14.1.0
+
+* [#1612](https://github.com/yesodweb/persistent/pull/1612)
+  * Speed up migrations by avoiding N+1 queries.
+    You can now migrate a large set of entities much faster, by using the new `migrateEntitiesStructured` function.
+
+# 2.14.0.1
+
+* [#1610](https://github.com/yesodweb/persistent/pull/1610)
+  * Update suggested migrations to handle `NoAction` as a `CascadeAction`  
+
+## 2.14.0.0
+
+* [#1604](https://github.com/yesodweb/persistent/pull/1604)
+    * Changed the representation of intervals to use the `Interval` type from [the `postgresql-simple-interval` package](https://hackage.haskell.org/package/postgresql-simple-interval).
+      This changes the behavior of `PgInterval` for very small and very large values.
+    * Previously `PgInterval 0.000_000_9` would be rounded to `0.000_001` seconds, but now it is truncated to 0 seconds.
+    * Previously `PgInterval 9_223_372_036_854.775_808` would overflow and throw a SQL error, but now it saturates to `9_223_372_036_854.775_807` seconds.
+    * The SQL representation of `PgInterval` now always includes the `interval` prefix, like `interval '1 second'`.
+
 ## 2.13.7.0
 
 * [#1600](https://github.com/yesodweb/persistent/pull/1600)