Fixed queryOr causing strange type errors in complex Queries.

See https://stackoverflow.com/questions/69011689/define-a-querybuilder-by-filtering-then-sorting
digitallyinduced · Sep 4, 2021 · bfe64e6 · bfe64e6
1 parent 359be70
commit bfe64e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/IHP/QueryBuilder.hs b/IHP/QueryBuilder.hs
@@ -961,8 +961,8 @@ queryUnion firstQueryBuilderProvider secondQueryBuilderProvider = NoJoinQueryBui
 -- >         (filterWhere (#public, True))
 -- >     |> fetch
 -- > -- SELECT * FROM pages WHERE created_by = '..' OR public = True
-queryOr :: (HasQueryBuilder queryBuilderProvider joinRegister, HasQueryBuilder queryBUilderProvider'' joinRegister'', HasQueryBuilder queryBuilderProvider''' joinRegister''') => (queryBuilderProvider model -> queryBuilderProvider''' model) -> (queryBuilderProvider model -> queryBUilderProvider'' model) -> queryBuilderProvider model -> NoJoinQueryBuilderWrapper model 
-queryOr firstQuery secondQuery queryBuilder = NoJoinQueryBuilderWrapper 
+queryOr :: (HasQueryBuilder queryBuilderProvider joinRegister, HasQueryBuilder queryBuilderProvider'' joinRegister'', HasQueryBuilder queryBuilderProvider''' joinRegister''') => (queryBuilderProvider model -> queryBuilderProvider''' model) -> (queryBuilderProvider model -> queryBuilderProvider'' model) -> queryBuilderProvider model -> queryBuilderProvider model
+queryOr firstQuery secondQuery queryBuilder = injectQueryBuilder
     (UnionQueryBuilder { 
         firstQueryBuilder = getQueryBuilder $ firstQuery queryBuilder, 
         secondQueryBuilder = getQueryBuilder $ secondQuery queryBuilder}