From 42eea68fb643a3c1eff61aa7c78f68e540a03150 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 30 Mar 2021 21:30:36 +0300
Subject: [PATCH] Support persistent 2.12

---
 .github/workflows/tests.yml             |  3 +++
 stack-persistent-212.yaml               | 20 ++++++++++++++++++++
 yesod-auth/ChangeLog.md                 |  4 ++++
 yesod-auth/yesod-auth.cabal             |  4 ++--
 yesod-persistent/ChangeLog.md           |  4 ++++
 yesod-persistent/Yesod/Persist/Core.hs  |  4 ++++
 yesod-persistent/yesod-persistent.cabal |  6 +++---
 7 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 stack-persistent-212.yaml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1bf32d17..2265e9ec 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,7 @@ jobs:
         - "--resolver lts-12"
         - "--resolver lts-11"
         - "--stack-yaml stack-persistent-211.yaml"
+        - "--stack-yaml stack-persistent-212.yaml"
         # Bugs in GHC make it crash too often to be worth running
         exclude:
           - os: windows-latest
@@ -29,6 +30,8 @@ jobs:
             args: "--resolver lts-16"
           - os: windows-latest
             args: "--stack-yaml stack-persistent-211.yaml"
+          - os: windows-latest
+            args: "--stack-yaml stack-persistent-212.yaml"
 
     steps:
       - name: Clone project
diff --git a/stack-persistent-212.yaml b/stack-persistent-212.yaml
new file mode 100644
index 00000000..b4087765
--- /dev/null
+++ b/stack-persistent-212.yaml
@@ -0,0 +1,20 @@
+resolver: nightly-2021-03-31
+packages:
+- ./yesod-core
+- ./yesod-static
+- ./yesod-persistent
+- ./yesod-newsfeed
+- ./yesod-form
+- ./yesod-form-multi
+- ./yesod-auth
+- ./yesod-auth-oauth
+- ./yesod-sitemap
+- ./yesod-test
+- ./yesod-bin
+- ./yesod
+- ./yesod-eventsource
+- ./yesod-websockets
+extra-deps:
+- persistent-2.12.0.1
+- persistent-template-2.12.0.0
+- persistent-sqlite-2.12.0.0
diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md
index fb9d5391..90f7d647 100644
--- a/yesod-auth/ChangeLog.md
+++ b/yesod-auth/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog for yesod-auth
 
+## 1.6.10.2
+
+* Relax bounds for persistent 2.12
+
 ## 1.6.10.1
 
 * Add support for Persistent 2.11 [#1701](https://github.com/yesodweb/yesod/pull/1701)
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 21d24b18..b6be336c 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,6 +1,6 @@
 cabal-version:   >=1.10
 name:            yesod-auth
-version:         1.6.10.1
+version:         1.6.10.2
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -44,7 +44,7 @@ library
                    , http-types
                    , memory
                    , nonce                   >= 1.0.2     && < 1.1
-                   , persistent              >= 2.8       && < 2.12
+                   , persistent              >= 2.8
                    , random                  >= 1.0.0.2
                    , safe
                    , shakespeare
diff --git a/yesod-persistent/ChangeLog.md b/yesod-persistent/ChangeLog.md
index 1aaa6c63..4a4b5dd7 100644
--- a/yesod-persistent/ChangeLog.md
+++ b/yesod-persistent/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog for yesod-persistent
 
+## 1.6.0.2
+
+* Add support for persistent 2.12
+
 ## 1.6.0.5
 
 * Add support for Persistent 2.11 [#1701](https://github.com/yesodweb/yesod/pull/1701)
diff --git a/yesod-persistent/Yesod/Persist/Core.hs b/yesod-persistent/Yesod/Persist/Core.hs
index 2e450366..b7c82baf 100644
--- a/yesod-persistent/Yesod/Persist/Core.hs
+++ b/yesod-persistent/Yesod/Persist/Core.hs
@@ -196,7 +196,11 @@ insert400 datum = do
     conflict <- checkUnique datum
     case conflict of
         Just unique ->
+#if MIN_VERSION_persistent(2, 12, 0)
+            badRequest' $ map (unFieldNameHS . fst) $ persistUniqueToFieldNames unique
+#else
             badRequest' $ map (unHaskellName . fst) $ persistUniqueToFieldNames unique
+#endif
         Nothing -> insert datum
 
 -- | Same as 'insert400', but doesn’t return a key.
diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal
index fb50543d..5bd21f5c 100644
--- a/yesod-persistent/yesod-persistent.cabal
+++ b/yesod-persistent/yesod-persistent.cabal
@@ -1,6 +1,6 @@
 cabal-version:   >= 1.10
 name:            yesod-persistent
-version:         1.6.0.5
+version:         1.6.0.6
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -17,8 +17,8 @@ library
     default-language: Haskell2010
     build-depends:   base                      >= 4.10     && < 5
                    , yesod-core                >= 1.6      && < 1.7
-                   , persistent                >= 2.8      && < 2.12
-                   , persistent-template       >= 2.1      && < 2.10
+                   , persistent                >= 2.8
+                   , persistent-template       >= 2.1
                    , transformers              >= 0.2.2
                    , blaze-builder
                    , conduit