Hi,
 
Attached is a patch that adds 3 jdk15 canons to the DerbyNet dir for the 10.0 branch.
The change is in essence the same as for commit 149488 to the main branch, but
2 of the 3 tests are a little different, so a backport will be a little awkward.
 
If someone can add this to the 10.0 branch?
 
Thx,
Myrna
 
A      java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\jdk15
A      
java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\jdk15\prepStmt.out
A      
java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\jdk15\callable.out
A      
java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\jdk15\csPrepStmt.out
Index: 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out
       (revision 0)
+++ 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out
       (revision 0)
@@ -0,0 +1,65 @@
+prepStmt Test Starts
+executeUpdate() without parameters
+Update count is: 0
+executeUpdate() with parameters
+Update count is: 1
+execute() with parameters, no result set returned
+Update count is: 2
+executQuery() without parameters
+got row:  99 5 9
+got row:  2 6 10
+got row:  7 5 8
+end of rows
+executQuery() with parameters
+got row:  99 5 9
+got row:  7 5 8
+end of rows
+execute() with parameters with result set returned
+got row:  99 5 9
+got row:  7 5 8
+end of rows
+test different data types for input parameters of a Prepared Statement
+Update count is: 0
+Update count is: 1
+test setObject on different data types for input  parameters of a Prepared 
Statement
+Update count is: 1
+test setNull on different data types for input  parameters of a Prepared 
Statement
+Update count is: 1
+got row:  1 2 3 4.0 5.0 6.0 77.77 8.100 column9string        column10vcstring 
column11lvcstring 0123456789abcdef10111213202020 0123456789abcdef10111213 
0123456789abcdef10111213 xxxxxxFILTERED-TIMESTAMPxxxxx-04-12 11:44:30.0
+Timestamp match!
+got row:  1 2 3 4.0 5.0 6.0 77.77 8.100 column11string       column10vcstring 
column11lvcstring 0123456789abcdef10111213202020 0123456789abcdef10111213 
0123456789abcdef10111213 xxxxxxFILTERED-TIMESTAMPxxxxx-04-12 11:44:30.0
+Timestamp match!
+got row:  0 0 0 0.0 0.0 0.0 null null null null null null null null null null 
xxxxxxFILTERED-TIMESTAMPxxxxx
+After first Timestamp!
+end of rows
+SQLState: 07000 message: At least one parameter to the current statement is 
uninitialized.
+SQLState: 07000 message: At least one parameter to the current statement is 
uninitialized.
+insertTab ( bigtab,50)
+insertTab ( bigtab,200)
+insertTab ( bigtab,300)
+insertTab ( bigtab,500)
+insertTab ( bigtab,1000)
+select * from bigtab
+Col # 500 = null  Col 1000 = null
+Col # 500 = null  Col 1000 = null
+Col # 500 = null  Col 1000 = null
+Col # 500 = 500  Col 1000 = null
+Col # 500 = 500  Col 1000 = 1000
+Insert wrong column name
+insertTab ( bigtab,1001)
+SQLState: 42X14 message: 'C1001' is not a column in table or VTI 'CS.BIGTAB'.
+Expected Syntax error 
+insertTab ( bigtab,0)
+SQLState: 42X01 message: Syntax error: Encountered "<EOF>" at line 1, column 
29.
+Expected Table does not exist 
+insertTab ( wrongtab,1000)
+SQLState: 42X05 message: Table 'WRONGTAB' does not exist.
+Minimum BigDecimal Value: 1E-15
+Prepared Statement String: update Numeric_Tab set NULL_VAL=?
+Select NULL_VAL from Numeric_Tab
+Returned BigDecimal Value after Updation: 1E-15
+Value returned from ctssql.stmt: 1E-15
+setObject Method sets the designated parameter with the Object
+Negative test setString with Invalid Timestamp:20
+SQLState: 22007 message: The syntax of the string representation of a datetime 
value is incorrect.
+prepStmt Test Ends

Property changes on: 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out
___________________________________________________________________
Name: svn:eol-style
   + native

Index: 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/callable.out
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/callable.out
       (revision 0)
+++ 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/callable.out
       (revision 0)
