commons-dbcp git commit: [DBCP-506] Support JDBC 4.2.

2018-06-17 Thread ggregory
Repository: commons-dbcp
Updated Branches:
  refs/heads/master 155eac83d -> 40a36395a


[DBCP-506] Support JDBC 4.2.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/40a36395
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/40a36395
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/40a36395

Branch: refs/heads/master
Commit: 40a36395a410464296ec2ee056724631b5fd17fc
Parents: 155eac8
Author: Gary Gregory 
Authored: Sun Jun 17 10:16:37 2018 -0600
Committer: Gary Gregory 
Committed: Sun Jun 17 10:16:37 2018 -0600

--
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/40a36395/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index db111aa..62c845b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -64,6 +64,9 @@ The  type attribute can be add,update,fix,remove.
   
 Update Java requirement from version 7 to 8.
   
+  
+Support JDBC 4.2.
+  
 
 
   



commons-dbcp git commit: [DBCP-506] Support JDBC 4.2: new ResultSet methods.

2018-06-17 Thread ggregory
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 
Authored: Sun Jun 17 10:15:46 2018 -0600
Committer: Gary Gregory 
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 

commons-dbcp git commit: [DBCP-506] Support JDBC 4.2: new CallableStatement methods.

2018-06-17 Thread ggregory
Repository: commons-dbcp
Updated Branches:
  refs/heads/master 358509bd7 -> c5dc98d98


[DBCP-506] Support JDBC 4.2: new CallableStatement 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/c5dc98d9
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/c5dc98d9
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/c5dc98d9

Branch: refs/heads/master
Commit: c5dc98d98d8b1d06585b9e23e04418532a6cb3d8
Parents: 358509b
Author: Gary Gregory 
Authored: Sun Jun 17 10:07:17 2018 -0600
Committer: Gary Gregory 
Committed: Sun Jun 17 10:07:17 2018 -0600

--
 .../dbcp2/DelegatingCallableStatement.java  | 110 +++
 .../commons/dbcp2/TesterCallableStatement.java  |  42 +++
 2 files changed, 152 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/c5dc98d9/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java 
b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
index 762c724..2e36c2b 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
@@ -30,6 +30,7 @@ import java.sql.NClob;
 import java.sql.Ref;
 import java.sql.RowId;
 import java.sql.SQLException;
+import java.sql.SQLType;
 import java.sql.SQLXML;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -772,6 +773,47 @@ public class DelegatingCallableStatement extends 
DelegatingPreparedStatement imp
 }
 }
 
