From 43813cdfe2b253e9f08669bd89cc8f05b5d44265 Mon Sep 17 00:00:00 2001
From: Chris Allen <cma@bitemyapp.com>
Date: Fri, 28 Apr 2017 00:08:05 -0500
Subject: [PATCH] Test suite still broken

---
 src/Database/Esqueleto/Internal/Sql.hs |  4 +--
 test/Test.hs                           | 45 +++++++++++++++++++-------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs
index ad14c40..fe0c66a 100644
--- a/src/Database/Esqueleto/Internal/Sql.hs
+++ b/src/Database/Esqueleto/Internal/Sql.hs
@@ -76,8 +76,6 @@ import qualified Data.Text.Lazy.Builder as TLB
 
 import Database.Esqueleto.Internal.Language
 
-import System.IO.Unsafe
-
 -- | SQL backend for @esqueleto@ using 'SqlPersistT'.
 newtype SqlQuery a =
   Q { unQ :: W.WriterT SideData (S.State IdentState) a }
@@ -1105,7 +1103,7 @@ makeGroupBy info (GroupBy fields) = first ("\nGROUP BY " <>) build
 
     match :: SomeValue SqlExpr -> (TLB.Builder, [PersistValue])
     match (SomeValue (ERaw _ f)) = f info
-    -- match (SomeValue (ECompositeKey f)) = (mconcat $ f info, mempty)
+    match (SomeValue (ECompositeKey f)) = (mconcat $ f info, mempty)
 
 makeHaving :: IdentInfo -> WhereClause -> (TLB.Builder, [PersistValue])
 makeHaving _    NoWhere                    = mempty
diff --git a/test/Test.hs b/test/Test.hs
index e54bb9b..8cb7955 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -72,6 +72,19 @@ share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistUpperCase|
     title String
     authorId PersonId
     deriving Eq Show
+
+  Lord
+    county String
+    dogs Int Maybe
+    Primary county
+    deriving Show
+
+  Deed
+    contract String
+    ownerId LordId
+    Primary contract
+    deriving Show
+
   Follow
     follower PersonId
     followed PersonId
@@ -132,6 +145,10 @@ main = do
       p3 = Person "Mike"   (Just 17) Nothing   3
       p4 = Person "Livia"  (Just 17) (Just 18) 4
       p5 = Person "Mitch"  Nothing   Nothing   5
+      l1 = Lord "Cornwall" (Just 36)
+      l2 = Lord "Dorset" Nothing
+      l3 = Lord "Chester" (Just 17)
+      
   hspec $ do
     describe "select" $ do
       it "works for a single value" $
@@ -1078,19 +1095,23 @@ main = do
 
       it "GROUP BY works with COUNT and InnerJoin" $
         run $ do
-          p1k <- insert p1
-          p2k <- insert p2
-          p3k <- insert p3
-          replicateM_ 3 (insert $ BlogPost "" p1k)
-          replicateM_ 7 (insert $ BlogPost "" p3k)
-          (ret :: [(Value (Key Person), Value Int)]) <- select $ from $
-            \ ( person `InnerJoin` post ) -> do
-            on $ person ^. PersonId ==. post ^. BlogPostAuthorId
-            groupBy (person ^. PersonId)
-            return (person ^. PersonId, count $ post ^. BlogPostId)
+          l1k <- insert l1
+          l2k <- insert l2
+          l3k <- insert l3
+          liftIO $ putStrLn "****** l3 ******"
+          replicateM_ 3 (insert $ Deed "" l1k)
+          liftIO $ putStrLn "****** l1k ******"
+          replicateM_ 7 (insert $ Deed "" l3k)
+          liftIO $ putStrLn "****** l3k ******"
+          (ret :: [(Value (Key Lord), Value Int)]) <- select $ from $
+            \ ( lord `InnerJoin` deed ) -> do
+            on $ lord ^. LordId ==. deed ^. DeedOwnerId
+            groupBy (lord ^. LordId)
+            return (lord ^. LordId, count $ deed ^. DeedId)
+          liftIO $ putStrLn "****** ret ******"
           liftIO $ print ret
-          liftIO $ ret `shouldBe` [ (Value p1k, Value 3)
-                                  , (Value p3k, Value 7) ]
+          liftIO $ ret `shouldBe` [ (Value l1k, Value 3)
+                                  , (Value l3k, Value 7) ]
 
       it "GROUP BY works with HAVING" $
         run $ do