wip

erikd · Jul 17, 2024 · 147a003 · 147a003
1 parent 05f719a
commit 147a003
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/persistent-postgresql/Database/Persist/Postgresql.hs b/persistent-postgresql/Database/Persist/Postgresql.hs
@@ -13,6 +13,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
 
 #if MIN_VERSION_base(4,12,0)
@@ -107,7 +108,7 @@ import Data.Either (partitionEithers)
 import Data.Function (on)
 import Data.Int (Int64)
 import Data.IORef
-import Data.List (find, foldl', groupBy, sort)
+import Data.List as List (find, foldl', groupBy, sort)
 import qualified Data.List as List
 import Data.List.NonEmpty (NonEmpty)
 import qualified Data.Map as Map
@@ -845,7 +846,7 @@ getColumns getter def cols = do
     refMap =
         fmap (\cr -> (crTableName cr, crConstraintName cr))
         $ Map.fromList
-        $ foldl' ref [] cols
+        $ List.foldl' ref [] cols
       where
         ref rs c =
             maybe rs (\r -> (unFieldNameDB $ cName c, r) : rs) (cReference c)

diff --git a/persistent-redis/tests/basic-test.hs b/persistent-redis/tests/basic-test.hs
@@ -8,6 +8,7 @@
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE TypeFamilies               #-}
+{-# LANGUAGE TypeOperators              #-}
 {-# LANGUAGE TypeSynonymInstances       #-}
 {-# LANGUAGE UndecidableInstances       #-}
 module Main where

diff --git a/persistent-test/src/EmbedTest.hs b/persistent-test/src/EmbedTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-orphans -O0 #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module EmbedTest (specsWith, cleanDB, embedMigrate) where

diff --git a/persistent-test/src/EmptyEntityTest.hs b/persistent-test/src/EmptyEntityTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module EmptyEntityTest (specsWith, migration, cleanDB) where
 

diff --git a/persistent-test/src/ForeignKey.hs b/persistent-test/src/ForeignKey.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE AllowAmbiguousTypes, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE ScopedTypeVariables, TypeApplications, UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 
 module ForeignKey where
 

diff --git a/persistent/Database/Persist/ImplicitIdDef/Internal.hs b/persistent/Database/Persist/ImplicitIdDef/Internal.hs
@@ -4,7 +4,8 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE TypeOperators #-}
 
 -- | WARNING: This is an @Internal@ module. As such, breaking changes to the API
 -- of this module will not have a corresponding major version bump.