SOURCES: jakarta-commons-dbcp-bug-191.patch (NEW) - saved from htt...
glen
glen at pld-linux.org
Fri Dec 7 22:35:13 CET 2007
Author: glen Date: Fri Dec 7 21:35:13 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- saved from http://issues.apache.org/jira/browse/DBCP-191
---- Files affected:
SOURCES:
jakarta-commons-dbcp-bug-191.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/jakarta-commons-dbcp-bug-191.patch
diff -u /dev/null SOURCES/jakarta-commons-dbcp-bug-191.patch:1.1
--- /dev/null Fri Dec 7 22:35:13 2007
+++ SOURCES/jakarta-commons-dbcp-bug-191.patch Fri Dec 7 22:35:08 2007
@@ -0,0 +1,2083 @@
+Index: src/test/org/apache/commons/dbcp/TesterCallableStatement.java
+===================================================================
+--- src/test/org/apache/commons/dbcp/TesterCallableStatement.java (revision 558600)
++++ src/test/org/apache/commons/dbcp/TesterCallableStatement.java (working copy)
+@@ -33,6 +33,11 @@
+ import java.sql.Timestamp;
+ import java.util.Calendar;
+ import java.util.Map;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * Trivial implementation of a CallableStatement to avoid null pointer exceptions in tests.
+@@ -338,4 +343,114 @@
+ public URL getURL(String parameterName) throws SQLException {
+ return null;
+ }
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public RowId getRowId(int parameterIndex) throws SQLException {
++ return null;
++ }
++
++ public RowId getRowId(String parameterName) throws SQLException {
++ return null;
++ }
++
++ public void setRowId(String parameterName, RowId value) throws SQLException {
++ }
++
++ public void setNString(String parameterName, String value) throws SQLException {
++ }
++
++ public void setNCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
++ }
++
++ public void setNClob(String parameterName, NClob value) throws SQLException {
++ }
++
++ public void setClob(String parameterName, Reader reader, long length) throws SQLException {
++ }
++
++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
++ }
++
++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
++ }
++
++ public NClob getNClob(int parameterIndex) throws SQLException {
++ return null;
++ }
++
++ public NClob getNClob(String parameterName) throws SQLException {
++ return null;
++ }
++
++ public void setSQLXML(String parameterName, SQLXML value) throws SQLException {
++ }
++
++ public SQLXML getSQLXML(int parameterIndex) throws SQLException {
++ return null;
++ }
++
++ public SQLXML getSQLXML(String parameterName) throws SQLException {
++ return null;
++ }
++
++ public String getNString(int parameterIndex) throws SQLException {
++ return null;
++ }
++
++ public String getNString(String parameterName) throws SQLException {
++ return null;
++ }
++
++ public Reader getNCharacterStream(int parameterIndex) throws SQLException {
++ return null;
++ }
++
++ public Reader getNCharacterStream(String parameterName) throws SQLException {
++ return null;
++ }
++
++ public Reader getCharacterStream(int parameterIndex) throws SQLException {
++ return null;
++ }
++
++ public Reader getCharacterStream(String parameterName) throws SQLException {
++ return null;
++ }
++
++ public void setBlob(String parameterName, Blob blob) throws SQLException {
++ }
++
++ public void setClob(String parameterName, Clob clob) throws SQLException {
++ }
++
++ public void setAsciiStream(String parameterName, InputStream inputStream, long length) throws SQLException {
++ }
++
++ public void setBinaryStream(String parameterName, InputStream inputStream, long length) throws SQLException {
++ }
++
++ public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
++ }
++
++ public void setAsciiStream(String parameterName, InputStream inputStream) throws SQLException {
++ }
++
++ public void setBinaryStream(String parameterName, InputStream inputStream) throws SQLException {
++ }
++
++ public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
++ }
++
++ public void setNCharacterStream(String parameterName, Reader reader) throws SQLException {
++ }
++
++ public void setClob(String parameterName, Reader reader) throws SQLException {
++ }
++
++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
++ }
++
++ public void setNClob(String parameterName, Reader reader) throws SQLException {
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+Index: src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
+===================================================================
+--- src/test/org/apache/commons/dbcp/TesterPreparedStatement.java (revision 558600)
++++ src/test/org/apache/commons/dbcp/TesterPreparedStatement.java (working copy)
+@@ -28,6 +28,13 @@
+ import java.sql.ResultSetMetaData;
+ import java.sql.SQLException;
+ import java.util.Calendar;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.io.InputStream;
++import java.io.Reader;
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A dummy {@link PreparedStatement}, for testing purposes.
+@@ -288,7 +295,79 @@
+ public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
+ throw new SQLException("Not implemented.");
+ }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
+
++ public void setRowId(int parameterIndex, RowId value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNString(int parameterIndex, String value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNClob(int parameterIndex, NClob value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setSQLXML(int parameterIndex, SQLXML value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setClob(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+Index: src/test/org/apache/commons/dbcp/TesterResultSet.java
+===================================================================
+--- src/test/org/apache/commons/dbcp/TesterResultSet.java (revision 558600)
++++ src/test/org/apache/commons/dbcp/TesterResultSet.java (working copy)
+@@ -28,6 +28,13 @@
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.Calendar;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.io.InputStream;
++import java.io.Reader;
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A dummy {@link ResultSet}, for testing purposes.
+@@ -759,7 +766,207 @@
+ throws SQLException {
+ throw new SQLException("Not implemented.");
+ }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
+
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public RowId getRowId(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public RowId getRowId(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateRowId(int columnIndex, RowId value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateRowId(String columnLabel, RowId value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public int getHoldability() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isClosed() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNString(int columnIndex, String value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNString(String columnLabel, String value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(int columnIndex, NClob value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(String columnLabel, NClob value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public NClob getNClob(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public NClob getNClob(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public SQLXML getSQLXML(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public SQLXML getSQLXML(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateSQLXML(int columnIndex, SQLXML value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateSQLXML(String columnLabel, SQLXML value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public String getNString(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public String getNString(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Reader getNCharacterStream(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Reader getNCharacterStream(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+Index: src/test/org/apache/commons/dbcp/TesterConnection.java
+===================================================================
+--- src/test/org/apache/commons/dbcp/TesterConnection.java (revision 558600)
++++ src/test/org/apache/commons/dbcp/TesterConnection.java (working copy)
+@@ -25,6 +25,16 @@
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.Map;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.Array;
++import java.sql.Blob;
++import java.sql.Clob;
++import java.sql.NClob;
++import java.sql.SQLClientInfoException;
++import java.sql.SQLXML;
++import java.sql.Struct;
++import java.util.Properties;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A dummy {@link Connection}, for testing purposes.
+@@ -274,6 +284,59 @@
+ throws SQLException {
+ return prepareStatement(sql);
+ }
++/* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
+
+-/* JDBC_3_ANT_KEY_END */
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Blob createBlob() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Clob createClob() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public NClob createNClob() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public SQLXML createSQLXML() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isValid(int timeout) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setClientInfo(String name, String value) throws SQLClientInfoException {
++ throw new SQLClientInfoException();
++ }
++
++ public void setClientInfo(Properties properties) throws SQLClientInfoException {
++ throw new SQLClientInfoException();
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public String getClientInfo(String name) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+Index: src/test/org/apache/commons/dbcp/TesterStatement.java
+===================================================================
+--- src/test/org/apache/commons/dbcp/TesterStatement.java (revision 558600)
++++ src/test/org/apache/commons/dbcp/TesterStatement.java (working copy)
+@@ -268,5 +268,26 @@
+ throw new SQLException("Not implemented.");
+ }
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
+
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isClosed() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setPoolable(boolean poolable) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isPoolable() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+Index: src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java (revision 558600)
++++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java (working copy)
+@@ -32,6 +32,11 @@
+ import java.io.InputStream;
+ import java.io.Reader;
+ import java.sql.SQLException;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A base delegating implementation of {@link CallableStatement}.
+@@ -332,6 +337,337 @@
+
+ public URL getURL(String parameterName) throws SQLException
+ { checkOpen(); try { return _stmt.getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } }
++/* JDBC_3_ANT_KEY_END */
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list