db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r551736 [2/2] - in /db/derby/code/branches/10.1/java: engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/fu...
Date Thu, 28 Jun 2007 23:57:42 GMT
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/parameterMapping.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/parameterMapping.out?view=diff&rev=551736&r1=551735&r2=551736
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/parameterMapping.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/parameterMapping.out
Thu Jun 28 16:57:41 2007
@@ -160,6 +160,10 @@
   setObject(java.math.BigDecimal) as batch getShort=72 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getShort=1 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getShort=1 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getShort=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getShort=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getShort=11 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getShort=11 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getShort=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getShort=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getShort=79 was null false JDBC MATCH(OK)
@@ -400,6 +404,10 @@
   setObject(java.math.BigDecimal) as batch getInt=72 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getInt=1 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getInt=1 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getInt=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getInt=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getInt=11 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getInt=11 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getInt=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getInt=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getInt=79 was null false JDBC MATCH(OK)
@@ -640,6 +648,10 @@
   setObject(java.math.BigDecimal) as batch getLong=72 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getLong=1 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getLong=1 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getLong=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getLong=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getLong=11 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getLong=11 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getLong=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getLong=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getLong=79 was null false JDBC MATCH(OK)
@@ -880,6 +892,10 @@
   setObject(java.math.BigDecimal) as batch getFloat=72.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getFloat=1.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getFloat=1.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getFloat=2.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getFloat=2.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getFloat=11.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getFloat=11.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getFloat=74.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getFloat=74.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getFloat=79.0 was null false JDBC MATCH(OK)
@@ -1121,6 +1137,10 @@
   setObject(java.math.BigDecimal) as batch getDouble=72.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getDouble=1.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getDouble=1.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getDouble=2.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getDouble=2.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getDouble=11.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getDouble=11.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getDouble=74.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getDouble=74.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getDouble=79.0 was null false JDBC MATCH(OK)
@@ -1361,6 +1381,10 @@
   setObject(java.math.BigDecimal) as batch getDouble=72.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getDouble=1.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getDouble=1.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getDouble=2.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getDouble=2.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getDouble=11.0 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getDouble=11.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getDouble=74.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getDouble=74.0 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getDouble=79.0 was null false JDBC MATCH(OK)
@@ -1601,6 +1625,10 @@
   setObject(java.math.BigDecimal) as batch getBigDecimal=72.00000 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getBigDecimal=1.00000 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getBigDecimal=1.00000 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getBigDecimal=2.00000 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getBigDecimal=2.00000 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getBigDecimal=11.00000 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getBigDecimal=11.00000 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getBigDecimal=74.00000 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getBigDecimal=74.00000 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getBigDecimal=79.00000 was null false JDBC MATCH(OK)
@@ -1846,6 +1874,10 @@
   setObject(java.math.BigDecimal) as batch getString=72                                 
                         was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getString=1                                              
             was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getString=1                                     
                      was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getString=2                                                 
          was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getString=2                                        
                   was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getString=11                                               
           was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getString=11                                      
                    was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getString=74                                             
             was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getString=74                                    
                      was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getString=79                                                
          was null false JDBC MATCH(OK)
@@ -2080,6 +2112,10 @@
   setObject(java.math.BigDecimal) as batch getString=72 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getString=1 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getString=1 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getString=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getString=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getString=11 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getString=11 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getString=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getString=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getString=79 was null false JDBC MATCH(OK)
@@ -2314,6 +2350,10 @@
   setObject(java.math.BigDecimal) as batch getString=72 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) getString=1 was null false JDBC MATCH(OK)
   setObject(java.lang.Boolean) as batch getString=1 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) getString=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Byte) as batch getString=2 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) getString=11 was null false JDBC MATCH(OK)
+  setObject(java.lang.Short) as batch getString=11 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) getString=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Integer) as batch getString=74 was null false JDBC MATCH(OK)
   setObject(java.lang.Long) getString=79 was null false JDBC MATCH(OK)
@@ -2495,6 +2535,10 @@
   setObject(java.math.BigDecimal) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Long) IC JDBC MATCH (INVALID)
@@ -2715,6 +2759,10 @@
   setObject(java.math.BigDecimal) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Long) IC JDBC MATCH (INVALID)
@@ -2937,6 +2985,10 @@
   setObject(java.math.BigDecimal) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Long) IC JDBC MATCH (INVALID)
@@ -3160,6 +3212,10 @@
   setObject(java.math.BigDecimal) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Long) IC JDBC MATCH (INVALID)
@@ -3382,6 +3438,10 @@
   setObject(java.math.BigDecimal) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Long) IC JDBC MATCH (INVALID)
@@ -3561,6 +3621,10 @@
   setObject(java.math.BigDecimal) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) IC JDBC MATCH (INVALID)
   setObject(java.lang.Boolean) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Byte) as batch IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) IC JDBC MATCH (INVALID)
+  setObject(java.lang.Short) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) IC JDBC MATCH (INVALID)
   setObject(java.lang.Integer) as batch IC JDBC MATCH (INVALID)
   setObject(java.lang.Long) IC JDBC MATCH (INVALID)

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java?view=diff&rev=551736&r1=551735&r2=551736
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMapping.java
Thu Jun 28 16:57:41 2007
@@ -240,6 +240,11 @@
 /*10 Timestamp */       { _, _, _, _, _, _, _, _, _, _, _, X, X, X, _, _, _, X, X, X, _,
_},
 /*11 Blob   */          { _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _,
X},
 /*12 Clob */            { _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, X,
_},
+
+// Byte and Short were added to this table in JDBC 4.0. (See DERBY-1500.)
+
+/*13 Byte */            { X, X, X, X, X, X, X, X, X, X, X, X, X, X, _, _, _, _, _, _, _,
_},
+/*14 Short */           { X, X, X, X, X, X, X, X, X, X, X, X, X, X, _, _, _, _, _, _, _,
_},
 	};
 
 
@@ -2491,9 +2496,17 @@
 		System.out.println(worked ? " FAIL " : (" OK " + sqleResult.getMessage()));
 		}
 
+
 		setXXX_setObject(s, psi, psq, type, "46", "java.lang.String", 0, executeBatchTests);
 		setXXX_setObject(s, psi, psq, type, BigDecimal.valueOf(72L), "java.math.BigDecimal", 1,
executeBatchTests);
 		setXXX_setObject(s, psi, psq, type, Boolean.TRUE, "java.lang.Boolean", 2, executeBatchTests);
+
+		// DERBY-1500: setObject() should work for Byte and Short too.
+		setXXX_setObject(s, psi, psq, type, new Byte((byte) 2),
+						 "java.lang.Byte", 13,executeBatchTests);
+		setXXX_setObject(s, psi, psq, type, new Short((short) 11),
+						 "java.lang.Short", 14,executeBatchTests);
+
 		setXXX_setObject(s, psi, psq, type, new Integer(74), "java.lang.Integer", 3, executeBatchTests);
 		setXXX_setObject(s, psi, psq, type, new Long(79), "java.lang.Long", 4, executeBatchTests);
 		setXXX_setObject(s, psi, psq, type, new Float(76.3f), "java.lang.Float", 5, executeBatchTests);



Mime
View raw message