Author: glen Date: Wed Jan 31 17:28:30 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - from jpackage project
---- Files affected: SOURCES: derby-10.1.1.0-JDBC30only-BrokeredCallableStatement.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-JDBC30only-BrokeredCallableStatement30.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-JDBC30only-BrokeredConnection.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-JDBC30only-BrokeredConnection30.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-JDBC30only-BrokeredPreparedStatement.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-JDBC30only-EmbedCallableStatement20.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-JDBC30only-EmbedConnection.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-JDBC30only-EmbedPreparedStatement20.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-compilepath_properties.patch (NONE -> 1.1) (NEW), derby-10.1.1.0-extrapath_properties.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/derby-10.1.1.0-JDBC30only-BrokeredCallableStatement.patch diff -u /dev/null SOURCES/derby-10.1.1.0-JDBC30only-BrokeredCallableStatement.patch:1.1 --- /dev/null Wed Jan 31 18:28:30 2007 +++ SOURCES/derby-10.1.1.0-JDBC30only-BrokeredCallableStatement.patch Wed Jan 31 18:28:25 2007 @@ -0,0 +1,282 @@ +--- java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java.sav 2004-11-30 20:20:48.000000000 +0100 ++++ java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java 2005-02-09 15:41:29.335685368 +0100 +@@ -38,6 +38,18 @@ + super(control, jdbcLevel, sql); + } + ++ public final void setURL(java.lang.String parameterName, java.net.URL value) throws SQLException { ++ getCallableStatement().setURL(parameterName, value); ++ } ++ ++ public final java.net.URL getURL(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getURL(parameterName); ++ } ++ ++ public final java.net.URL getURL(int i) throws SQLException { ++ return getCallableStatement().getURL(i); ++ } ++ + public final void registerOutParameter(int parameterIndex, + int sqlType) + throws SQLException +@@ -53,12 +65,56 @@ + getCallableStatement().registerOutParameter( parameterIndex, sqlType, scale); + } + ++ public final void registerOutParameter(String a, int b, String c) throws SQLException { ++ getCallableStatement().registerOutParameter(a,b,c); ++ } ++ + public final boolean wasNull() + throws SQLException + { + return getCallableStatement().wasNull(); + } + ++ public final void registerOutParameter(String a, int b, int c) throws SQLException { ++ getCallableStatement().registerOutParameter(a,b,c); ++ } ++ ++ public final void registerOutParameter(String a, int b) throws SQLException { ++ getCallableStatement().registerOutParameter(a,b); ++ } ++ ++ public final boolean getBoolean(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getBoolean(parameterName); ++ } ++ ++ public final byte getByte(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getByte(parameterName); ++ } ++ ++ public final short getShort(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getShort(parameterName); ++ } ++ ++ public final int getInt(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getInt(parameterName); ++ } ++ ++ public final float getFloat(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getFloat(parameterName); ++ } ++ ++ public final double getDouble(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getDouble(parameterName); ++ } ++ ++ public final long getLong(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getLong(parameterName); ++ } ++ ++ public final java.lang.String getString(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getString(parameterName); ++ } ++ + public final String getString(int parameterIndex) + throws SQLException + { +@@ -145,6 +201,142 @@ + return getCallableStatement().getTimestamp( parameterIndex); + } + ++ public final void setBigDecimal(java.lang.String parameterName, java.math.BigDecimal value) throws SQLException { ++ getCallableStatement().setBigDecimal(parameterName, value); ++ } ++ ++ public final java.math.BigDecimal getBigDecimal(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getBigDecimal(parameterName); ++ } ++ ++ public final void setString(java.lang.String parameterName, java.lang.String value) throws SQLException { ++ getCallableStatement().setString(parameterName, value); ++ } ++ ++ public final void setNull(java.lang.String parameterName, int type) throws SQLException { ++ getCallableStatement().setNull(parameterName, type); ++ } ++ ++ public final void setNull(java.lang.String parameterName, int a, java.lang.String b) throws SQLException { ++ getCallableStatement().setNull(parameterName, a, b); ++ } ++ ++ public final void setObject(java.lang.String parameterName, java.lang.Object value, int a, int b) throws SQLException { ++ getCallableStatement().setObject(parameterName, value, a, b); ++ } ++ ++ public final void setObject(java.lang.String parameterName, java.lang.Object value, int a) throws SQLException { ++ getCallableStatement().setObject(parameterName, value, a); ++ } ++ ++ public final void setObject(java.lang.String parameterName, java.lang.Object value) throws SQLException { ++ getCallableStatement().setObject(parameterName, value); ++ } ++ ++ public final void setCharacterStream(java.lang.String parameterName, java.io.Reader value, int length) throws SQLException { ++ getCallableStatement().setCharacterStream(parameterName, value, length); ++ } ++ ++ public final void setBinaryStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException { ++ getCallableStatement().setBinaryStream(parameterName, value, length); ++ } ++ ++ public final void setAsciiStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException { ++ getCallableStatement().setAsciiStream(parameterName, value, length); ++ } ++ ++ public final void setBytes(java.lang.String parameterName, byte[] value) throws SQLException { ++ getCallableStatement().setBytes(parameterName, value); ++ } ++ ++ public final void setBoolean(java.lang.String parameterName, boolean value) throws SQLException { ++ getCallableStatement().setBoolean(parameterName, value); ++ } ++ ++ public final void setShort(java.lang.String parameterName, short value) throws SQLException { ++ getCallableStatement().setShort(parameterName, value); ++ } ++ ++ public final void setInt(java.lang.String parameterName, int value) throws SQLException { ++ getCallableStatement().setInt(parameterName, value); ++ } ++ ++ public final void setLong(java.lang.String parameterName, long value) throws SQLException { ++ getCallableStatement().setLong(parameterName, value); ++ } ++ ++ public final void setFloat(java.lang.String parameterName, float value) throws SQLException { ++ getCallableStatement().setFloat(parameterName, value); ++ } ++ ++ public final void setDouble(java.lang.String parameterName, double value) throws SQLException { ++ getCallableStatement().setDouble(parameterName, value); ++ } ++ ++ public final void setByte(java.lang.String parameterName, byte value) throws SQLException { ++ getCallableStatement().setByte(parameterName, value); ++ } ++ ++ public final void setDate(java.lang.String parameterName, java.sql.Date value) throws SQLException { ++ getCallableStatement().setDate(parameterName, value); ++ } ++ ++ public final void setDate(java.lang.String parameterName, java.sql.Date value, java.util.Calendar cal) throws SQLException { ++ getCallableStatement().setDate(parameterName, value, cal); ++ } ++ ++ public final void setTime(java.lang.String parameterName, java.sql.Time value) throws SQLException { ++ getCallableStatement().setTime(parameterName, value); ++ } ++ ++ public final void setTime(java.lang.String parameterName, java.sql.Time value, java.util.Calendar cal) throws SQLException { ++ getCallableStatement().setTime(parameterName, value, cal); ++ } ++ ++ public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value) throws SQLException { ++ getCallableStatement().setTimestamp(parameterName, value); ++ } ++ ++ public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value, java.util.Calendar cal) throws SQLException { ++ getCallableStatement().setTimestamp(parameterName, value, cal); ++ } ++ ++ public final java.sql.Timestamp getTimestamp(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getTimestamp(parameterName); ++ } ++ ++ public final java.sql.Timestamp getTimestamp(java.lang.String parameterName, java.util.Calendar cal) throws SQLException { ++ return getCallableStatement().getTimestamp(parameterName, cal); ++ } ++ ++ public final java.sql.Time getTime(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getTime(parameterName); ++ } ++ ++ public final java.sql.Time getTime(java.lang.String parameterName, java.util.Calendar cal) throws SQLException { ++ return getCallableStatement().getTime(parameterName, cal); ++ } ++ ++ public final byte[] getBytes(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getBytes(parameterName); ++ } ++ ++ public final java.sql.Date getDate(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getDate(parameterName); ++ } ++ ++ public final java.sql.Date getDate(java.lang.String parameterName, java.util.Calendar cal) throws SQLException { ++ return getCallableStatement().getDate(parameterName, cal); ++ } ++ ++ public final java.lang.Object getObject(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getObject(parameterName); ++ } ++ ++ public final java.lang.Object getObject(java.lang.String parameterName, java.util.Map map) throws SQLException { ++ return getCallableStatement().getObject(parameterName, map); ++ } ++ + public final Object getObject(int parameterIndex) + throws SQLException + { +@@ -164,24 +356,40 @@ + return getCallableStatement().getObject( i, map); + } + ++ public final java.sql.Ref getRef(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getRef(parameterName); ++ } ++ + public final Ref getRef(int i) + throws SQLException + { + return getCallableStatement().getRef( i); + } + ++ public final java.sql.Blob getBlob(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getBlob(parameterName); ++ } ++ + public final Blob getBlob(int i) + throws SQLException + { + return getCallableStatement().getBlob( i); + } + ++ public final java.sql.Clob getClob(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getClob(parameterName); ++ } ++ + public final Clob getClob(int i) + throws SQLException + { + return getCallableStatement().getClob( i); + } + ++ public final java.sql.Array getArray(java.lang.String parameterName) throws SQLException { ++ return getCallableStatement().getArray(parameterName); ++ } ++ + public final Array getArray(int i) + throws SQLException + { +@@ -210,6 +418,19 @@ + getCallableStatement().registerOutParameter( paramIndex, sqlType, typeName); + } + ++ public final void setURL(int i, java.net.URL x) ++ throws SQLException ++ { ++ getPreparedStatement().setURL( i, x); ++ } ++ ++ public final ParameterMetaData getParameterMetaData() ++ throws SQLException ++ { ++ return getPreparedStatement().getParameterMetaData(); ++ } ++ ++ + /* + ** Control methods + */ ================================================================ Index: SOURCES/derby-10.1.1.0-JDBC30only-BrokeredCallableStatement30.patch diff -u /dev/null SOURCES/derby-10.1.1.0-JDBC30only-BrokeredCallableStatement30.patch:1.1 --- /dev/null Wed Jan 31 18:28:30 2007 +++ SOURCES/derby-10.1.1.0-JDBC30only-BrokeredCallableStatement30.patch Wed Jan 31 18:28:25 2007 @@ -0,0 +1,192 @@ +--- java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java.sav 2005-02-09 15:56:39.581307000 +0100 ++++ java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java 2005-02-09 15:57:29.065784216 +0100 +@@ -37,189 +37,4 @@ + public BrokeredCallableStatement30(BrokeredStatementControl control, int jdbcLevel, String sql) throws SQLException { + super(control, jdbcLevel, sql); + } +- public final void setURL(java.lang.String parameterName, java.net.URL value) throws SQLException { +- getCallableStatement().setURL(parameterName, value); +- } +- public final void setNull(java.lang.String parameterName, int type) throws SQLException { +- getCallableStatement().setNull(parameterName, type); +- } +- public final void setBoolean(java.lang.String parameterName, boolean value) throws SQLException { +- getCallableStatement().setBoolean(parameterName, value); +- } +- public final void setByte(java.lang.String parameterName, byte value) throws SQLException { +- getCallableStatement().setByte(parameterName, value); +- } +- public final void setShort(java.lang.String parameterName, short value) throws SQLException { +- getCallableStatement().setShort(parameterName, value); +- } +- public final void setInt(java.lang.String parameterName, int value) throws SQLException { +- getCallableStatement().setInt(parameterName, value); +- } +- public final void setLong(java.lang.String parameterName, long value) throws SQLException { +- getCallableStatement().setLong(parameterName, value); +- } +- public final void setFloat(java.lang.String parameterName, float value) throws SQLException { +- getCallableStatement().setFloat(parameterName, value); +- } +- public final void setDouble(java.lang.String parameterName, double value) throws SQLException { +- getCallableStatement().setDouble(parameterName, value); +- } +- public final void setBigDecimal(java.lang.String parameterName, java.math.BigDecimal value) throws SQLException { +- getCallableStatement().setBigDecimal(parameterName, value); +- } +- public final void setString(java.lang.String parameterName, java.lang.String value) throws SQLException { +- getCallableStatement().setString(parameterName, value); +- } +- public final void setBytes(java.lang.String parameterName, byte[] value) throws SQLException { +- getCallableStatement().setBytes(parameterName, value); +- } +- public final void setDate(java.lang.String parameterName, java.sql.Date value) throws SQLException { +- getCallableStatement().setDate(parameterName, value); +- } +- public final void setTime(java.lang.String parameterName, java.sql.Time value) throws SQLException { +- getCallableStatement().setTime(parameterName, value); +- } +- public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value) throws SQLException { +- getCallableStatement().setTimestamp(parameterName, value); +- } +- public final void setAsciiStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException { +- getCallableStatement().setAsciiStream(parameterName, value, length); +- } +- public final void setBinaryStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException { +- getCallableStatement().setBinaryStream(parameterName, value, length); +- } +- public final void setObject(java.lang.String parameterName, java.lang.Object value, int a, int b) throws SQLException { +- getCallableStatement().setObject(parameterName, value, a, b); +- } +- public final void setObject(java.lang.String parameterName, java.lang.Object value, int a) throws SQLException { +- getCallableStatement().setObject(parameterName, value, a); +- } +- public final void setObject(java.lang.String parameterName, java.lang.Object value) throws SQLException { +- getCallableStatement().setObject(parameterName, value); +- } +- public final void setCharacterStream(java.lang.String parameterName, java.io.Reader value, int length) throws SQLException { +- getCallableStatement().setCharacterStream(parameterName, value, length); +- } +- public final void setDate(java.lang.String parameterName, java.sql.Date value, java.util.Calendar cal) throws SQLException { +- getCallableStatement().setDate(parameterName, value, cal); +- } +- public final void setTime(java.lang.String parameterName, java.sql.Time value, java.util.Calendar cal) throws SQLException { +- getCallableStatement().setTime(parameterName, value, cal); +- } +- public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value, java.util.Calendar cal) throws SQLException { +- getCallableStatement().setTimestamp(parameterName, value, cal); +- } +- public final void setNull(java.lang.String parameterName, int a, java.lang.String b) throws SQLException { +- getCallableStatement().setNull(parameterName, a, b); +- } +- public final java.lang.String getString(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getString(parameterName); +- } +- public final boolean getBoolean(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getBoolean(parameterName); +- } +- public final byte getByte(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getByte(parameterName); +- } +- public final short getShort(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getShort(parameterName); +- } +- public final int getInt(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getInt(parameterName); +- } +- public final long getLong(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getLong(parameterName); +- } +- public final float getFloat(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getFloat(parameterName); +- } +- public final double getDouble(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getDouble(parameterName); +- } +- public final byte[] getBytes(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getBytes(parameterName); +- } +- public final java.sql.Date getDate(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getDate(parameterName); +- } +- public final java.sql.Time getTime(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getTime(parameterName); +- } +- public final java.sql.Timestamp getTimestamp(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getTimestamp(parameterName); +- } +- public final java.lang.Object getObject(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getObject(parameterName); +- } +- public final java.math.BigDecimal getBigDecimal(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getBigDecimal(parameterName); +- } +- public final java.lang.Object getObject(java.lang.String parameterName, java.util.Map map) throws SQLException { +- return getCallableStatement().getObject(parameterName, map); +- } +- public final java.sql.Ref getRef(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getRef(parameterName); +- } +- public final java.sql.Blob getBlob(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getBlob(parameterName); +- } +- public final java.sql.Clob getClob(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getClob(parameterName); +- } +- public final java.sql.Array getArray(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getArray(parameterName); +- } +- public final java.sql.Date getDate(java.lang.String parameterName, java.util.Calendar cal) throws SQLException { +- return getCallableStatement().getDate(parameterName, cal); +- } +- public final java.sql.Time getTime(java.lang.String parameterName, java.util.Calendar cal) throws SQLException { +- return getCallableStatement().getTime(parameterName, cal); +- } +- public final java.sql.Timestamp getTimestamp(java.lang.String parameterName, java.util.Calendar cal) throws SQLException { +- return getCallableStatement().getTimestamp(parameterName, cal); +- } +- public final java.net.URL getURL(java.lang.String parameterName) throws SQLException { +- return getCallableStatement().getURL(parameterName); +- } +- public final java.net.URL getURL(int i) throws SQLException { +- return getCallableStatement().getURL(i); +- } +- public final void registerOutParameter(String a, int b) throws SQLException { +- getCallableStatement().registerOutParameter(a,b); +- } +- public final void registerOutParameter(String a, int b, int c) throws SQLException { +- getCallableStatement().registerOutParameter(a,b,c); +- } +- public final void registerOutParameter(String a, int b, String c) throws SQLException { +- getCallableStatement().registerOutParameter(a,b,c); +- } +- /* +- ** JDBC 3.0 PreparedStatement methods +- */ +- +- public final void setURL(int i, URL x) +- throws SQLException +- { +- getPreparedStatement().setURL( i, x); +- } +- public final ParameterMetaData getParameterMetaData() +- throws SQLException +- { +- return getPreparedStatement().getParameterMetaData(); +- } +- /* +- ** Control methods +- */ +- +- /** +- Create a duplicate CalableStatement to this, including state, from the passed in Connection. +- */ +- public CallableStatement createDuplicateStatement(Connection conn, CallableStatement oldStatement) throws SQLException { +- +- CallableStatement newStatement = conn.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability); +- +- setStatementState(oldStatement, newStatement); +- +- return newStatement; +- } + } ================================================================ Index: SOURCES/derby-10.1.1.0-JDBC30only-BrokeredConnection.patch diff -u /dev/null SOURCES/derby-10.1.1.0-JDBC30only-BrokeredConnection.patch:1.1 --- /dev/null Wed Jan 31 18:28:30 2007 +++ SOURCES/derby-10.1.1.0-JDBC30only-BrokeredConnection.patch Wed Jan 31 18:28:25 2007 @@ -0,0 +1,230 @@ +--- java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java.sav 2005-07-02 03:57:43.000000000 +0200 ++++ java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java 2006-09-07 09:53:52.000000000 +0200 +@@ -25,6 +25,7 @@ + import java.sql.PreparedStatement; + import java.sql.CallableStatement; + import java.sql.DatabaseMetaData; ++import java.sql.Savepoint; + import java.sql.SQLException; + import java.sql.SQLWarning; + +@@ -52,6 +53,7 @@ + protected final BrokeredConnectionControl control; + private boolean isClosed; + ++ + /** + Maintain state as seen by this Connection handle, not the state + of the underlying Connection it is attached to. +@@ -145,6 +147,75 @@ + } + } + ++ public final Savepoint setSavepoint() ++ throws SQLException ++ { ++ try { ++ control.checkSavepoint(); ++ return getRealConnection().setSavepoint(); ++ } ++ catch (SQLException se) ++ { ++ notifyException(se); ++ throw se; ++ } ++ } ++ ++ public final Savepoint setSavepoint(String name) ++ throws SQLException ++ { ++ try { ++ control.checkSavepoint(); ++ return getRealConnection().setSavepoint(name); ++ } ++ catch (SQLException se) ++ { ++ notifyException(se); ++ throw se; ++ } ++ } ++ ++ public final void setHoldability(int holdability) ++ throws SQLException ++ { ++ try { ++ control.checkHoldCursors(holdability); ++ getRealConnection().setHoldability(holdability); ++ stateHoldability = holdability; ++ } ++ catch (SQLException se) ++ { ++ notifyException(se); ++ throw se; ++ } ++ } ++ ++ public final int getHoldability() ++ throws SQLException ++ { ++ try { ++ return getRealConnection().getHoldability(); ++ } ++ catch (SQLException se) ++ { ++ notifyException(se); ++ throw se; ++ } ++ } ++ ++ public final void releaseSavepoint(Savepoint savepoint) ++ throws SQLException ++ { ++ try { ++ getRealConnection().releaseSavepoint(savepoint); ++ } ++ catch (SQLException se) ++ { ++ notifyException(se); ++ throw se; ++ } ++ } ++ + public final void rollback() throws SQLException + { + try { +@@ -156,6 +227,20 @@ + } + } + ++ public final void rollback(Savepoint savepoint) ++ throws SQLException ++ { ++ try { ++ control.checkRollback(); ++ getRealConnection().rollback(savepoint); ++ } <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit