From 5a78c156c2dda69da138e8b8263dccf6aed45828 Mon Sep 17 00:00:00 2001
From: Chris Allen <cma@bitemyapp.com>
Date: Thu, 27 Apr 2017 22:49:48 -0500
Subject: [PATCH] Fixing composite key support for group by

---
 .editorconfig                          | 20 ++++++++++++++++++++
 src/Database/Esqueleto/Internal/Sql.hs | 11 +++++++++--
 stack-8.0.yaml                         |  4 ++--
 stack.yaml                             |  2 +-
 test/Test.hs                           | 16 ++++++++++++++++
 5 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..9f49510
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+# http://editorconfig.org
+root = true
+
+[Makefile]
+indent_style = tabs
+indent_size = 8
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{hs,md,php}]
+indent_style = space
+indent_size = 2
+tab_width = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 80
diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs
index 97779c2..ad14c40 100644
--- a/src/Database/Esqueleto/Internal/Sql.hs
+++ b/src/Database/Esqueleto/Internal/Sql.hs
@@ -76,6 +76,7 @@ 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 =
@@ -1099,13 +1100,19 @@ makeGroupBy :: IdentInfo -> GroupByClause -> (TLB.Builder, [PersistValue])
 makeGroupBy _ (GroupBy []) = (mempty, [])
 makeGroupBy info (GroupBy fields) = first ("\nGROUP BY " <>) build
   where
-    build = uncommas' $ map (\(SomeValue (ERaw _ f)) -> f info) fields
+    build :: (TLB.Builder, [PersistValue])
+    build = uncommas' $ map match fields
+
+    match :: SomeValue SqlExpr -> (TLB.Builder, [PersistValue])
+    match (SomeValue (ERaw _ f)) = f info
+    -- match (SomeValue (ECompositeKey f)) = (mconcat $ f info, mempty)
 
 makeHaving :: IdentInfo -> WhereClause -> (TLB.Builder, [PersistValue])
 makeHaving _    NoWhere                    = mempty
 makeHaving info (Where (ERaw _ f))         = first ("\nHAVING " <>) (f info)
-makeHaving _    (Where (ECompositeKey _ )) = unexpectedCompositeKeyError "makeHaving"
+makeHaving _    (Where (ECompositeKey _)) = unexpectedCompositeKeyError "makeHaving"
 
+-- makeHaving, makeWhere and makeOrderBy
 makeOrderBy :: IdentInfo -> [OrderByClause] -> (TLB.Builder, [PersistValue])
 makeOrderBy _    [] = mempty
 makeOrderBy info os = first ("\nORDER BY " <>) . uncommas' $ concatMap mk os
diff --git a/stack-8.0.yaml b/stack-8.0.yaml
index 8935c8c..5b854e7 100644
--- a/stack-8.0.yaml
+++ b/stack-8.0.yaml
@@ -1,6 +1,6 @@
 # resolver: nightly-2017-01-10
-resolver: lts-7.16
-compiler: ghc-8.0.2
+resolver: lts-8.8
+# compiler: ghc-8.0.2
 
 packages:
 - '.'
diff --git a/stack.yaml b/stack.yaml
index 177aa94..12a3c04 120000
--- a/stack.yaml
+++ b/stack.yaml
@@ -1 +1 @@
-stack-7.10.yaml
\ No newline at end of file
+stack-8.0.yaml
\ No newline at end of file
diff --git a/test/Test.hs b/test/Test.hs
index cb7189b..e54bb9b 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -1076,6 +1076,22 @@ main = do
                                   , (Entity p1k p1, Value 3)
                                   , (Entity p3k p3, Value 7) ]
 
+      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)
+          liftIO $ print ret
+          liftIO $ ret `shouldBe` [ (Value p1k, Value 3)
+                                  , (Value p3k, Value 7) ]
+
       it "GROUP BY works with HAVING" $
         run $ do
           p1k <- insert p1