Repository: commons-dbcp Updated Branches: refs/heads/master 99facd021 -> 155eac83d
[DBCP-506] Support JDBC 4.2: new ResultSet methods. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/155eac83 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/155eac83 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/155eac83 Branch: refs/heads/master Commit: 155eac83dbf06ca184a49e35577aca1c0f295299 Parents: 99facd0 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Jun 17 10:15:46 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Jun 17 10:15:46 2018 -0600 ---------------------------------------------------------------------- .../commons/dbcp2/DelegatingResultSet.java | 50 ++++++++++++++++++++ .../apache/commons/dbcp2/TesterResultSet.java | 34 +++++++++---- 2 files changed, 76 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/155eac83/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java index cbfa857..6aaf238 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -31,6 +31,7 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.RowId; import java.sql.SQLException; +import java.sql.SQLType; import java.sql.SQLWarning; import java.sql.SQLXML; import java.sql.Statement; @@ -1860,6 +1861,30 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS } } + /** + * @since 2.5.0 + */ + @Override + public void updateObject(int columnIndex, Object x, SQLType targetSqlType) throws SQLException { + try { + resultSet.updateObject(columnIndex, x, targetSqlType); + } catch (final SQLException e) { + handleException(e); + } + } + + /** + * @since 2.5.0 + */ + @Override + public void updateObject(int columnIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException { + try { + resultSet.updateObject(columnIndex, x, targetSqlType, scaleOrLength); + } catch (final SQLException e) { + handleException(e); + } + } + @Override public void updateObject(final String columnName, final Object x) throws SQLException { try { @@ -1878,6 +1903,31 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS } } + /** + * @since 2.5.0 + */ + @Override + public void updateObject(String columnLabel, Object x, SQLType targetSqlType) throws SQLException { + try { + resultSet.updateObject(columnLabel, x, targetSqlType); + } catch (final SQLException e) { + handleException(e); + } + } + + /** + * @since 2.5.0 + */ + @Override + public void updateObject(String columnLabel, Object x, SQLType targetSqlType, int scaleOrLength) + throws SQLException { + try { + resultSet.updateObject(columnLabel, x, targetSqlType, scaleOrLength); + } catch (final SQLException e) { + handleException(e); + } + } + @Override public void updateRef(final int columnIndex, final Ref x) throws SQLException { try { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/155eac83/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java index f5c8342..9b734d0 100644 --- a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java +++ b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java @@ -25,6 +25,7 @@ import java.sql.Ref; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import java.sql.SQLType; import java.sql.SQLWarning; import java.sql.Statement; import java.util.Calendar; @@ -1070,8 +1071,17 @@ public java.sql.Date getDate(final int columnIndex, final Calendar cal) throws S } @Override - public void updateObject(final int columnIndex, final Object x, final int scale) - throws SQLException { + public void updateObject(final int columnIndex, final Object x, final int scale) throws SQLException { + checkOpen(); + } + + @Override + public void updateObject(int columnIndex, Object x, SQLType targetSqlType) throws SQLException { + checkOpen(); + } + + @Override + public void updateObject(int columnIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException { checkOpen(); } @@ -1081,20 +1091,28 @@ public java.sql.Date getDate(final int columnIndex, final Calendar cal) throws S } @Override - public void updateObject(final String columnName, final Object x, final int scale) - throws SQLException { + public void updateObject(final String columnName, final Object x, final int scale) throws SQLException { checkOpen(); } @Override - public void updateRef(final int columnIndex, final java.sql.Ref x) - throws SQLException { + public void updateObject(String columnLabel, Object x, SQLType targetSqlType) throws SQLException { + checkOpen(); + } + + @Override + public void updateObject(String columnLabel, Object x, SQLType targetSqlType, int scaleOrLength) + throws SQLException { + checkOpen(); + } + + @Override + public void updateRef(final int columnIndex, final java.sql.Ref x) throws SQLException { throw new SQLException("Not implemented."); } @Override - public void updateRef(final String columnName, final java.sql.Ref x) - throws SQLException { + public void updateRef(final String columnName, final java.sql.Ref x) throws SQLException { throw new SQLException("Not implemented."); }
