You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2006/02/22 01:57:04 UTC
svn commit: r379643 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests:
jdbcapi/resultset.java lang/coalesceTests.java
Author: fuzzylogic
Date: Tue Feb 21 16:57:01 2006
New Revision: 379643
URL: http://svn.apache.org/viewcvs?rev=379643&view=rev
Log:
DERBY-903: Followup patch to remove use of String(byte[]) in two tests and
print an error message instead.
Committed for Myrna Van Lunteren <m....@gmail.com>
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java?rev=379643&r1=379642&r2=379643&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java Tue Feb 21 16:57:01 2006
@@ -832,13 +832,9 @@
try{
row.append(s.getString(i));
} catch(SQLException ex){
- if (ex.getSQLState().equals("22005")) {
- if (s.getBytes(i) != null)
- row.append(s.getBytes(i).toString());
- //row.append(new String(s.getBytes(i)));
- else
- row.append(s.getBytes(i));
- } else throw ex;
+ if (ex.getSQLState().equals("22005"))
+ row.append("Invalid Conversion Error\n");
+ else throw ex;
}
}
row.append("}\n");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java?rev=379643&r1=379642&r2=379643&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java Tue Feb 21 16:57:01 2006
@@ -1403,7 +1403,7 @@
}
// lifted from the metadata test
- public static void dumpRS(ResultSet s) throws SQLException, UnsupportedEncodingException
+ public static void dumpRS(ResultSet s) throws SQLException
{
if (s == null)
{
@@ -1462,12 +1462,9 @@
try{
row.append(s.getString(i));
} catch(SQLException ex){
- if (ex.getSQLState().equals("22005")) {
- if (s.getBytes(i) != null)
- row.append(s.getBytes(i).toString());
- else
- row.append(s.getBytes(i));
- } else throw ex;
+ if (ex.getSQLState().equals("22005"))
+ row.append("Invalid Conversion Error\n");
+ else throw ex;
}
}
row.append("}\n");