From 14716a519133defc41f44be1ae1e135e9acb97ef Mon Sep 17 00:00:00 2001 From: parsonsmatt Date: Thu, 29 Oct 2020 16:13:56 -0600 Subject: [PATCH] sigh --- .github/workflows/haskell.yml | 4 ++-- src/Database/Esqueleto/Experimental.hs | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index fd8412d..cd08520 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -69,7 +69,7 @@ jobs: key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} restore-keys: | ${{ runner.os }}-${{ matrix.ghc }}- - - run: cabal v2-build --disable-optimizations -j $CONFIG - - run: cabal v2-test --disable-optimizations -j $CONFIG + - run: cabal v2-build --disable-optimization -j $CONFIG + - run: cabal v2-test --disable-optimization -j $CONFIG - run: cabal v2-haddock -j $CONFIG - run: cabal v2-sdist diff --git a/src/Database/Esqueleto/Experimental.hs b/src/Database/Esqueleto/Experimental.hs index 71863cd..d2e3f26 100644 --- a/src/Database/Esqueleto/Experimental.hs +++ b/src/Database/Esqueleto/Experimental.hs @@ -895,13 +895,17 @@ instance ( ToFrom a ) => ToLeftJoin NotLateral a b (a' :& mb) where toLeftJoin _ lhs rhs on' = LeftJoinFrom (toFrom lhs) (toFrom rhs, on') -instance ( ToLeftJoin (IsLateral b) a b b' - ) => ToFrom (LeftOuterJoin a (b, b' -> SqlExpr (Value Bool))) where - toFrom (LeftOuterJoin lhs (rhs, on')) = - let - toProxy :: b -> Proxy (IsLateral b) +instance + ( ToLeftJoin (IsLateral b) a b b' + ) + => + ToFrom (LeftOuterJoin a (b, b' -> SqlExpr (Value Bool))) + where + toFrom (LeftOuterJoin lhs (rhs, on')) = + let toProxy :: b -> Proxy (IsLateral b) toProxy _ = Proxy - in toLeftJoin (toProxy rhs) lhs rhs on' + in + toLeftJoin (toProxy rhs) lhs rhs on' instance ( ToFrom a