Skip to content

Commit 1dc428d

Browse files
committed
add null value, fix null expr within function
1 parent 2ca9f7c commit 1dc428d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scala.util.matching.Regex
66
sealed trait SQLFunction extends SQLRegex {
77
def toSQL(base: String): String = if (base.nonEmpty) s"$sql($base)" else sql
88
def applyType(in: SQLType): SQLType = out
9-
var expr: SQLToken = _
9+
var expr: SQLToken = SQLNull
1010
def applyTo(expr: SQLToken): Unit = {
1111
this.expr = expr
1212
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ package object sql {
8080
override def nullable: Boolean = false
8181
}
8282

83+
case object SQLNull extends SQLValue[Null](null) {
84+
override def sql: String = "null"
85+
override def painless: String = "null"
86+
override def nullable: Boolean = true
87+
override def out: SQLType = SQLTypes.Null
88+
}
89+
8390
case class SQLBoolean(override val value: Boolean) extends SQLValue[Boolean](value) {
8491
override def sql: String = value.toString
8592
override def out: SQLType = SQLTypes.Boolean

0 commit comments

Comments
 (0)