Adds CURRENT_DATE special form to parser

partiql · Sep 25, 2023 · b9a81a0 · b9a81a0
1 parent e1b1e96
commit b9a81a0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Adds overridden `toString()` method for Sprout-generated code.
+- Adds CURRENT_DATE session variable to PartiQL.g4 and PartiQLParser
 
 ### Changed
 

diff --git a/buildSrc/src/main/kotlin/partiql.conventions.gradle.kts b/buildSrc/src/main/kotlin/partiql.conventions.gradle.kts
@@ -77,6 +77,10 @@ configure<KtlintExtension> {
     }
 }
 
+tasks.named("build") {
+    dependsOn("ktlintFormat")
+}
+
 sourceSets {
     main {
         java.srcDir(generatedSrc)

diff --git a/partiql-ast/src/main/resources/partiql_ast.ion b/partiql-ast/src/main/resources/partiql_ast.ion
@@ -277,6 +277,7 @@ expr::[
   session_attribute::{
     attribute: [
       CURRENT_USER,
+      CURRENT_DATE,
     ],
   },
 

diff --git a/partiql-parser/src/main/antlr/PartiQL.g4 b/partiql-parser/src/main/antlr/PartiQL.g4
@@ -602,6 +602,7 @@ exprPrimary
 exprTerm
     : PAREN_LEFT expr PAREN_RIGHT    # ExprTermWrappedQuery
     | CURRENT_USER                   # ExprTermCurrentUser
+    | CURRENT_DATE                   # ExprTermCurrentDate
     | parameter                      # ExprTermBase
     | varRefExpr                     # ExprTermBase
     | literal                        # ExprTermBase

diff --git a/partiql-parser/src/main/kotlin/org/partiql/parser/impl/PartiQLParserDefault.kt b/partiql-parser/src/main/kotlin/org/partiql/parser/impl/PartiQLParserDefault.kt
@@ -1475,6 +1475,10 @@ internal class PartiQLParserDefault : PartiQLParser {
             exprSessionAttribute(Expr.SessionAttribute.Attribute.CURRENT_USER)
         }
 
+        override fun visitExprTermCurrentDate(ctx: org.partiql.parser.antlr.PartiQLParser.ExprTermCurrentDateContext) = translate(ctx) {
+            exprSessionAttribute(Expr.SessionAttribute.Attribute.CURRENT_DATE)
+        }
+
         /**
          *
          * FUNCTIONS