Fix SQL generation

wvlet · Apr 4, 2023 · 9bdcd87 · 9bdcd87
1 parent 8a6a4f9
commit 9bdcd87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/airframe-sql/src/main/scala/wvlet/airframe/sql/model/Expression.scala b/airframe-sql/src/main/scala/wvlet/airframe/sql/model/Expression.scala
@@ -1258,6 +1258,7 @@ object Expression {
 
   case class Extract(interval: IntervalField, expr: Expression, nodeLocation: Option[NodeLocation]) extends Expression {
     override def children: Seq[Expression] = Seq(expr)
+    override def sqlExpr: String = s"EXTRACT(${interval.sqlExpr} FROM ${expr.sqlExpr})"
     override def toString = s"Extract(interval:${interval}, ${expr})"
   }
 

diff --git a/airframe-sql/src/main/scala/wvlet/airframe/sql/parser/SQLGenerator.scala b/airframe-sql/src/main/scala/wvlet/airframe/sql/parser/SQLGenerator.scala
@@ -374,7 +374,7 @@ object SQLGenerator extends LogSupport {
       case l: Literal =>
         l.sqlExpr
       case g: GroupingKey =>
-        g.index.getOrElse(printExpression(g.child)).toString
+        g.sqlExpr
       case ParenthesizedExpression(expr, _) =>
         s"(${printExpression(expr)})"
       case a: Alias =>