Hi,
I've noticed some minor test changes that were needed.
Some jvm specific canon updates, and 2 tests that are already there, but had not made it into the derbynetmats suite.
Thx, Myrna
Index:
java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_sed.properties
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_sed.properties
(revision 122596)
+++
java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_sed.properties
(working copy)
@@ -9,4 +9,4 @@
# No commas or semicolons can be allowed in the patterns/subsitutes.
-------------------------------------------------------------------------------
--
-substitute=Source database is:.*$;Source database is: <dbPath>,Connection URL
is:.*$;Connection URL is: <dbURL>,Failed to load jar file.*$;Failed to load jar
file <jarFilePath>,java.io.FileNotFoundException:
.*$;java.io.FileNotFoundException: <filePath>,CALL SQLJ.INSTALL_JAR.*$;CALL
SQLJ.INSTALL_JAR(<maskedOutJarDesc>)
+substitute=Source database is:.*$;Source database is: <dbPath>,Connection URL
is:.*$;Connection URL is: <dbURL>,Failed to load jar file.*$;Failed to load jar
file <jarFilePath>,java.io.FileNotFoundException:
.*$;java.io.FileNotFoundException: <filePath>,CALL SQLJ.INSTALL_JAR.*$;CALL
SQLJ.INSTALL_JAR(<maskedOutJarDesc>),java.sql.SQLException: Driver not found:
wombat;java.sql.SQLException: No suitable driver,DEBUG: Driver not found:
wombat;DEBUG: No suitable driver
Index:
java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
(revision 122596)
+++
java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
(working copy)
@@ -9,4 +9,5 @@
runwithjdk13=false
runwithibm13=false
+runwithj9=false
excludeJCC=1.1
Index:
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorExternalSortJDBC30.out
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorExternalSortJDBC30.out
(revision 122596)
+++
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorExternalSortJDBC30.out
(working copy)
@@ -22,9 +22,9 @@
----- open.
-----
run resource 'createTestProcedures.subsql';
-ij> CREATE FUNCTION PADSTRING (DATA VARCHAR(32000), LENGTH INTEGER) RETURNS
VARCHAR(32000) EXTERNAL NAME
'org.apache.derbyTesting.functiontests.util.Formatters.padString' LANGUAGE JAVA
PARAMETER STYLE JAVA;
+ij> CREATE FUNCTION PADSTRING (DATA VARCHAR(32000), LENGTH INTEGER) RETURNS
VARCHAR(32000) EXTERNAL NAME
'org.apache.derbyTesting.functionTests.util.Formatters.padString' LANGUAGE JAVA
PARAMETER STYLE JAVA;
0 rows inserted/updated/deleted
-ij> CREATE PROCEDURE WAIT_FOR_POST_COMMIT() DYNAMIC RESULT SETS 0 LANGUAGE
JAVA EXTERNAL NAME
'org.apache.derbyTesting.functiontests.util.T_Access.waitForPostCommitToFinish'
PARAMETER STYLE JAVA;
+ij> CREATE PROCEDURE WAIT_FOR_POST_COMMIT() DYNAMIC RESULT SETS 0 LANGUAGE
JAVA EXTERNAL NAME
'org.apache.derbyTesting.functionTests.util.T_Access.waitForPostCommitToFinish'
PARAMETER STYLE JAVA;
0 rows inserted/updated/deleted
ij> autocommit off;
ij> create table foo (a int, data varchar(2000));
Index:
java/testing/org/apache/derbyTesting/functionTests/master/j9_13/floattypes.out
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/master/j9_13/floattypes.out
(revision 122596)
+++
java/testing/org/apache/derbyTesting/functionTests/master/j9_13/floattypes.out
(working copy)
@@ -2419,4 +2419,42 @@
1
--------------------------------
ERROR 22003: The resulting value is outside the range for the data type
DECIMAL/NUMERIC(31,0).
+ij> create table tiger(d decimal(12,11));
+0 rows inserted/updated/deleted
+ij> insert into tiger values (1.234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.1234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.01234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.001234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.001234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.0001234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.00001234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.000001234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.0000001234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.00000001234);
+1 row inserted/updated/deleted
+ij> insert into tiger values (0.00000001234);
+1 row inserted/updated/deleted
+ij> select d from tiger order by 1;
+D
+---------------
+0.00000001234
+0.00000001234
+0.00000012340
+0.00000123400
+0.00001234000
+0.00012340000
+0.00123400000
+0.00123400000
+0.01234000000
+0.12340000000
+1.23400000000
ij>
Index:
java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
(revision 122596)
+++
java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
(working copy)
@@ -28,3 +28,5 @@
lang/simpleScroll.sql
lang/supersimple.sql
lang/wisconsin.sql
+store/holdCursorExternalSortJDBC30.sql
+store/holdCursorJDBC30.sql
Index:
java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
(revision 122596)
+++
java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
(working copy)
@@ -24,3 +24,5 @@
lang/procedure.java
lang/simpleScroll.sql
lang/supersimple.sql
+store/holdCursorExternalSortJDBC30.sql
+store/holdCursorJDBC30.sql
