warnings, more tidying up

esqueleto.cabal

@@ -61,10 +61,18 @@ library
       , transformers >=0.2
       , unliftio
       , unordered-containers >=0.2
-  if impl(ghc >=8.0)
-    ghc-options: -Wall -Wno-redundant-constraints
-  else
-    ghc-options: -Wall
+    ghc-options: 
+        -Wall 
+        -Wno-redundant-constraints 
+        -Wincomplete-uni-patterns
+        -Wincomplete-record-updates
+        -Wpartial-fields
+        -Wmissing-home-modules
+        -Widentities
+        -Wredundant-constraints
+        -Wcpp-undef 
+        -Wcpp-undef
+        -Wmonomorphism-restriction
     default-language: Haskell2010
 
 test-suite mysql

src/Database/Esqueleto/Internal/Internal.hs

@@ -560,10 +560,23 @@ e ^. field
             case e of
                 EEntity ident -> ident
                 EAliasedEntity baseI _ -> baseI
+                EAliasedEntityReference a b ->
+                    error $ unwords
+                        [ "Used (^.) with an EAliasedEntityReference."
+                        , "Please file this as an Esqueleto bug."
+                        , "EAliasedEntityReference", show a, show b
+                        ]
         fieldIdent =
             case e of
                 EEntity _ -> fromDBName info (fieldDB fieldDef)
                 EAliasedEntity baseI _ -> useIdent info $ aliasedEntityColumnIdent baseI fieldDef
+                EAliasedEntityReference a b ->
+                    error $ unwords
+                        [ "Used (^.) with an EAliasedEntityReference."
+                        , "Please file this as an Esqueleto bug."
+                        , "EAliasedEntityReference", show a, show b
+                        ]
+
 
 -- | Project an SqlExpression that may be null, guarding against null cases.
 withNonNull

src/Database/Esqueleto/MySQL.hs

@@ -7,9 +7,8 @@ module Database.Esqueleto.MySQL
     ( random_
     ) where
 
-import Database.Esqueleto.Internal.Language hiding (random_)
+import Database.Esqueleto.Internal.Internal hiding (random_)
 import Database.Esqueleto.Internal.PersistentImport
-import Database.Esqueleto.Internal.Sql
 
 -- | (@random()@) Split out into database specific modules
 -- because MySQL uses `rand()`.

src/Database/Esqueleto/PostgreSQL.hs

@@ -43,22 +43,8 @@ import Data.List.NonEmpty (NonEmpty((:|)))
 import Data.Proxy (Proxy(..))
 import qualified Data.Text.Internal.Builder as TLB
 import Data.Time.Clock (UTCTime)
-import Database.Esqueleto.Internal.Internal
-       ( CompositeKeyError(..)
-       , EsqueletoError(..)
-       , FinalResult(..)
-       , Ident(..)
-       , KnowResult
-       , SetClause
-       , UnexpectedCaseError(..)
-       , UnexpectedValueError(..)
-       , renderUpdates
-       , toUniqueDef
-       , uncommas
-       )
-import Database.Esqueleto.Internal.Language hiding (random_)
+import Database.Esqueleto.Internal.Internal hiding (random_)
 import Database.Esqueleto.Internal.PersistentImport hiding (upsert, upsertBy)
-import Database.Esqueleto.Internal.Sql
 import Database.Persist.Class (OnlyOneUniqueKey)
 
 -- | (@random()@) Split out into database specific modules

src/Database/Esqueleto/SQLite.hs

@@ -1,14 +1,14 @@
 {-# LANGUAGE OverloadedStrings #-}
+
 -- | This module contain SQLite-specific functions.
 --
--- /Since: 2.2.8/
+-- @since 2.2.8
 module Database.Esqueleto.SQLite
   ( random_
   ) where
 
-import Database.Esqueleto.Internal.Language hiding (random_)
+import Database.Esqueleto.Internal.Internal hiding (random_)
 import Database.Esqueleto.Internal.PersistentImport
-import Database.Esqueleto.Internal.Sql
 
 -- | (@random()@) Split out into database specific modules
 -- because MySQL uses `rand()`.

test/Common/Test.hs

@@ -1865,18 +1865,18 @@ testRenderSql run = do
       expr `shouldBe` "? = ?"
 
   describe "EEntity Ident behavior" $ do
-    let
-      render :: SqlExpr (Entity val) -> Text.Text
+      let render :: SqlExpr (Entity val) -> Text.Text
           render (EI.EEntity (EI.I ident)) = ident
-    it "renders sensibly" $ do
-      results <- run $ do
+          render _ = error "guess we gotta handle this in the test suite now"
+      it "renders sensibly" $ run $ do
           _ <- insert $ Foo 2
           _ <- insert $ Foo 3
           _ <- insert $ Person "hello" Nothing Nothing 3
-        select $
+          results <- select $
               from $ \(a `LeftOuterJoin` b) -> do
               on $ a ^. FooName ==. b ^. PersonFavNum
               pure (val (render a), val (render b))
+          liftIO $
               head results
               `shouldBe`
               (Value "Foo", Value "Person")