@@ -0,0 +1,37 @@
+CallableStatement Test Starts
+Sum of 6 and 9 is: 15
+return value: Square of 6 then plus 6 is: 42
+return value is: 55
+return short: 3
+return int: 4
+return long: 5
+return float: 6.0
+return double: 7.0
+return decimal: 88.880
+return date: 2002-05-12
+return time: 10:05:02
+return time stamp: xxxxxxFILTERED-TIMESTAMPxxxxx
+return byte[0]: 1
+return byte[1]: 2
+method 5 return decimal: 33.3330
+method 5 return decimal: -33332.9966
+method 5 return decimal: -966.6669
+method 5 return decimal: 0.0000
+method 5 return decimal: 0.0000
+method 5 return decimal: 99999999.0000
+method 5 return decimal: -99999999.0000
+Integer: Sum of 6 and 9 is: 15
+Short: Sum of 6 and 9 is: 15
+Long: Sum of 99999 and 88888888 is: 88988887
+Float: Sum of 6.123453 and 77777 is: 77783.125
+Double: Sum of 6.987654 and 8888888888888.01234 is: 8.888888888894135E12
+Time: Old time of 10:05:02 changed to: 11:06:03
+cstmt.getBigDecimal(1): 999999999999999.000000000000000
+cstmt.getBigDecimal(2): 1E-15
+cstmt.getBigDecimal(3): null
+get the CallableStatement object
+execute the procedure with LONGVARBINARY
+execute the procedure with BLOB
+Select lvbc from Longvarbinary_Tab
+done testing long varbinary
+CallableStatement Test Ends

Property changes on: 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/callable.out
___________________________________________________________________
Name: svn:eol-style
   + native

Index: 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out
     (revision 0)
+++ 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out
     (revision 0)
@@ -0,0 +1,69 @@
+csPrepStmt Test Starts
+executeUpdate() without parameters
+Update count is: 0
+executeUpdate() with parameters
+Update count is: 1
+execute() with parameters, no result set returned
+Update count is: 2
+executQuery() without parameters
+got row:  99 5 9
+got row:  2 6 10
+got row:  7 5 8
+end of rows
+executQuery() with parameters
+got row:  99 5 9
+got row:  7 5 8
+end of rows
+execute() with parameters with result set returned
+got row:  99 5 9
+got row:  7 5 8
+end of rows
+test different data types for input parameters of a Prepared Statement
+Update count is: 0
+Update count is: 1
+test setObject on different data types for input  parameters of a Prepared 
Statement
+Update count is: 1
+test setNull on different data types for input  parameters of a Prepared 
Statement
+Update count is: 1
+got row:   1 2 3 4 5.0 6.0 7.0 88.88 99.100 column11string       
column11vcstring column12lvcstring 0123456789abcdef10111213202020 
0123456789abcdef10111213 0123456789abcdef10111213 
xxxxxxFILTERED-TIMESTAMPxxxxx-04-12 11:44:30.0
+Timestamp match!
+got row:   1 2 3 4 5.0 6.0 7.0 88.88 99.100 column10string       
column11vcstring column12lvcstring 0123456789abcdef10111213202020 
0123456789abcdef10111213 0123456789abcdef10111213 
xxxxxxFILTERED-TIMESTAMPxxxxx-04-12 11:44:30.0
+Timestamp match!
+got row:   0 0 0 0 0.0 0.0 0.0 null null null null null null null null null 
null xxxxxxFILTERED-TIMESTAMPxxxxx
+After first Timestamp!
+end of rows
+SQLState: 07000 message: At least one parameter to the current statement is 
uninitialized.
+SQLState: 07000 message: At least one parameter to the current statement is 
uninitialized.
+insertTab ( bigtab,50)
+insertTab ( bigtab,200)
+insertTab ( bigtab,300)
+insertTab ( bigtab,500)
+insertTab ( bigtab,1000)
+select * from bigtab
+Col # 500 = null  Col 1000 = null
+Col # 500 = null  Col 1000 = null
+Col # 500 = null  Col 1000 = null
+Col # 500 = 500  Col 1000 = null
+Col # 500 = 500  Col 1000 = 1000
+Insert too many Columns
+insertTab ( bigtab,1001)
+SQLState: 42X14 message: 'C1001' is not a column in table or VTI 'CS.BIGTAB'.
+Expected Syntax error 
+insertTab ( bigtab,0)
+SQLState: 42X01 message: Syntax error: Encountered "<EOF>" at line 1, column 
32.
+Expected Table does not exist 
+insertTab ( wrongtab,1000)
+SQLState: 42X05 message: Table 'WRONGTAB' does not exist.
+Minimum BigDecimal Value: 1E-15
+Prepared Statement String: update Numeric_Tab set NULL_VAL=?
+Select NULL_VAL from Numeric_Tab
+Returned BigDecimal Value after Updation: 1E-15
+Value returned from ctssql.stmt: 1E-15
+setObject Method sets the designated parameter with the Object
+Negative test setString with Invalid Timestamp:20
+SQLState: 22007 message: The syntax of the string representation of a datetime 
value is incorrect.
+CLOB result.
+GOT ROW: yayorsomething
+BLOB result.
+GOT ROW: 003100300031003000310030003000300031003100300031
+csPrepStmt Test Ends

Property changes on: 
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out
___________________________________________________________________
Name: svn:eol-style
   + native

Reply via email to