From 99f9231e499dfabd195534313ccd0d66adf2a450 Mon Sep 17 00:00:00 2001 From: parsonsmatt Date: Thu, 29 Oct 2020 16:00:39 -0600 Subject: [PATCH] faster build perhaps --- .github/workflows/haskell.yml | 2 +- src/Database/Esqueleto/Experimental.hs | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 1d18fed..8108500 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -35,7 +35,7 @@ jobs: cabal: ["3.2"] ghc: ["8.6.5", "8.8.3", "8.10.1"] env: - CONFIG: "--enable-tests --enable-benchmarks" + CONFIG: "--enable-tests --enable-benchmarks --disable-optimizations -j" steps: - uses: actions/checkout@v2 - uses: actions/setup-haskell@v1.1.2 diff --git a/src/Database/Esqueleto/Experimental.hs b/src/Database/Esqueleto/Experimental.hs index 8d82bfc..71863cd 100644 --- a/src/Database/Esqueleto/Experimental.hs +++ b/src/Database/Esqueleto/Experimental.hs @@ -838,15 +838,19 @@ instance (ToFrom a, ToFromT a ~ a', ToFrom b, ToFromT b ~ b') => ToInnerJoin NotLateral a b (a' :& b') where toInnerJoin _ lhs rhs on' = InnerJoinFrom (toFrom lhs) (toFrom rhs, on') -instance ( ToFrom a - , ToFromT a ~ a' - , ToInnerJoin (IsLateral b) a b b' - ) => ToFrom (InnerJoin a (b, b' -> SqlExpr (Value Bool))) where - toFrom (InnerJoin lhs (rhs, on')) = - let - toProxy :: b -> Proxy (IsLateral b) +instance + ( ToFrom a + , ToFromT a ~ a' + , ToInnerJoin (IsLateral b) a b b' + ) + => + ToFrom (InnerJoin a (b, b' -> SqlExpr (Value Bool))) + where + toFrom (InnerJoin lhs (rhs, on')) = + let toProxy :: b -> Proxy (IsLateral b) toProxy _ = Proxy - in toInnerJoin (toProxy rhs) lhs rhs on' + in + toInnerJoin (toProxy rhs) lhs rhs on' instance ( ToFrom a @@ -1168,8 +1172,8 @@ from parts = do let ret = (toMaybe leftVal) :& (toMaybe rightVal) pure $ (ret, FromJoin leftFrom FullOuterJoinKind rightFrom (Just (on' ret))) -fromSubQuery - :: +fromSubQuery + :: ( SqlSelect a r , ToAlias a , ToAliasReference a