From ae3b96e0f67f618d5c62a3c304daccf5b3ae685c Mon Sep 17 00:00:00 2001
From: parsonsmatt <parsonsmatt@gmail.com>
Date: Tue, 29 Oct 2019 14:29:27 -0600
Subject: [PATCH] cleaner diff

---
 src/Database/Esqueleto/Internal/Internal.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Database/Esqueleto/Internal/Internal.hs b/src/Database/Esqueleto/Internal/Internal.hs
index 376273d..d624e3d 100644
--- a/src/Database/Esqueleto/Internal/Internal.hs
+++ b/src/Database/Esqueleto/Internal/Internal.hs
@@ -1626,7 +1626,7 @@ collectOnClauses sqlBackend = go Set.empty []
     tryMatch idents expr fromClause =
       case fromClause of
         FromJoin l k r onClause ->
-          matchR <|> matchTable <|> matchL <|> matchPartial <|> matchC -- right to left
+          matchTable <|> matchR <|> matchC <|> matchL <|> matchPartial -- right to left
             where
               matchR = fmap (\r' -> FromJoin l k r' onClause)
                 <$> tryMatch idents expr r
@@ -1634,15 +1634,15 @@ collectOnClauses sqlBackend = go Set.empty []
                 <$> tryMatch idents expr l
 
               matchPartial = do
-                ll <- findLeftmostIdent l
-                rr <- findLeftmostIdent r
+                i1 <- findLeftmostIdent l
+                i2 <- findLeftmostIdent r
                 guard $
                   Set.isSubsetOf
                     identsInOnClause
-                    (Set.fromList [ll, rr])
+                    (Set.fromList [i1, i2])
                 guard $ k /= CrossJoinKind
                 guard $ Maybe.isNothing onClause
-                pure (Set.fromList [] <> idents, FromJoin l k r (Just expr))
+                pure (idents, FromJoin l k r (Just expr))
 
               matchC =
                 case onClause of