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 tm...@apache.org on 2006/10/07 13:24:08 UTC

svn commit: r453886 [3/3] - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ testing/org/apache/derbyTes...

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java?view=diff&rev=453886&r1=453885&r2=453886
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java Sat Oct  7 04:24:06 2006
@@ -297,10 +297,7 @@
 		cstmt.setObject(1,bytearr,java.sql.Types.LONGVARBINARY);
 		System.out.println("execute the procedure with LONGVARBINARY");
 		cstmt.executeUpdate();
-		cstmt.setObject(1,bytearr,java.sql.Types.BLOB);
-		System.out.println("execute the procedure with BLOB");
-		cstmt.executeUpdate();
-
+        
 		Statement stmt = conn.createStatement();
 		String Longvarbinary_Query="Select lvbc from Longvarbinary_Tab";
 		System.out.println(Longvarbinary_Query);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java?view=diff&rev=453886&r1=453885&r2=453886
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java Sat Oct  7 04:24:06 2006
@@ -139,7 +139,25 @@
 
 			// test different data types for input parameters of a PreparedStatement
 			System.out.println("test different data types for input parameters of a Prepared Statement");
-			ps = conn.prepareStatement("create table t2(ti smallint, si smallint,i int, bi bigint, r real, f float, d double precision, n5_2 numeric(5,2), dec10_3 decimal(10,3), ch20 char(20),vc varchar(20), lvc long varchar,b20 char(23) for bit data, vb varchar(23) for bit data, lvb long varchar for bit data,  dt date, tm time, ts timestamp not null)");
+			ps = conn.prepareStatement("create table t2(" + 
+                                       "ti smallint," + 
+                                       "si smallint," + 
+                                       "i int," + 
+                                       "bi bigint," + 
+                                       "r real," + 
+                                       "f float," + 
+                                       "d double precision," + 
+                                       "n5_2 numeric(5,2)," + 
+                                       "dec10_3 decimal(10,3)," + 
+                                       "ch20 char(20)," + 
+                                       "vc varchar(20), " + 
+                                       "lvc long varchar," + 
+                                       "b20 char(23) for bit data, " + 
+                                       "vb varchar(23) for bit data, " + 
+                                       "lvb long varchar for bit data,  " + 
+                                       "dt date, " + 
+                                       "tm time, " + 
+                                       "ts timestamp not null)");
 			uc = ps.executeUpdate();
 			System.out.println("Update count is: " + uc);
 
@@ -213,12 +231,12 @@
 			ps.setNull(10, java.sql.Types.DECIMAL);
 			ps.setNull(11, java.sql.Types.CHAR);
 			ps.setNull(12, java.sql.Types.VARCHAR);
-			ps.setNull(13, java.sql.Types.LONGVARCHAR);
+			ps.setNull(13, java.sql.Types.LONGVARBINARY);
 			ps.setNull(14, java.sql.Types.BINARY);
 			ps.setNull(15, java.sql.Types.VARBINARY);
-			ps.setNull(16, java.sql.Types.LONGVARBINARY);
-			ps.setNull(17, java.sql.Types.DATE);
-			ps.setNull(18, java.sql.Types.TIME);
+			ps.setNull(16, java.sql.Types.TIMESTAMP);
+			ps.setNull(17, java.sql.Types.TIMESTAMP);
+			ps.setNull(18, java.sql.Types.DATE);
 		   
 			ps.setTimestamp(18, Timestamp.valueOf("2002-04-12 11:44:31.000000000")); //slightly after
 			hasResultSet = ps.execute();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java?view=diff&rev=453886&r1=453885&r2=453886
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java Sat Oct  7 04:24:06 2006
@@ -2999,6 +2999,7 @@
 				if ("22018".equals(sqle.getSQLState())||
 					"XCL12".equals(sqle.getSQLState())||
 					"22007".equals(sqle.getSQLState())||
+                    "22005".equals(sqle.getSQLState())||
 					(sqle.getMessage().indexOf("Invalid data conversion") != -1) ||
 					(sqle.getMessage().indexOf("Illegal Conversion") != -1))
 					System.out.println(" IC (Expected)");