Skip to content

Commit 265a7eb

Browse files
committed
fixed query where parameter against column with some reserved word
1 parent f930097 commit 265a7eb

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ MONTH : M O N T H;
135135
MOVE : M O V E;
136136
MUTATION : M U T A T I O N;
137137
NAN_SQL : N A N; // conflicts with macro NAN
138-
NAME : N A M E;
138+
NAME : N A M E;
139139
NO : N O;
140140
NO_PASSWORD : N O '_' P A S S W O R D;
141141
NONE : N O N E;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,7 @@ keyword
901901
| NO
902902
| NOT
903903
| NULLS
904+
| NAME
904905
| OFFSET
905906
| ON
906907
| OPTIMIZE

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ public static Object[][] testCTEStmtsDP() {
273273
public void testMiscStatements(String sql, int args) {
274274
SqlParser parser = new SqlParser();
275275
ParsedPreparedStatement stmt = parser.parsePreparedStatement(sql);
276-
Assert.assertFalse(stmt.isHasErrors());
277276
Assert.assertEquals(stmt.getArgCount(), args);
277+
Assert.assertFalse(stmt.isHasErrors());
278278
}
279279

280280
@DataProvider
@@ -296,6 +296,8 @@ public Object[][] testMiscStmtDp() {
296296
{"SELECT * FROM table primary WHERE ts = ?", 1},
297297
{"insert into events (s) values ('a')", 0},
298298
{"insert into `events` (s) values ('a')", 0},
299+
{"SELECT COUNT(*) > 0 FROM system.databases WHERE name = ?", 1},
300+
{"SELECT count(*) > 0 FROM system.databases WHERE c1 = ?", 1},
299301
};
300302
}
301303
}

0 commit comments

Comments
 (0)