Skip to content

[jdbc-v2] Adds source keyword as one for alias #2435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chernser merged 3 commits into from
Jun 10, 2025
Merged

[jdbc-v2] Adds source keyword as one for alias #2435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b2b05b
added source keyword as one for alias
chernser Jun 6, 2025
2a92383
added some keywords for alias name that allowed by ClickHouse
chernser Jun 6, 2025
1652400
fixed test for prepared statement to accept SUCCESS_NO_INFO result fo…
chernser Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,16 @@ keywordForAlias
| FIRST
| ID
| KEY
| SOURCE
| AFTER
| CASE
| CLUSTER
| CURRENT
| INDEX
| TABLES
| TEST
| VIEW
| PRIMARY
;

alias
Expand Down
2 changes: 1 addition & 1 deletion jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ void testBatchInsertWithRowBinary(String sql, Class implClass) throws Exception

int[] result = stmt.executeBatch();
for (int r : result) {
Assert.assertEquals(r, 1);
Assert.assertTrue(r == 1 || r == PreparedStatement.SUCCESS_NO_INFO);
}
}

Expand Down
18 changes: 18 additions & 0 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
package com.clickhouse.jdbc.internal;


import org.antlr.v4.runtime.tree.TerminalNode;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
Expand Down Expand Up @@ -275,6 +281,18 @@ public Object[][] testMiscStmtDp() {
return new Object[][] {
{"SELECT INTERVAL '1 day'", 0},
{"SELECT INTERVAL 1 day", 0},
{"SELECT * FROM table key WHERE ts = ?", 1},
{"SELECT * FROM table source WHERE ts = ?", 1},
{"SELECT * FROM table after WHERE ts = ?", 1},
{"SELECT * FROM table before WHERE ts = ?", 1},
{"SELECT * FROM table case WHERE ts = ?", 1},
{"SELECT * FROM table cluster WHERE ts = ?", 1},
{"SELECT * FROM table current WHERE ts = ?", 1},
{"SELECT * FROM table index WHERE ts = ?", 1},
{"SELECT * FROM table tables WHERE ts = ?", 1},
{"SELECT * FROM table test WHERE ts = ?", 1},
{"SELECT * FROM table view WHERE ts = ?", 1},
{"SELECT * FROM table primary WHERE ts = ?", 1},
};
}
}
Loading