fixed column position in alter statement and renamed QUERY to JDBC_PARAM_PLACEHOLDER to avoid mistakes

Author: chernser

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/ClickHouseLexer.g4

@@ -253,7 +253,7 @@ PULLING : P U L L I N G ;
 PULL : P U L L;
 QUARTER      : Q U A R T E R;
 QUERIES : Q U E R I E S;
-QUERY_SQL : Q U E R Y; // conflicts with '?'
+QUERY : Q U E R Y;
 QUEUE : Q U E U E ;
 QUEUES : Q U E U E S ;
 QUOTA : Q U O T A;
@@ -460,7 +460,7 @@ LT           : '<';
 NOT_EQ       : '!=' | '<>';
 PERCENT      : '%';
 PLUS         : '+';
-QUERY        : '?';
+JDBC_PARAM_PLACEHOLDER        : '?';
 QUOTE_DOUBLE : '"';
 QUOTE_SINGLE : '\'';
 RBRACE       : '}';

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/ClickHouseParser.g4

@@ -63,9 +63,9 @@ alterStmt
     ;
 
 alterTableClause
-    : ADD COLUMN (IF NOT EXISTS)? tableColumnDfnt ((AFTER nestedIdentifier) | FIRST)?         # AlterTableClauseAddColumn
-    | ADD INDEX (IF NOT EXISTS)? tableIndexDfnt ((AFTER nestedIdentifier) | FIRST)?           # AlterTableClauseAddIndex
-    | ADD PROJECTION (IF NOT EXISTS)? tableProjectionDfnt (AFTER (nestedIdentifier | FIRST))? # AlterTableClauseAddProjection
+    : ADD COLUMN (IF NOT EXISTS)? tableColumnDfnt alterTableColumnPosition?         # AlterTableClauseAddColumn
+    | ADD INDEX (IF NOT EXISTS)? tableIndexDfnt alterTableColumnPosition?           # AlterTableClauseAddIndex
+    | ADD PROJECTION (IF NOT EXISTS)? tableProjectionDfnt alterTableColumnPosition? # AlterTableClauseAddProjection
     | ATTACH partitionClause (FROM tableIdentifier)?                                # AlterTableClauseAttach
     | CLEAR COLUMN (IF EXISTS)? nestedIdentifier (IN partitionClause)?              # AlterTableClauseClearColumn
     | CLEAR INDEX (IF EXISTS)? nestedIdentifier (IN partitionClause)?               # AlterTableClauseClearIndex
@@ -84,7 +84,7 @@ alterTableClause
     | MODIFY COLUMN (IF EXISTS)? nestedIdentifier COMMENT STRING_LITERAL            # AlterTableClauseModifyComment
     | MODIFY COLUMN (IF EXISTS)? nestedIdentifier REMOVE tableColumnPropertyType    # AlterTableClauseModifyRemove
     | MODIFY COLUMN (IF EXISTS)? tableColumnDfnt                                    # AlterTableClauseModify
-    | ALTER COLUMN (IF EXISTS)? identifier TYPE columnTypeExpr codecExpr? ttlClause? settingExprList? ((AFTER nestedIdentifier) | FIRST)? # AlterTableClauseAlterType
+    | ALTER COLUMN (IF EXISTS)? identifier TYPE columnTypeExpr codecExpr? ttlClause? settingExprList? alterTableColumnPosition? # AlterTableClauseAlterType
     | MODIFY ORDER BY columnExpr                                                    # AlterTableClauseModifyOrderBy
     | MODIFY ttlClause                                                              # AlterTableClauseModifyTTL
     | MODIFY COMMENT literal                                                        # AlterTableClauseModifyComment
@@ -99,13 +99,18 @@ alterTableClause
     | UPDATE assignmentExprList whereClause                           # AlterTableClauseUpdate
     ;
 
+alterTableColumnPosition
+    : (AFTER nestedIdentifier)
+    | FIRST
+    ;
+
 assignmentExprList
     : assignmentExpr (COMMA assignmentExpr)*
     ;
 
 assignmentExpr
     : nestedIdentifier EQ_SINGLE columnExpr
-    | nestedIdentifier EQ_SINGLE QUERY
+    | nestedIdentifier EQ_SINGLE JDBC_PARAM_PLACEHOLDER
     ;
 
 tableColumnPropertyType
@@ -419,7 +424,7 @@ assignmentValues
 
 assignmentValue
     : literal   # InsertRawValue
-    | QUERY     # InsertParameter
+    | JDBC_PARAM_PLACEHOLDER     # InsertParameter
     | identifier (LPAREN columnExprList? RPAREN)? # InsertParameterFuncExpr
     | LPAREN? columnExpr RPAREN? # InserParameterExpr
     ;
