to fix painless script with date_diff

Author: fupelaqu

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, LocalDate::from)"
+      |              "source": "DateTimeFormatter.ofPattern('yyyy-MM-dd').parse(doc['createdAt'].value, ZonedDateTime::from)"
       |            }
       |          }
       |        }
@@ -1217,7 +1217,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       .replaceAll("!=", " != ")
       .replaceAll("&&", " && ")
       .replaceAll(">", " > ")
-      .replaceAll(",LocalDate", ", LocalDate")
+      .replaceAll(",ZonedDateTime", ", ZonedDateTime")
   }
 
   it should "handle parse_datetime function" in {
@@ -1325,7 +1325,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |          "max": {
       |            "script": {
       |              "lang": "painless",
-      |              "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, doc['createdAt'].value)"
+      |              "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, DateTimeFormatter.ofPattern('yyyy-MM-ddTHH:mm:ssZ').parse(doc['createdAt'].value, ZonedDateTime::from))"
       |            }
       |          }
       |        }
@@ -1335,6 +1335,8 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |}""".stripMargin
       .replaceAll("\\s", "")
       .replaceAll(",doc", ", doc")
+      .replaceAll("DateTimeFormatter", " DateTimeFormatter")
+      .replaceAll("ZonedDateTime", " ZonedDateTime")
   }
 
 }

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

@@ -1256,7 +1256,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)"
         |            }
         |          }
         |        }
@@ -1269,7 +1269,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 {
@@ -1322,7 +1322,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         |          "max": {
         |            "script": {
         |              "lang": "painless",
-        |              "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, doc['createdAt'].value)"
+        |              "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, DateTimeFormatter.ofPattern('yyyy-MM-ddTHH:mm:ssZ').parse(doc['createdAt'].value, ZonedDateTime::from))"
         |            }
         |          }
         |        }
@@ -1332,6 +1332,8 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         |}""".stripMargin
         .replaceAll("\\s", "")
         .replaceAll(",doc", ", doc")
+        .replaceAll("DateTimeFormatter", " DateTimeFormatter")
+        .replaceAll("ZonedDateTime", " ZonedDateTime")
   }
 
 }

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

@@ -287,7 +287,15 @@ case class DateDiff(end: PainlessScript, start: PainlessScript, unit: TimeUnit)
   override def toSQL(base: String): String = {
     s"$sql(${end.sql}, ${start.sql}, ${unit.sql})"
   }
-  override def painless: String = s"${unit.painless}.between(${start.painless}, ${end.painless})"
+  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)"
 }
 
 case class DateAdd(interval: TimeInterval)
@@ -370,7 +378,7 @@ case class ParseDateTime(format: String)
   override def params: Seq[String] = Seq(s"'$format'")
   override def painless: String = throw new NotImplementedError("Use toPainless instead")
   override def toPainless(base: String): String =
-    s"DateTimeFormatter.ofPattern('$format').parse($base, LocalDateTime::from)"
+    s"DateTimeFormatter.ofPattern('$format').parse($base, ZonedDateTime::from)"
 }
 
 case class FormatDateTime(format: String)