Skip to content

Fix error when use_new_parser is set to false #618

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
zhicwu merged 2 commits into from
Apr 10, 2021
+20 −1
Merged

Fix error when use_new_parser is set to false #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
552b1d7
Fix error when use_new_parser is set to false
zhicwu Apr 10, 2021
b83e74c
Remove useless code
zhicwu Apr 10, 2021
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
2 changes: 1 addition & 1 deletion clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseStatementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public ResultSet executeQuery(String sql,
if (extractWithTotals(sql)) {
positions.put(ClickHouseSqlStatement.KEYWORD_TOTALS, 1);
}
parsedStmt = new ClickHouseSqlStatement(sql, StatementType.SELECT,
parsedStmt = new ClickHouseSqlStatement(clickhousifySql(sql), StatementType.SELECT,
null, dbName, tableName, null, null, null, positions);
// httpContext.setAttribute("is_idempotent", Boolean.TRUE);
}
Expand Down
19 changes: 19 additions & 0 deletions ...use-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseConnectionImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
package ru.yandex.clickhouse.integration;

import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;

import javax.sql.DataSource;

import org.testng.annotations.Test;

import ru.yandex.clickhouse.ClickHouseContainerForTest;
import ru.yandex.clickhouse.ClickHouseDataSource;
import ru.yandex.clickhouse.except.ClickHouseException;
import ru.yandex.clickhouse.settings.ClickHouseProperties;

import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;

Expand Down Expand Up @@ -70,6 +75,20 @@ public void testOofWrongPassword() throws Exception {
assertFailure(createDataSource("oof", "baz"));
}

@Test
public void testNewParserOption() throws Exception {
ClickHouseProperties props = new ClickHouseProperties();
props.setUseNewParser(false);
ClickHouseDataSource ds = ClickHouseContainerForTest.newDataSource(props);
try (Connection conn = ds.getConnection(); Statement s = conn.createStatement();
ResultSet rs = s.executeQuery("select timezone(), version()");) {
assertTrue(rs.next());
assertNotNull(rs.getString(1));
assertNotNull(rs.getString(2));
assertFalse(rs.next());
}
}

private static void assertSuccess(DataSource dataSource) throws Exception {
Connection connection = dataSource.getConnection();
assertTrue(connection.createStatement().execute("SELECT 1"));
Expand Down