add specifications for query with date_diff

Author: fupelaqu

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

@@ -1274,4 +1274,67 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       .replaceAll(">", " > ")
       .replaceAll(",LocalDate", ", LocalDate")
   }
+
+  it should "handle date_diff function as script field" in {
+    val select: ElasticSearchRequest =
+      SQLQuery(dateDiff)
+    val query = select.query
+    println(query)
+    query shouldBe
+    """{
+      |  "query": {
+      |    "match_all": {}
+      |  },
+      |  "script_fields": {
+      |    "diff": {
+      |      "script": {
+      |        "lang": "painless",
+      |        "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, doc['createdAt'].value)"
+      |      }
+      |    }
+      |  },
+      |  "_source": {
+      |    "includes": [
+      |      "identifier"
+      |    ]
+      |  }
+      |}""".stripMargin
+      .replaceAll("\\s", "")
+      .replaceAll(",doc", ", doc")
+  }
+
+  it should "handle aggregation with date_diff function" in {
+    val select: ElasticSearchRequest =
+      SQLQuery(aggregationWithDateDiff)
+    val query = select.query
+    println(query)
+    query shouldBe
+    """{
+      |  "query": {
+      |    "match_all": {}
+      |  },
+      |  "size": 0,
+      |  "_source": true,
+      |  "aggs": {
+      |    "identifier": {
+      |      "terms": {
+      |        "field": "identifier.keyword"
+      |      },
+      |      "aggs": {
+      |        "max_diff": {
+      |          "max": {
+      |            "script": {
+      |              "lang": "painless",
+      |              "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, doc['createdAt'].value)"
+      |            }
+      |          }
+      |        }
+      |      }
+      |    }
+      |  }
+      |}""".stripMargin
+      .replaceAll("\\s", "")
+      .replaceAll(",doc", ", doc")
+  }
+
 }

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

@@ -1271,4 +1271,67 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         .replaceAll(">", " > ")
         .replaceAll(",LocalDate", ", LocalDate")
   }
+
+  it should "handle date_diff function as script field" in {
+    val select: ElasticSearchRequest =
+      SQLQuery(dateDiff)
+    val query = select.query
+    println(query)
+    query shouldBe
+      """{
+        |  "query": {
+        |    "match_all": {}
+        |  },
+        |  "script_fields": {
+        |    "diff": {
+        |      "script": {
+        |        "lang": "painless",
+        |        "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, doc['createdAt'].value)"
+        |      }
+        |    }
+        |  },
+        |  "_source": {
+        |    "includes": [
+        |      "identifier"
+        |    ]
+        |  }
+        |}""".stripMargin
+        .replaceAll("\\s", "")
+        .replaceAll(",doc", ", doc")
+  }
+
+  it should "handle aggregation with date_diff function" in {
+    val select: ElasticSearchRequest =
+      SQLQuery(aggregationWithDateDiff)
+    val query = select.query
+    println(query)
+    query shouldBe
+      """{
+        |  "query": {
+        |    "match_all": {}
+        |  },
+        |  "size": 0,
+        |  "_source": true,
+        |  "aggs": {
+        |    "identifier": {
+        |      "terms": {
+        |        "field": "identifier.keyword"
+        |      },
+        |      "aggs": {
+        |        "max_diff": {
+        |          "max": {
+        |            "script": {
+        |              "lang": "painless",
+        |              "source": "ChronoUnit.DAYS.between(doc['updatedAt'].value, doc['createdAt'].value)"
+        |            }
+        |          }
+        |        }
+        |      }
+        |    }
+        |  }
+        |}""".stripMargin
+        .replaceAll("\\s", "")
+        .replaceAll(",doc", ", doc")
+  }
+
 }

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

@@ -5,8 +5,7 @@ case object Select extends SQLExpr("select") with SQLRegex
 sealed trait Field extends Updateable with SQLFunctionChain with PainlessScript {
   def identifier: Identifier
   def fieldAlias: Option[SQLAlias]
-  def isScriptField: Boolean =
-    identifier.name.isEmpty || (functions.nonEmpty && !aggregation && identifier.bucket.isEmpty)
+  def isScriptField: Boolean = functions.nonEmpty && !aggregation && identifier.bucket.isEmpty
   override def sql: String = s"$identifier${asString(fieldAlias)}"
   lazy val sourceField: String =
     if (identifier.nested) {

sql/src/test/scala/app/softnetwork/elastic/sql/SQLParserSpec.scala

@@ -114,10 +114,10 @@ object Queries {
       .replaceAll("\\( ", "(")
       .replaceAll(" \\)", ")")
 
-  val dateDiff = "select date_diff(createdAt, updatedAt, day) as diff from Table"
+  val dateDiff = "select date_diff(createdAt, updatedAt, day) as diff, identifier from Table"
 
-  val dateDiffWithAggregation =
-    "select max(date_diff(parse_datetime('yyyy-MM-ddTHH:mm:ssZ')(createdAt), updatedAt, day)) as max_diff from Table"
+  val aggregationWithDateDiff =
+    "select max(date_diff(parse_datetime('yyyy-MM-ddTHH:mm:ssZ')(createdAt), updatedAt, day)) as max_diff from Table group by identifier"
 }
 
 /** Created by smanciot on 15/02/17.
@@ -444,9 +444,9 @@ class SQLParserSpec extends AnyFlatSpec with Matchers {
   }
 
   it should "parse date_diff function with aggregation" in {
-    val result = SQLParser(dateDiffWithAggregation)
+    val result = SQLParser(aggregationWithDateDiff)
     result.toOption.flatMap(_.left.toOption.map(_.sql)).getOrElse("") should ===(
-      dateDiffWithAggregation
+      aggregationWithDateDiff
     )
   }
 }