[v1][wip] Port SqlDialect to v1 AST

partiql · Nov 2, 2024 · 91af96d · 91af96d
1 parent bd7745f
commit 91af96d
Show file tree

Hide file tree

Showing 12 changed files with 3,249 additions and 2,907 deletions.
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Ast.kt b/partiql-ast/src/main/java/org/partiql/ast/v1/Ast.kt
@@ -50,6 +50,7 @@ import org.partiql.value.PartiQLValue
 import org.partiql.value.PartiQLValueExperimental
 
 // TODO docs for all factory methods and move to Kotlin sources
+//  Also consider defaults for nullable. Need to consider backwards compatibility.
 public object Ast {
     // Expr
     @JvmStatic
@@ -113,8 +114,8 @@ public object Ast {
     }
 
     @JvmStatic
-    public fun exprLike(value: Expr, Pattern: Expr, escape: Expr?, not: Boolean): ExprLike {
-        return ExprLike(value, Pattern, escape, not)
+    public fun exprLike(value: Expr, pattern: Expr, escape: Expr?, not: Boolean): ExprLike {
+        return ExprLike(value, pattern, escape, not)
     }
 
     // This representation will be changed in https://github.com/partiql/partiql-lang-kotlin/issues/1589
@@ -195,8 +196,8 @@ public object Ast {
     }
 
     @JvmStatic
-    public fun exprTrim(Value: Expr, chars: Expr?, trimSpec: TrimSpec?): ExprTrim {
-        return ExprTrim(Value, chars, trimSpec)
+    public fun exprTrim(value: Expr, chars: Expr?, trimSpec: TrimSpec?): ExprTrim {
+        return ExprTrim(value, chars, trimSpec)
     }
 
     @JvmStatic

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/AstVisitor.java b/partiql-ast/src/main/java/org/partiql/ast/v1/AstVisitor.java
@@ -435,4 +435,8 @@ public R visitGraphLabelConj(GraphLabel.Conj node, C ctx) {
     public R visitGraphLabelDisj(GraphLabel.Disj node, C ctx) {
         return defaultVisit(node, ctx);
     }
+
+    public R visitDataType(DataType node, C ctx) {
+        return defaultVisit(node, ctx);
+    }
 }
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/DataType.java b/partiql-ast/src/main/java/org/partiql/ast/v1/DataType.java
@@ -609,6 +609,6 @@ public Collection<AstNode> children() {
 
     @Override
     public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
-        return null;
+        return visitor.visitDataType(this, ctx);
     }
 }
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java
@@ -33,6 +33,7 @@ public ExprCast(@NotNull Expr value, @NotNull DataType asType) {
     public Collection<AstNode> children() {
         List<AstNode> kids = new ArrayList<>();
         kids.add(value);
+        kids.add(asType);
         return kids;
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java
@@ -37,6 +37,7 @@ public ExprIsType(@NotNull Expr value, @NotNull DataType type, boolean not) {
     public Collection<AstNode> children() {
         List<AstNode> kids = new ArrayList<>();
         kids.add(value);
+        kids.add(type);
         return kids;
     }
 

diff --git a/...rc/main/kotlin/org/partiql/ast/sql/Sql.kt → ...c/main/java/org/partiql/ast/v1/sql/Sql.kt b/...rc/main/kotlin/org/partiql/ast/sql/Sql.kt → ...c/main/java/org/partiql/ast/v1/sql/Sql.kt
@@ -1,6 +1,6 @@
-package org.partiql.ast.sql
+package org.partiql.ast.v1.sql
 
-import org.partiql.ast.AstNode
+import org.partiql.ast.v1.AstNode
 
 /**
  * Pretty-print this [AstNode] as SQL text with the given (or standard) [SqlLayout] and [SqlDialect].

diff --git a/...in/kotlin/org/partiql/ast/sql/SqlBlock.kt → ...n/java/org/partiql/ast/v1/sql/SqlBlock.kt b/...in/kotlin/org/partiql/ast/sql/SqlBlock.kt → ...n/java/org/partiql/ast/v1/sql/SqlBlock.kt
@@ -12,7 +12,7 @@
  *  language governing permissions and limitations under the License.
  */
 
-package org.partiql.ast.sql
+package org.partiql.ast.v1.sql
 
 /**
  * Representation of some textual elements as a token (singly-linked) list.