update painless within identifier

Author: fupelaqu

es6/sql-bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala

@@ -98,7 +98,7 @@ object ElasticAggregation {
       buildScript: (String, Script) => Aggregation
     ): Aggregation = {
       if (transformFuncs.nonEmpty) {
-        val scriptSrc = SQLFunctionUtils.buildPainless(identifier)
+        val scriptSrc = identifier.painless
         val script = Script(scriptSrc).lang("painless")
         buildScript(aggName, script)
       } else {

es6/sql-bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala

@@ -1203,7 +1203,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |            "field": "createdAt",
       |            "script": {
       |              "lang": "painless",
-      |              "source": "DateTimeFormatter.ofPattern('yyyy-MM-dd').parse(doc['createdAt'].value, ZonedDateTime::from)"
+      |              "source": "DateTimeFormatter.ofPattern('yyyy-MM-dd').parse(doc['createdAt'].value, LocalDate::from)"
       |            }
       |          }
       |        }
@@ -1217,7 +1217,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       .replaceAll("!=", " != ")
       .replaceAll("&&", " && ")
       .replaceAll(">", " > ")
-      .replaceAll(",ZonedDateTime", ", ZonedDateTime")
+      .replaceAll(",LocalDate", ", LocalDate")
   }
 
   it should "handle parse_datetime function" in {
@@ -1259,7 +1259,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |            "field": "createdAt",
       |            "script": {
       |              "lang": "painless",
-      |              "source": "DateTimeFormatter.ofPattern('yyyy-MM-ddTHH:mm:ssZ').parse(doc['createdAt'].value, LocalDateTime::from).truncatedTo(ChronoUnit.MINUTES).get(ChronoUnit.YEARS)"
+      |              "source": "DateTimeFormatter.ofPattern('yyyy-MM-ddTHH:mm:ssZ').parse(doc['createdAt'].value, ZonedDateTime::from).truncatedTo(ChronoUnit.MINUTES).get(ChronoUnit.YEARS)"
       |            }
       |          }
       |        }
@@ -1272,7 +1272,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       .replaceAll("!=", " != ")
       .replaceAll("&&", " && ")
       .replaceAll(">", " > ")
-      .replaceAll(",LocalDate", ", LocalDate")
+      .replaceAll(",ZonedDateTime", ", ZonedDateTime")
   }
 
   it should "handle date_diff function as script field" in {

sql/bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala

@@ -97,7 +97,7 @@ object ElasticAggregation {
       buildScript: (String, Script) => Aggregation
     ): Aggregation = {
       if (transformFuncs.nonEmpty) {
-        val scriptSrc = SQLFunctionUtils.buildPainless(identifier)
+        val scriptSrc = identifier.painless
         val script = Script(scriptSrc).lang("painless")
         buildScript(aggName, script)
       } else {

sql/src/main/scala/app/softnetwork/elastic/sql/SQLFunction.scala

@@ -20,17 +20,6 @@ object SQLFunctionUtils {
     aggregateAndTransformFunctions(identifier)._2
   }
 
-  def buildPainless(
-    identifier: Identifier
-  ): String = {
-    val base = identifier.painless
-    val orderedFunctions = transformFunctions(identifier).reverse
-    orderedFunctions.foldLeft(base) {
-      case (expr, f: SQLTransformFunction[_, _]) => f.toPainless(expr)
-      case (expr, f: PainlessScript)             => s"$expr${f.painless}"
-      case (expr, f)                             => f.toSQL(expr) // fallback
-    }
-  }
 }
 
 trait SQLFunctionChain extends SQLFunction with SQLValidation {
@@ -287,15 +276,7 @@ case class DateDiff(end: PainlessScript, start: PainlessScript, unit: TimeUnit)
   override def toSQL(base: String): String = {
     s"$sql(${end.sql}, ${start.sql}, ${unit.sql})"
   }
-  lazy val startPainless: String = start match {
-    case i: Identifier => SQLFunctionUtils.buildPainless(i)
-    case _             => start.painless
-  }
-  lazy val endPainless: String = end match {
-    case i: Identifier => SQLFunctionUtils.buildPainless(i)
-    case _             => end.painless
-  }
-  override def painless: String = s"${unit.painless}.between($startPainless, $endPainless)"
+  override def painless: String = s"${unit.painless}.between(${start.painless}, ${end.painless})"
 }
 
 case class DateAdd(interval: TimeInterval)

sql/src/main/scala/app/softnetwork/elastic/sql/SQLSelect.scala

@@ -26,7 +26,7 @@ sealed trait Field extends Updateable with SQLFunctionChain with PainlessScript
 
   def update(request: SQLSearchRequest): Field
 
-  def painless: String = SQLFunctionUtils.buildPainless(identifier)
+  def painless: String = identifier.painless
 
   lazy val scriptName: String = fieldAlias.map(_.alias).getOrElse(sourceField)
 }

sql/src/main/scala/app/softnetwork/elastic/sql/package.scala

@@ -267,7 +267,15 @@ package object sql {
 
     lazy val aliasOrName: String = fieldAlias.getOrElse(name)
 
-    override def painless: String = if (name.nonEmpty) s"doc['$name'].value" else ""
+    override def painless: String = {
+      val base = if (name.nonEmpty) s"doc['$name'].value" else ""
+      val orderedFunctions = SQLFunctionUtils.transformFunctions(this).reverse
+      orderedFunctions.foldLeft(base) {
+        case (expr, f: SQLTransformFunction[_, _]) => f.toPainless(expr)
+        case (expr, f: PainlessScript)             => s"$expr${f.painless}"
+        case (expr, f)                             => f.toSQL(expr) // fallback
+      }
+    }
 
   }