Skip to content
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

SQL E2E compatible with com.mysql:mysql-connector-j:8.0 #28874

Merged
merged 1 commit into from
Oct 26, 2023
Merged

SQL E2E compatible with com.mysql:mysql-connector-j:8.0 #28874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ private void assertResultSet(final SingleE2EContainerComposer containerComposer,
}

private void assertResultSet(final SingleE2EContainerComposer containerComposer, final Statement statement, final String sql) throws SQLException {
try (ResultSet resultSet = statement.executeQuery(sql)) {
statement.execute(sql);
try (ResultSet resultSet = statement.getResultSet()) {
assertResultSet(containerComposer, resultSet);
}
}
Expand Down
9 changes: 5 additions & 4 deletions test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ void assertExecute(final AssertionTestParameter testParam) throws SQLException {
}

private void assertExecute(final SingleE2EContainerComposer containerComposer) throws SQLException {
try (Connection connection = containerComposer.getTargetDataSource().getConnection()) {
try (
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery(containerComposer.getSQL())) {
try (
Connection connection = containerComposer.getTargetDataSource().getConnection();
Statement statement = connection.createStatement()) {
statement.execute(containerComposer.getSQL());
try (ResultSet resultSet = statement.getResultSet()) {
assertResultSet(containerComposer, resultSet);
}
}
Expand Down