From f5599b695e45f479d97c3e72bbe8665796d5f6e6 Mon Sep 17 00:00:00 2001
From: Libing Chen <libing.chen@gmail.com>
Date: Sat, 17 Feb 2024 01:43:25 +0800
Subject: [PATCH] chore: fix param problem

---
 src/main/grammars/prql.bnf  | 9 ++++-----
 src/main/grammars/prql.flex | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/grammars/prql.bnf b/src/main/grammars/prql.bnf
index 2fff830..c268e54 100644
--- a/src/main/grammars/prql.bnf
+++ b/src/main/grammars/prql.bnf
@@ -100,7 +100,7 @@ number_literal ::= INTEGER_LITERAL | BINARY_NUMERICAL | OCTAL_NUMERICAL | HEXADE
 arithmetic_operation ::= (PLUS | MINUS | MUL | DIV | REM | COALESCE | LT | GT | LT_EQ | GT_EQ | EQEQ | EXCLEQ)
 compare_operation ::= (LT | GT | LT_EQ | GT_EQ | EQEQ | EXCLEQ  | MATCH | AND_LITERAL | OR_LITERAL | LPAREN | RPAREN)
 range ::= range_item DOTDOT range_item?
-param_any ::= PARAM3 | PARAM2 | PARAM  | QUESTION
+param_any ::= PARAM3 | PARAM  | QUESTION
 range_item ::= (MINUS? INTEGER_LITERAL) | DOUBLE_LITERAL | DATE_LITERAL | TIME_LITERAL | TIMESTAMP_LITERAL
 positive_range ::= INTEGER_LITERAL DOTDOT INTEGER_LITERAL
 date_time_literal ::= DATE_LITERAL | TIME_LITERAL | TIMESTAMP_LITERAL | INTERVAL_LITERAL
@@ -116,7 +116,6 @@ bool_expr ::= between_expr | ( LPAREN expr_literal compare_operation expr RPAREN
 column_name ::= IDENTIFIER | AGGREGATE_FUNCTION
 column_with_table ::= table_alias DOT IDENTIFIER
 column_variant ::= ( (table_alias DOT column_name) | column_name | RAW_LITERAL )
-column_alias ::= IDENTIFIER
 table_name ::= IDENTIFIER
 table_alias ::= IDENTIFIER | 'this' | 'that'
 table_variant ::= ( (table_alias EQ table_from_sql) | (table_alias EQ table_name) | table_name | RAW_LITERAL | table_from_array | table_from_sql | table_from_function )
@@ -189,9 +188,9 @@ stmt_loop_block ::=  stmt_filter stmt_select
 stmt_join ::= 'join' (stmt_join_side_expression)? stmt_join_table stmt_join_conditions {pin=1}
 stmt_join_side_expression ::= 'side' COLON ('inner'| 'left'|'right'| 'full')
 stmt_join_table ::= table_variant
-stmt_join_column ::= (column_alias DOT column_name) | column_name
-stmt_join_pair ::= ( LPAREN? stmt_join_column? EQEQ stmt_join_column RPAREN? ) | S_STRING | S_INDENTED_STRING
-stmt_join_conditions ::= LBRACK stmt_join_pair (COMMA stmt_join_pair)* RBRACK
+stmt_join_column ::= (table_alias DOT column_name) | column_name
+stmt_join_pair ::= ( stmt_join_column? EQEQ stmt_join_column ) | S_STRING | S_INDENTED_STRING
+stmt_join_conditions ::= LPAREN stmt_join_pair (COMMA stmt_join_pair)* RPAREN
 //window statement
 stmt_window ::= 'window' (stmt_window_rows_expression | stmt_window_expanding_expression | stmt_window_rolling_expression)? stmt_window_range_expression? stmt_window_block? {pin=1}
 stmt_window_rows_expression ::= 'rows' COLON MINUS? INTEGER_LITERAL? DOTDOT INTEGER_LITERAL?
diff --git a/src/main/grammars/prql.flex b/src/main/grammars/prql.flex
index 0758dea..24df060 100644
--- a/src/main/grammars/prql.flex
+++ b/src/main/grammars/prql.flex
@@ -177,7 +177,7 @@ INDENTED_STRING_QUOTE = (''')([']{0,2}([^']))*(''')
 
   {COMMENT}                      { return COMMENT; }
   {PARAM3}                        { return PARAM3; }
-  {PARAM2}                        { return PARAM2; }
+//  {PARAM2}                        { return PARAM2; }
   {PARAM}                        { return PARAM; }
   {IDENTIFIER}                   { return IDENTIFIER; }