to fix regression with window functions

fupelaqu · fupelaqu · commit 5515d6a8b8db · 2025-12-03T11:31:13.000+01:00
diff --git a/core/src/main/scala/app/softnetwork/elastic/client/ScrollApi.scala b/core/src/main/scala/app/softnetwork/elastic/client/ScrollApi.scala
@@ -122,7 +122,7 @@ trait ScrollApi extends ElasticClientHelpers {
   )(implicit system: ActorSystem): Source[(Map[String, Any], ScrollMetrics), NotUsed] = {
     sql.request match {
       case Some(Left(single)) =>
-        if (single.windowFunctions.nonEmpty && single.fields.nonEmpty)
+        if (single.windowFunctions.nonEmpty)
           return scrollWithWindowEnrichment(sql, single, config)
 
         val sqlRequest = single.copy(score = sql.score)
diff --git a/core/src/main/scala/app/softnetwork/elastic/client/SearchApi.scala b/core/src/main/scala/app/softnetwork/elastic/client/SearchApi.scala
@@ -68,7 +68,7 @@ trait SearchApi extends ElasticConversion with ElasticClientHelpers {
           collection.immutable.Seq(single.sources: _*),
           sql = Some(sql.query)
         )
-        if (single.windowFunctions.exists(_.isWindowing) && single.fields.nonEmpty)
+        if (single.windowFunctions.exists(_.isWindowing) && single.groupBy.isEmpty)
           searchWithWindowEnrichment(sql, single)
         else
           singleSearch(elasticQuery, single.fieldAliases, single.sqlAggregations)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ trait SearchApi extends ElasticConversion with ElasticClientHelpers {`
`68`	`68`	`collection.immutable.Seq(single.sources: _*),`
`69`	`69`	`sql = Some(sql.query)`
`70`	`70`	`)`
`71`		`- if (single.windowFunctions.exists(_.isWindowing) && single.fields.nonEmpty)`
	`71`	`+ if (single.windowFunctions.exists(_.isWindowing) && single.groupBy.isEmpty)`
`72`	`72`	`searchWithWindowEnrichment(sql, single)`
`73`	`73`	`else`
`74`	`74`	`singleSearch(elasticQuery, single.fieldAliases, single.sqlAggregations)`