Merge pull request #247 from gemini-hlsw/topic/fix-fool-apply

Fix operator ordering in FilterOrderByOffsetLimit.apply
typelevel · Aug 8, 2022 · c43d34a · c43d34a
2 parents 5b67161 + c42e9fb
commit c43d34a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/modules/core/src/main/scala/query.scala b/modules/core/src/main/scala/query.scala
@@ -247,11 +247,11 @@ object Query {
  **/
  object FilterOrderByOffsetLimit {
  def apply(pred: Option[Predicate], oss: Option[List[OrderSelection[_]]], offset: Option[Int], limit: Option[Int], child: Query): Query = {
- val lim = limit.map(n => Limit(n, child)).getOrElse(child)
- val off = offset.map(n => Offset(n, lim)).getOrElse(lim)
- val order = oss.map(o =>  OrderBy(OrderSelections(o), off)).getOrElse(off)
- val filter = pred.map(p =>  Filter(p, order)).getOrElse(order)
- filter
+ val filter = pred.map(p =>  Filter(p, child)).getOrElse(child)
+ val order = oss.map(o =>  OrderBy(OrderSelections(o), filter)).getOrElse(filter)
+ val off = offset.map(n => Offset(n, order)).getOrElse(order)
+ val lim = limit.map(n => Limit(n, off)).getOrElse(off)
+ lim
  }
 
  def unapply(q: Query): Option[(Option[Predicate], Option[List[OrderSelection[_]]], Option[Int], Option[Int], Query)] = {