+/**
+ * @since 2.5.0
+ */
+@Override
+public void registerOutParameter(final int parameterIndex, final SQLType 
sqlType) throws SQLException {
+checkOpen();
+try {
+
getDelegateCallableStatement().registerOutParameter(parameterIndex, sqlType);
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
+/**
+ * @since 2.5.0
+ */
+@Override
+public void registerOutParameter(final int parameterIndex, final SQLType 
sqlType, final int scale)
+throws SQLException {
+checkOpen();
+try {
+
getDelegateCallableStatement().registerOutParameter(parameterIndex, sqlType, 
scale);
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
+/**
+ * @since 2.5.0
+ */
+@Override
+public void registerOutParameter(final int parameterIndex, final SQLType 
sqlType, final String typeName)
+throws SQLException {
+checkOpen();
+try {
+
getDelegateCallableStatement().registerOutParameter(parameterIndex, sqlType, 
typeName);
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
 @Override
 public void registerOutParameter(final String parameterName, final int 
sqlType) throws SQLException {
 checkOpen();
@@ -804,6 +846,47 @@ public class DelegatingCallableStatement extends 
DelegatingPreparedStatement imp
 }
 }
 
+/**
+ * @since 2.5.0
+ */
+@Override
+public void registerOutParameter(final String parameterName, final SQLType 
sqlType) throws SQLException {
+checkOpen();
+try {
+getDelegateCallableStatement().registerOutParameter(parameterName, 
sqlType);
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
+/**
+ * @since 2.5.0
+ */
+@Override
+public void registerOutParameter(final String parameterName, final SQLType 
sqlType, final int scale)
+throws SQLException {
+checkOpen();
+try {
+getDelegateCallableStatement().registerOutParameter(parameterName, 
sqlType, scale);
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
+/**
+ * @since 2.5.0
+ */
+@Override
+public void registerOutParameter(final String parameterName, final SQLType 
sqlType, final String typeName)
+throws SQLException {
+checkOpen();
+try {
+getDelegateCallableStatement().registerOutParameter(parameterName, 
sqlType, typeName);
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
 @Override
 public void setAsciiStream(final String parameterName, final InputStream 
inputStream) throws SQLException {
 checkOpen();
@@ -1167,6 +1250,33 @@ public class DelegatingCallableStatement extends 
DelegatingPreparedStatement imp
 }
 }
 
+/**
+ * @since 2.5.0
+ */
+@Override
+public void 

commons-dbcp git commit: [DBCP-506] Support JDBC 4.2: new PreparedStatement methods.

2018-06-17 Thread ggregory
Repository: commons-dbcp
Updated Branches:
  refs/heads/master 63bee061f -> 358509bd7


[DBCP-506] Support JDBC 4.2: new PreparedStatement 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/358509bd
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/358509bd
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/358509bd

Branch: refs/heads/master
Commit: 358509bd7f7553356ad086ff93bbf5e9aaaf7753
Parents: 63bee06
Author: Gary Gregory 
Authored: Sun Jun 17 10:05:45 2018 -0600
Committer: Gary Gregory 
Committed: Sun Jun 17 10:05:45 2018 -0600

--
 .../apache/commons/dbcp2/DelegatingPreparedStatement.java   | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/358509bd/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java 
b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
index b7e91f4..a25bd48 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
@@ -98,6 +98,9 @@ public class DelegatingPreparedStatement extends 
DelegatingStatement implements
 }
 }
 
+/**
+ * @since 2.5.0
+ */
 @Override
 public long executeLargeUpdate() throws SQLException {
 checkOpen();
@@ -540,6 +543,9 @@ public class DelegatingPreparedStatement extends 
DelegatingStatement implements
 }
 }
 
+/**
+ * @since 2.5.0
+ */
 @Override
 public void setObject(int parameterIndex, Object x, SQLType targetSqlType) 
throws SQLException {
 checkOpen();
@@ -550,6 +556,9 @@ public class DelegatingPreparedStatement extends 
DelegatingStatement implements
 }
 }
 
+/**
+ * @since 2.5.0
+ */
 @Override
 public void setObject(int parameterIndex, Object x, SQLType targetSqlType, 
int scaleOrLength) throws SQLException {
 checkOpen();



commons-dbcp git commit: [DBCP-506] Support JDBC 4.2: new PreparedStatement methods.

2018-06-17 Thread ggregory
Repository: commons-dbcp
Updated Branches:
  refs/heads/master c510b94ad -> 21d75a867


[DBCP-506] Support JDBC 4.2: new PreparedStatement 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/21d75a86
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/21d75a86
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/21d75a86

Branch: refs/heads/master
Commit: 21d75a867ed4659b6796406ea26510f683f3ee42
Parents: c510b94
Author: Gary Gregory 
Authored: Sun Jun 17 09:56:59 2018 -0600
Committer: Gary Gregory 
Committed: Sun Jun 17 09:56:59 2018 -0600

--
 .../dbcp2/DelegatingPreparedStatement.java  | 306 ++-
 .../commons/dbcp2/TesterPreparedStatement.java  |  11 +
 2 files changed, 180 insertions(+), 137 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/21d75a86/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java 
b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
index 2fe7460..b7e91f4 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.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.SQLXML;
 import java.sql.Statement;
 import java.sql.Time;
@@ -64,6 +65,51 @@ public class DelegatingPreparedStatement extends 
DelegatingStatement implements
 }
 
 @Override
+public void addBatch() throws SQLException {
+checkOpen();
+try {
+getDelegatePreparedStatement().addBatch();
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
+@Override
+public void clearParameters() throws SQLException {
+checkOpen();
+try {
+getDelegatePreparedStatement().clearParameters();
+} catch (final SQLException e) {
+handleException(e);
+}
+}
+
+@Override
+public boolean execute() throws SQLException {
+checkOpen();
+if (getConnectionInternal() != null) {
+getConnectionInternal().setLastUsed();
+}
+try {
+return getDelegatePreparedStatement().execute();
+} catch (final SQLException e) {
+handleException(e);
+return false;
+}
+}
+
+@Override
+public long executeLargeUpdate() throws SQLException {
+checkOpen();
+try {
+return getDelegatePreparedStatement().executeLargeUpdate();
+} catch (final SQLException e) {
+handleException(e);
+return 0;
+}
+}
+
+@Override
 public ResultSet executeQuery() throws SQLException {
 checkOpen();
 if (getConnectionInternal() != null) {
@@ -96,559 +142,545 @@ public class DelegatingPreparedStatement extends 
DelegatingStatement implements
 }
 
 @Override
-public void setNull(final int parameterIndex, final int sqlType) throws 
SQLException {
+public ResultSetMetaData getMetaData() throws SQLException {
 checkOpen();
 try {
-getDelegatePreparedStatement().setNull(parameterIndex, sqlType);
+return getDelegatePreparedStatement().getMetaData();
 } catch (final SQLException e) {
 handleException(e);
+throw new AssertionError();
 }
 }
 
 @Override
-public void setBoolean(final int parameterIndex, final boolean x) throws 
SQLException {
+public java.sql.ParameterMetaData getParameterMetaData() throws 
SQLException {
 checkOpen();
 try {
-getDelegatePreparedStatement().setBoolean(parameterIndex, x);
+return getDelegatePreparedStatement().getParameterMetaData();
 } catch (final SQLException e) {
 handleException(e);
+throw new AssertionError();
 }
 }
 
 @Override
-public void setByte(final int parameterIndex, final byte x) throws 
SQLException {
+public void setArray(final int i, final Array x) throws SQLException {
 checkOpen();
 try {
-getDelegatePreparedStatement().setByte(parameterIndex, x);
+getDelegatePreparedStatement().setArray(i, x);
 } catch (final SQLException e) {
 handleException(e);
 }
 }
 
 @Override
-public void setShort(final int parameterIndex, final short x) throws 
SQLException {
+public void setAsciiStream(final int parameterIndex, final 

commons-dbcp git commit: [DBCP-506] Support JDBC 4.2: new Statement methods.

2018-06-17 Thread ggregory
Repository: commons-dbcp
Updated Branches:
  refs/heads/master 37daf894a -> 812121b8e


[DBCP-506] Support JDBC 4.2: new Statement 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/812121b8
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/812121b8
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/812121b8

Branch: refs/heads/master
Commit: 812121b8e36f8588973c7ed4deb44838a5616d61
Parents: 37daf89
Author: Gary Gregory 
Authored: Sun Jun 17 09:00:10 2018 -0600
Committer: Gary Gregory 
Committed: Sun Jun 17 09:00:10 2018 -0600

--
 .../commons/dbcp2/DelegatingStatement.java  | 162 +++
 .../dbcp2/TestAbandonedBasicDataSource.java |  33 
 .../commons/dbcp2/TesterPreparedStatement.java  |  34 +++-
 .../apache/commons/dbcp2/TesterStatement.java   |  70 ++--
 4 files changed, 253 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/812121b8/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
--
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java 
b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
index 00f440f..38980f6 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -170,9 +170,7 @@ public class DelegatingStatement extends AbandonedTrace 
implements Statement {
 @Override
 public boolean execute(final String sql) throws SQLException {
 checkOpen();
-if (connection != null) {
-connection.setLastUsed();
-}
+setLastUsedInParent();
 try {
 return statement.execute(sql);
 } catch (final SQLException e) {
@@ -184,9 +182,7 @@ public class DelegatingStatement extends AbandonedTrace 
implements Statement {
 @Override
 public boolean execute(final String sql, final int autoGeneratedKeys) 
throws SQLException {
 checkOpen();
-if (connection != null) {
-connection.setLastUsed();
-}
+setLastUsedInParent();
 try {
 return statement.execute(sql, autoGeneratedKeys);
 } catch (final SQLException e) {
@@ -198,9 +194,7 @@ public class DelegatingStatement extends AbandonedTrace 
implements Statement {
 @Override
 public boolean execute(final String sql, final int columnIndexes[]) throws 
SQLException {
 checkOpen();
-if (connection != null) {
-connection.setLastUsed();
-}
+setLastUsedInParent();
 try {
 return statement.execute(sql, columnIndexes);
 } catch (final SQLException e) {
@@ -212,9 +206,7 @@ public class DelegatingStatement extends AbandonedTrace 
implements Statement {
 @Override
 public boolean execute(final String sql, final String columnNames[]) 
throws SQLException {
 checkOpen();
-if (connection != null) {
-connection.setLastUsed();
-}
+setLastUsedInParent();
 try {
 return statement.execute(sql, columnNames);
 } catch (final SQLException e) {
@@ -226,9 +218,7 @@ public class DelegatingStatement extends AbandonedTrace 
implements Statement {
 @Override
 public int[] executeBatch() throws SQLException {
 checkOpen();
-if (connection != null) {
-connection.setLastUsed();
-}
+setLastUsedInParent();
 try {
 return statement.executeBatch();
 } catch (final SQLException e) {
@@ -237,12 +227,85 @@ public class DelegatingStatement extends AbandonedTrace 
implements Statement {
 }
 }
 
+/**
+ * @since 2.5.0
+ */
 @Override
-public ResultSet executeQuery(final String sql) throws SQLException {
+public long[] executeLargeBatch() throws SQLException {
 checkOpen();
-if (connection != null) {
-connection.setLastUsed();
+setLastUsedInParent();
+try {
+return statement.executeLargeBatch();
+} catch (final SQLException e) {
+handleException(e);
+return null;
 }
+}
+
+/**
+ * @since 2.5.0
+ */
+@Override
+public long executeLargeUpdate(final String sql) throws SQLException {
+checkOpen();
+setLastUsedInParent();
+try {
+return statement.executeLargeUpdate(sql);
+} catch (final SQLException e) {
+handleException(e);
+return 0;
+}
+}
+
+/**
+ * @since 2.5.0
+ */
+@Override
+public long executeLargeUpdate(final String sql, final int 
autoGeneratedKeys) 

commons-dbcp git commit: [DBCP-506] Support JDBC 4.2.

2018-06-16 Thread ggregory
Repository: commons-dbcp
Updated Branches:
  refs/heads/master e45c8fbc3 -> f4bc7cb02


[DBCP-506] Support JDBC 4.2.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/f4bc7cb0
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/f4bc7cb0
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/f4bc7cb0

Branch: refs/heads/master
Commit: f4bc7cb026b668257dcd5b083282fc6c2f70f2e9
Parents: e45c8fb
Author: Gary Gregory 
Authored: Sat Jun 16 17:36:55 2018 -0600
Committer: Gary Gregory 
Committed: Sat Jun 16 17:36:55 2018 -0600

--
 .../dbcp2/DelegatingDatabaseMetaData.java   | 34 +---
 1 file changed, 30 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/f4bc7cb0/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java 
b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
index d345371..3423979 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
@@ -588,6 +588,19 @@ public class DelegatingDatabaseMetaData implements 
DatabaseMetaData {
 }
 }
 
+/**
+ * @since 2.5.0
+ */
+@Override
+public long getMaxLogicalLobSize() throws SQLException {
+try {
+return databaseMetaData.getMaxLogicalLobSize();
+} catch (final SQLException e) {
+handleException(e);
+return 0;
+}
+}
+
 @Override
 public int getMaxProcedureNameLength() throws SQLException {
 try {
@@ -1650,6 +1663,19 @@ public class DelegatingDatabaseMetaData implements 
DatabaseMetaData {
 }
 }
 
+/**
+ * @since 2.5.0
+ */
+@Override
+public boolean supportsRefCursors() throws SQLException {
+try {
+return databaseMetaData.supportsRefCursors();
+} catch (final SQLException e) {
+handleException(e);
+return false;
+}
+}
+
 @Override
 public boolean supportsResultSetConcurrency(final int type, final int 
concurrency) throws SQLException {
 try {
@@ -1780,6 +1806,8 @@ public class DelegatingDatabaseMetaData implements 
DatabaseMetaData {
 }
 }
 
+/* JDBC_4_ANT_KEY_BEGIN */
+
 @Override
 public boolean supportsSubqueriesInComparisons() throws SQLException {
 try {
@@ -1800,8 +1828,6 @@ public class DelegatingDatabaseMetaData implements 
DatabaseMetaData {
 }
 }
 
-/* JDBC_4_ANT_KEY_BEGIN */
-
 @Override
 public boolean supportsSubqueriesInIns() throws SQLException {
 try {
@@ -1872,6 +1898,8 @@ public class DelegatingDatabaseMetaData implements 
DatabaseMetaData {
 }
 }
 
+/* JDBC_4_ANT_KEY_END */
+
 @Override
 public  T unwrap(final Class iface) throws SQLException {
 if (iface.isAssignableFrom(getClass())) {
@@ -1893,8 +1921,6 @@ public class DelegatingDatabaseMetaData implements 
DatabaseMetaData {
 }
 }
 
-/* JDBC_4_ANT_KEY_END */
-
 @Override
 public boolean usesLocalFilePerTable() throws SQLException {
 try {