[shardingsphere] branch master updated: Implement DatabaseMetaDataResultSet.getStatement (#24147)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new f594fcf7198 Implement DatabaseMetaDataResultSet.getStatement (#24147)
f594fcf7198 is described below

commit f594fcf7198b26b52bc678105b9bbe3778a829f9
Author: GuoHaoZai <44...@users.noreply.github.com>
AuthorDate: Wed Feb 15 09:49:33 2023 +0800

    Implement DatabaseMetaDataResultSet.getStatement (#24147)
    
    Co-authored-by: Hao Guo <gu...@rd.netease.com>
---
 .../driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java  | 10 ++++++++--
 .../AbstractUnsupportedDatabaseMetaDataResultSet.java          |  6 ------
 .../unsupported/UnSupportedDatabaseMetaDataResultSetTest.java  |  5 -----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
index af91285f3b8..0491c006e7f 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
@@ -32,6 +32,7 @@ import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -174,7 +175,12 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
     public BigDecimal getBigDecimal(final String columnLabel) throws SQLException {
         return getBigDecimal(findColumn(columnLabel));
     }
-    
+
+    @Override
+    public Statement getStatement() throws SQLException {
+        return resultSet.getStatement();
+    }
+
     @Override
     public String getString(final int columnIndex) throws SQLException {
         checkClosed();
@@ -203,7 +209,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
         checkColumnIndex(columnIndex);
         return (boolean) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), boolean.class);
     }
-    
+
     @Override
     public boolean getBoolean(final String columnLabel) throws SQLException {
         return getBoolean(findColumn(columnLabel));
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedDatabaseMetaDataResultSet.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedDatabaseMetaDataResultSet.java
index dbb637a976a..b70fc73ff7d 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedDatabaseMetaDataResultSet.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedDatabaseMetaDataResultSet.java
@@ -27,7 +27,6 @@ import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.SQLWarning;
 import java.sql.SQLXML;
-import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
@@ -87,11 +86,6 @@ public abstract class AbstractUnsupportedDatabaseMetaDataResultSet extends Abstr
         throw new SQLFeatureNotSupportedException("getCharacterStream");
     }
     
-    @Override
-    public final Statement getStatement() throws SQLException {
-        throw new SQLFeatureNotSupportedException("getStatement");
-    }
-    
     @Override
     public final Array getArray(final int columnIndex) throws SQLException {
         throw new SQLFeatureNotSupportedException("getArray");
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnSupportedDatabaseMetaDataResultSetTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnSupportedDatabaseMetaDataResultSetTest.java
index 653d216c1fb..411f47be667 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnSupportedDatabaseMetaDataResultSetTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnSupportedDatabaseMetaDataResultSetTest.java
@@ -91,11 +91,6 @@ public final class UnSupportedDatabaseMetaDataResultSetTest {
         databaseMetaDataResultSet.getCharacterStream("");
     }
     
-    @Test(expected = SQLFeatureNotSupportedException.class)
-    public void assertGetStatement() throws SQLException {
-        databaseMetaDataResultSet.getStatement();
-    }
-    
     @Test(expected = SQLFeatureNotSupportedException.class)
     public void assertGetBlobWithIndex() throws SQLException {
         databaseMetaDataResultSet.getBlob(1);