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/04/26 01:30:09 UTC

svn commit: r397018 - in /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet: csPrepStmt.java prepStmt.java

Author: fuzzylogic
Date: Tue Apr 25 16:30:03 2006
New Revision: 397018

URL: http://svn.apache.org/viewcvs?rev=397018&view=rev
Log:
DERBY-972: Merge revision 396034 to 10.1

Modified:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java?rev=397018&r1=397017&r2=397018&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java Tue Apr 25 16:30:03 2006
@@ -148,12 +148,12 @@
 			ps.setBigDecimal(8, new BigDecimal("88.88"));
 			ps.setBigDecimal(9, new BigDecimal("99.1"));
 			ps.setString(10, "column11string");
-			byte[] c11ba = new String("column11vcstring").getBytes();
+			byte[] c11ba = new String("column11vcstring").getBytes("UTF-8");
 			int len = c11ba.length;
 			ps.setAsciiStream(11, new ByteArrayInputStream(c11ba), len);
-			byte[] c12ba = new String("column12lvcstring").getBytes();
+			byte[] c12ba = new String("column12lvcstring").getBytes("UTF-8");
 			len = c12ba.length;
-			ps.setCharacterStream(12, new InputStreamReader(new ByteArrayInputStream(c12ba)),len);
+			ps.setCharacterStream(12, new InputStreamReader(new ByteArrayInputStream(c12ba),"UTF-8"),len);
 			ps.setBytes(13,ba);
 			ps.setBinaryStream(14, new ByteArrayInputStream(ba), ba.length);
 			ps.setBytes(15,ba);

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java?rev=397018&r1=397017&r2=397018&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java Tue Apr 25 16:30:03 2006
@@ -148,12 +148,12 @@
 			ps.setBigDecimal(7, new BigDecimal("77.77"));
 			ps.setBigDecimal(8, new BigDecimal("8.1"));
 			ps.setString(9, "column9string");
-			byte[] c10ba = new String("column10vcstring").getBytes();
+			byte[] c10ba = new String("column10vcstring").getBytes("UTF-8");
 			int len = c10ba.length;
 			ps.setAsciiStream(10, new ByteArrayInputStream(c10ba), len);
-			byte[] c11ba = new String("column11lvcstring").getBytes();
+			byte[] c11ba = new String("column11lvcstring").getBytes("UTF-8");
 			len = c11ba.length;
-			ps.setCharacterStream(11, new InputStreamReader(new ByteArrayInputStream(c11ba)),len);
+			ps.setCharacterStream(11, new InputStreamReader(new ByteArrayInputStream(c11ba),"UTF-8"),len);
 			ps.setBytes(12,ba);
 			// Calling setBytes on the varchar for bit data type because it 
 			// Appears DB2 UDB accepts this only for the BLOB data type...