Rick Hillegas (JIRA) wrote: > [ > http://issues.apache.org/jira/browse/DERBY-1417?page=comments#action_12423462 > ] > > Rick Hillegas commented on DERBY-1417: > -------------------------------------- > > 1) The patch tool objects when I try to apply this fix: > > patching file > java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java > patching file > java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java > patching file > java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java > patching file > java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest_app.properti > es > patching file > java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall > can't find file to patch at input line 429 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |Index: java/client/org/apache/derby/client/net/EncodedInputStream.java > |=================================================================== > |--- java/client/org/apache/derby/client/net/EncodedInputStream.java > (revision 424971) > |+++ java/client/org/apache/derby/client/netSorry /EncodedInputStream.java > (working copy) > -------------------------- > File to patch:
Hi Rick, Thanks for looking at the patch. This is the issue about renaming a class I warned about... I'm able to apply the patch if I do a 'svn rename' first, but svn still kind of objects. Can anyone give me some advice on how to produce instructions or a diff that can handle renaming/moving a file? > > 2) In addition, it looks like we're missing the copyright boilerplate in > ByteArrayCombinerStreamTest.java and ByteArrayCombinerStream.java. Sorry about that, I'll fix this after I look at the derbyall results tomorrow and upload a new patch. -- Kristian > >> Add new, lengthless overloads to the streaming api >> -------------------------------------------------- >> >> Key: DERBY-1417 >> URL: http://issues.apache.org/jira/browse/DERBY-1417 >> Project: Derby >> Issue Type: New Feature >> Components: JDBC >> Affects Versions: 10.2.0.0 >> Reporter: Rick Hillegas >> Assigned To: Kristian Waagan >> Fix For: 10.2.0.0 >> >> Attachments: derby-1417-01-castsInTests.diff, >> derby-1417-1a-notImplemented.diff, derby-1417-1a-notImplemented.stat, >> derby-1417-2a-rstest-refactor.diff, derby-1417-3a-embimpl-and-tests.diff, >> derby-1417-3a-embimpl-and-tests.stat, derby-1417-3b-embimpl-and-tests.diff, >> derby-1417-3b-embimpl-and-tests.stat, derby-1417-4a-disable-psTestsDnc.diff, >> derby-1417-5a-brokered.diff, derby-1417-5a-brokered.stat, >> derby-1417-6a-clientimpl.diff, derby-1417-6a-clientimpl.stat >> >> >> The JDBC4 Expert Group has approved a new set of overloads for the streaming >> methods. These overloads do not take a length argument. Here are the new >> overloads: >> PreparedStatement.setAsciiStream(int parameterIndex, java.io.InputStream x) >> PreparedStatement.setBinaryStream(int parameterIndex, java.io.InputStream x) >> PreparedStatement.setCharacterStream(int parameterIndex, java.io.Reader >> reader) >> PreparedStatement.setNCharacterStream(int parameterIndex, java.io.Reader >> reader) >> PreparedStatement.setBlob(int parameterIndex, java.io.InputStream >> inputStream) >> PreparedStatement.setClob(int parameterIndex, java.io.Reader reader) >> PreparedStatement.setNClob(int parameterIndex, java.io.Reader reader) >> CallableStatement.setAsciiStream(java.lang.String parameterName, >> java.io.InputStream x) >> CallableStatement.setBinaryStream(java.lang.String parameterName, >> java.io.InputStream x) >> CallableStatement.setCharacterStream(java.lang.String parameterName, >> java.io.Reader reader) >> CallableStatement.setNCharacterStream(java.lang.String parameterName, >> java.io.Reader reader) >> CallableStatement.setBlob(java.lang.String parameterName, >> java.io.InputStream inputStream) >> CallableStatement.setClob(java.lang.String parameterName, java.io.Reader >> reader) >> CallableStatement.setNClob(java.lang.String parameterName, java.io.Reader >> reader) >> ResultSet.updateAsciiStream(int columnIndex, java.io.InputStream x) >> ResultSet.updateAsciiStream(java.lang.String columnLabel, >> java.io.InputStream x) >> ResultSet.updateBinaryStream(int columnIndex, java.io.InputStream x) >> ResultSet.updateBinaryStream(java.lang.String columnLabel, >> java.io.InputStream x, int length) >> ResultSet.updateCharacterStream(int columnIndex, java.io.Reader x) >> ResultSet.updateCharacterStream(java.lang.String columnLabel, java.io.Reader >> x) >> ResultSet.updateNCharacterStream(int columnIndex, java.io.Reader x) >> ResultSet.updateNCharacterStream(java.lang.String columnLabel, >> java.io.Reader x) >> ResultSet.updateBlob(int columnIndex, java.io.InputStream inputStream) >> ResultSet.updateBlob(java.lang.String columnLabel, java.io.InputStream >> inputStream) >> ResultSet.updateClob(int columnIndex, java.io.Reader reader) >> ResultSet.updateClob(java.lang.String columnLabel, java.io.Reader reader) >> ResultSet.updateNClob(int columnIndex, java.io.Reader reader) >> ResultSet.updateNClob(java.lang.String columnLabel, java.io.Reader reader) >> We should add these new overloads soon so that the build will not break when >> this methods turn up in a published Mustang build. >