@@ -428,7 +433,7 @@ assignmentValue
 
 killStmt
     : KILL MUTATION clusterClause? whereClause (SYNC | ASYNC | TEST)? (FORMAT identifier)? # KillMutationStmt
-    | KILL QUERY_SQL clusterClause? whereClause (SYNC | ASYNC | TEST)? (FORMAT identifier)? # KillQueryStmt
+    | KILL QUERY clusterClause? whereClause (SYNC | ASYNC | TEST)? (FORMAT identifier)? # KillQueryStmt
     ;
 
 // OPTIMIZE statement
@@ -493,7 +498,7 @@ columnAliases
 
 cteUnboundCol
     : literal AS identifier # CteUnboundColLiteral
-    | QUERY AS identifier # CteUnboundColParam
+    | JDBC_PARAM_PLACEHOLDER AS identifier # CteUnboundColParam
     | LPAREN? columnExpr RPAREN? AS? identifier? # CteUnboundColExpr
     | LPAREN selectStmt RPAREN AS identifier # CteUnboundSubQuery
 //    | LPAREN cteStmt? selectStmt RPAREN AS identifier # CteUnboundNestedSelect
@@ -505,13 +510,13 @@ topClause
 
 fromClause
     : FROM joinExpr
-    | FROM identifier LPAREN QUERY RPAREN
+    | FROM identifier LPAREN JDBC_PARAM_PLACEHOLDER RPAREN
     | FROM selectStmt
     | FROM identifier LPAREN viewParam (COMMA viewParam)?  RPAREN
     ;
 
 viewParam
-    : identifier EQ_SINGLE (literal | QUERY)
+    : identifier EQ_SINGLE (literal | JDBC_PARAM_PLACEHOLDER)
     ;
 
 arrayJoinClause
@@ -1096,21 +1101,21 @@ columnExpr
     | columnExpr OR columnExpr    # ColumnExprOr
     // TODO(ilezhankin): `BETWEEN a AND b AND c` is parsed in a wrong way: `BETWEEN (a AND b) AND c`
     | columnExpr NOT? BETWEEN columnExpr AND columnExpr            # ColumnExprBetween
-    | <assoc = right> columnExpr QUERY columnExpr COLON columnExpr # ColumnExprTernaryOp
+    | <assoc = right> columnExpr JDBC_PARAM_PLACEHOLDER columnExpr COLON columnExpr # ColumnExprTernaryOp
     | columnExpr (alias | AS identifier)                           # ColumnExprAlias
     | (tableIdentifier DOT)? ASTERISK                              # ColumnExprAsterisk // single-column only
     | LPAREN selectUnionStmt RPAREN                                # ColumnExprSubquery // single-column only
     | LPAREN columnExpr RPAREN                                     # ColumnExprParens   // single-column only
     | LPAREN columnExprList RPAREN                                 # ColumnExprTuple
     | LBRACKET columnExprList? RBRACKET                            # ColumnExprArray
     | columnIdentifier                                             # ColumnExprIdentifier
-    | QUERY (CAST_OP identifier)?                                  # ColumnExprParam
+    | JDBC_PARAM_PLACEHOLDER (CAST_OP identifier)?                                  # ColumnExprParam
     | columnExpr REGEXP literal                                    # ColumnExprRegexp
     ;
 
 columnArgList
     : columnArgExpr (COMMA columnArgExpr)*
-    | QUERY (COMMA QUERY)*
+    | JDBC_PARAM_PLACEHOLDER (COMMA JDBC_PARAM_PLACEHOLDER)*
     ;
 
 columnArgExpr

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/ParsedPreparedStatement.java

@@ -199,15 +199,15 @@ public void enterInsertParameter(ClickHouseParser.InsertParameterContext ctx) {
 
     @Override
     public void enterFromClause(ClickHouseParser.FromClauseContext ctx) {
-        if (ctx.QUERY() != null) {
-            appendParameter(ctx.QUERY().getSymbol().getStartIndex());
+        if (ctx.JDBC_PARAM_PLACEHOLDER() != null) {
+            appendParameter(ctx.JDBC_PARAM_PLACEHOLDER().getSymbol().getStartIndex());
         }
     }
 
     @Override
     public void enterViewParam(ClickHouseParser.ViewParamContext ctx) {
-        if (ctx.QUERY() != null) {
-            appendParameter(ctx.QUERY().getSymbol().getStartIndex());
+        if (ctx.JDBC_PARAM_PLACEHOLDER() != null) {
+            appendParameter(ctx.JDBC_PARAM_PLACEHOLDER().getSymbol().getStartIndex());
         }
     }