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

apache · Oct 26, 2023 · 937a557 · 937a557
1 parent 71ceb39
commit 937a557
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
@@ -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);
         }
     }

diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
@@ -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);
             }
         }