db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r468514 [1/7] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ tests/lang/ tests/nist/
Date Fri, 27 Oct 2006 20:04:30 GMT
Author: djd
Date: Fri Oct 27 13:04:21 2006
New Revision: 468514

URL: http://svn.apache.org/viewvc?view=rev&rev=468514
Log:
DERBY-2007 (partial) Switch NIST suite over to Junit. Removed from old harness suites and added NistScripts
into lang._Suite. Added constraint names to various DDL statements in the nist SQL scripts to produce
constant output. Modify the .out files to match the output under JUnit, including not removing blank lines.
Still cleanup to do including modifying the readme to reflect changes.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/nist.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/nist.runall
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/basetab.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr002.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr003.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr004.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr005.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr006.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr007.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr027.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr030.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml001.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml004.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml005.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml008.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml009.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml010.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml011.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml012.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml013.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml014.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml015.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml016.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml018.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml019.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml020.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml021.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml022.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml023.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml024.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml025.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml026.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml027.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml029.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml033.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml034.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml035.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml037.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml038.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml039.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml042.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml043.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml044.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml045.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml046.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml047.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml049.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml050.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml051.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml052.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml053.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml055.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml056.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml057.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml058.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml059.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml060.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml061.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml065.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml068.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml069.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml070.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml073.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml075.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml076.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml079.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml080.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml081.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml082.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml085.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml087.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml090.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml091.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml099.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml104.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml106.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml108.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml114.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml119.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml130.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml132.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml134.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml141.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml144.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml148.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml155.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml158.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml160.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml162.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml165.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml168.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml170.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml173.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml174.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml177.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml178.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml179.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml181.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml182.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/flattab.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema1.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema4.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema8.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sdl012.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5sch2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5tab.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_schem10.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts701.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts729.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts730.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts731.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts740.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts742.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts752.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts753.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts760.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts796.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts797.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts798.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts799.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts811.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts812.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml114.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml160.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema1.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema5.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema8.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/basetab.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/basetab.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/basetab.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/basetab.out Fri Oct 27 13:04:21 2006
@@ -19,30 +19,40 @@
 -- ****** THIS FILE SHOULD BE RUN UNDER AUTHORIZATION ID HU ******
 -- ***************************************************************
 -- MODULE BASETAB
+
 -- SQL Test Suite, V6.0, Interactive SQL, basetab.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
+
 --0   SELECT USER FROM HU.ECCO;
    VALUES USER;
 1                                                                                                                               
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 --   This routine initializes the contents of tables:
 --        STAFF, PROJ, WORKS, STAFF3, VTABLE, and UPUNIQ
 --   This routine may be run at any time to re-initialize tables.
+
    DELETE FROM HU.ECCO;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO HU.ECCO VALUES ('NL');
 1 row inserted/updated/deleted
 ij> DELETE FROM HU.STAFF;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> DELETE FROM HU.PROJ;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> DELETE FROM HU.WORKS;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO HU.STAFF VALUES ('E1','Alice',12,'Deale');
 1 row inserted/updated/deleted
 ij> INSERT INTO HU.STAFF VALUES ('E2','Betty',10,'Vienna');
@@ -101,6 +111,7 @@
 P5 |IRM                 |Test  |10000     |Vienna         
 P6 |PAYR                |Design|50000     |Deale          
 ij> -- PASS:Setup if count = 6?
+
 --O      SELECT COUNT(*) FROM HU.STAFF;
       SELECT * FROM HU.STAFF;
 EM&|EMPNAME             |GRADE|CITY           
@@ -111,6 +122,7 @@
 E4 |Don                 |12   |Deale          
 E5 |Ed                  |13   |Akron          
 ij> -- PASS:Setup if count = 5?
+
 --O      SELECT COUNT(*) FROM HU.WORKS;
       SELECT * FROM HU.WORKS;
 EM&|PN&|HOURS 
@@ -128,12 +140,17 @@
 E4 |P4 |40    
 E4 |P5 |80    
 ij> -- PASS:Setup if count = 12?
+
+
       DELETE FROM HU.STAFF3;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> DELETE FROM HU.VTABLE;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> DELETE FROM HU.UPUNIQ;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO HU.STAFF3
               SELECT * 
               FROM HU.STAFF;
@@ -169,8 +186,10 @@
 E4 |Don                 |12   |Deale          
 E5 |Ed                  |13   |Akron          
 ij> -- PASS:Setup if count = 5?
+
 --O      SELECT COUNT(*) FROM HU.VTABLE;
 -- PASS:Setup if count = 4?
+
 --O      SELECT COUNT(*) FROM HU.UPUNIQ;
       SELECT * FROM HU.UPUNIQ;
 NUM&|COL2
@@ -184,4 +203,4 @@
 ij> -- PASS:Setup if count = 6?
 -- *************************************************////END-OF-MODULE
 disconnect;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr002.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr002.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr002.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr002.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR002
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr002.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,43 +30,57 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0302 CHECK <comp. predicate> in <tab. cons.>, insert!
+
 -- setup
   DELETE FROM SUN.STAFF5;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO SUN.STAFF5
         VALUES('E1','Alice',0,'Deale');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
+ERROR 23513: The check constraint 'STAFF5_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
 ij> -- PASS:0302 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO SUN.STAFF5
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
 ij> INSERT INTO SUN.STAFF5
         VALUES('E2','Tom',22,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
+ERROR 23513: The check constraint 'STAFF5_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
 ij> -- PASS:0302 If ERROR, check constraint, 0 rows inserted?
+
   SELECT COUNT(*) FROM SUN.STAFF5;
 1          
 -----------
 1          
 ij> -- PASS:0302 If count = 1?
+
 -- restore
   ROLLBACK WORK;
 ij> -- END TEST >>> 0302 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0303 CHECK <comp. predicate> in <col. cons.>, insert!
+
 -- setup
   DELETE FROM SUN.STAFF6;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO SUN.STAFF6
         VALUES('E1','Alice',0,'Deale');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF6'.
+ERROR 23513: The check constraint 'STAFF6_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF6'.
 ij> -- PASS:0303 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO SUN.STAFF6
         VALUES('E2','Tom',22,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF6'.
+ERROR 23513: The check constraint 'STAFF6_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF6'.
 ij> -- PASS:0303 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO SUN.STAFF6
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
@@ -74,22 +90,30 @@
 -----
 11   
 ij> -- PASS:0303 If 1 row selected and GRADE = 11?
+
 -- restore
   ROLLBACK WORK;
 ij> -- END TEST >>> 0303 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0304 CHECK <between predicate> in <tab. cons.>, insert!
+
 -- setup
   DELETE FROM SUN.STAFF7;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO SUN.STAFF7
         VALUES('E1','Alice',0,'Deale');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF7'.
+ERROR 23513: The check constraint 'STAFF7_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF7'.
 ij> -- PASS:0304 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO SUN.STAFF7
         VALUES('E2','Tom',22,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF7'.
+ERROR 23513: The check constraint 'STAFF7_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF7'.
 ij> -- PASS:0304 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO SUN.STAFF7
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
@@ -99,14 +123,20 @@
 -----------
 1          
 ij> -- PASS:0304 If count = 1?
+
 -- restore
   ROLLBACK WORK;
 ij> -- END TEST >>> 0304 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0305 CHECK <null predicate> in <tab. cons.>, insert!
+
 -- setup
   DELETE FROM SUN.STAFF8;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO SUN.STAFF8
         VALUES('E1','Alice',34,'Deale');
 1 row inserted/updated/deleted
@@ -115,17 +145,22 @@
 -----------
 1          
 ij> -- PASS:0305 If count = 1?
+
   INSERT INTO SUN.STAFF8
         VALUES('E2',NULL,34,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF8'.
+ERROR 23513: The check constraint 'STAFF8_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF8'.
 ij> -- PASS:0305 If ERROR, check constraint, 0 rows inserted?
+
   SELECT COUNT(*) FROM SUN.STAFF8;
 1          
 -----------
 1          
 ij> -- PASS:0305 If count = 1?
+
+
   COMMIT WORK;
 ij> -- END TEST >>> 0305 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr003.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr003.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr003.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr003.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR003
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr003.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,11 +30,15 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0306 CHECK X IS NOT NULL, NOT X IS NULL are equivalent!
+
 -- setup
   DELETE FROM STAFF13;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF13
         VALUES('E1','Alice',36,'Deale');
 1 row inserted/updated/deleted
@@ -41,29 +47,39 @@
 -----------
 1          
 ij> -- PASS:0306 If count = 1?
+
   INSERT INTO STAFF13
         VALUES('E2',NULL,36,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF13'.
+ERROR 23513: The check constraint 'STAFF13_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF13'.
 ij> -- PASS:0306 If ERROR, check constraint, 0 rows inserted?
+
   SELECT COUNT(*) FROM STAFF13;
 1          
 -----------
 1          
 ij> -- PASS:0306 If count = 1?
+
 -- END TEST >>> 0306 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0307 CHECK <like predicate> in <tab. cons>, insert!
+
 -- setup
   DELETE FROM STAFF9;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF9
         VALUES('E1','Thomas',0,'Deale');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
+ERROR 23513: The check constraint 'STAFF9_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
 ij> -- PASS:0307 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF9
         VALUES('E2','Tom',22,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
+ERROR 23513: The check constraint 'STAFF9_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
 ij> -- PASS:0307 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF9
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
@@ -72,20 +88,29 @@
 -----------
 1          
 ij> -- PASS:0307 If count = 1?
+
+
 -- END TEST >>> 0307 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0308 CHECK <in predicate> in <tab. cons.>, insert!
+
 -- setup
   DELETE FROM STAFF10;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF10
         VALUES('E1','Thomas',5,'Deale');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF10'.
+ERROR 23513: The check constraint 'STAFF10_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF10'.
 ij> -- PASS:0308 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF10
         VALUES('E2','Tom',22,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF10'.
+ERROR 23513: The check constraint 'STAFF10_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF10'.
 ij> -- PASS:0308 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF10
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
@@ -94,15 +119,24 @@
 -----------
 1          
 ij> -- PASS:0308 If count = 1?
+
 -- END TEST >>> 0308 <<< END TEST
+
 -- *************************************************
+
 -- NO_TEST:0373 insert with embeded var. & indic. var. CHECK clause!
+
 -- Testing Embedded Variable & Indicator Variable
+
 -- *************************************************
+
+
 -- TEST:0374 computation in update, CHECK clause!
+
 -- setup
   DELETE FROM STAFF5;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF5
         VALUES('R9','Alice',15,'Deale');
 1 row inserted/updated/deleted
@@ -111,20 +145,24 @@
 -----------
 1          
 ij> -- PASS:0374 If count = 1?
+
   UPDATE STAFF5
          SET GRADE = 10 * 10 / 5 + 1
          WHERE EMPNUM = 'R9';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
+ERROR 23513: The check constraint 'STAFF5_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
 ij> -- PASS:0374 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF5
       WHERE GRADE = 15;
 1          
 -----------
 1          
 ij> -- PASS:0374 If count = 1?
+
 -- restore
   ROLLBACK WORK;
 ij> -- END TEST >>> 0374 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr004.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr004.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr004.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr004.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR004
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr004.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,19 +30,25 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0309 CHECK combination predicates in <tab. cons.>, insert!
+
 -- setup
   DELETE FROM STAFF11;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF11
         VALUES('E1','Thomas',0,'Deale');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
+ERROR 23513: The check constraint 'STAFF11_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
 ij> -- PASS:0309 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF11
         VALUES('E2','Tom',22,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
+ERROR 23513: The check constraint 'STAFF11_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
 ij> -- PASS:0309 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF11
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
@@ -49,20 +57,29 @@
 -----------
 1          
 ij> -- PASS:0309 If count = 1?
+
+
 -- END TEST >>> 0309 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0310 CHECK if X NOT IN, NOT X IN equivalent, insert!
+
 -- setup
   DELETE FROM STAFF12;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF12
         VALUES('E1','Thomas',0,'Deale');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF12'.
+ERROR 23513: The check constraint 'STAFF12_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF12'.
 ij> -- PASS:0310 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF12
         VALUES('E2','Tom',22,'Newyork');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF12'.
+ERROR 23513: The check constraint 'STAFF12_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF12'.
 ij> -- PASS:0310 If ERROR, check constraint, 0 rows inserted?
+
   INSERT INTO STAFF12
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
@@ -71,12 +88,18 @@
 -----------
 1          
 ij> -- PASS:0310 If count = 1?
+
 -- END TEST >>> 0310 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0311 CHECK NOT NULL in col.cons., insert, null explicit!
+
 -- setup
   DELETE FROM STAFF15;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF15
         VALUES('E1','Alice',52,'Deale');
 1 row inserted/updated/deleted
@@ -85,18 +108,26 @@
 -----------
 1          
 ij> -- PASS:0311 If count = 1?
+
   INSERT INTO STAFF15
         VALUES('E2',NULL,52,'Newyork');
 ERROR 23502: Column 'EMPNAME'  cannot accept a NULL value.
 ij> -- PASS:0311 If ERROR, check constraint, 0 rows inserted?
+
   SELECT COUNT(*) FROM STAFF15;
 1          
 -----------
 1          
 ij> -- PASS:0311 If count = 1?
+
+
 -- END TEST >>> 0311 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0312 CHECK NOT NULL in col.cons., insert, null implicit!
+
 -- setup
   DELETE FROM STAFF15;
 1 row inserted/updated/deleted
@@ -108,17 +139,22 @@
 -----------
 1          
 ij> -- PASS:0312 If count = 1?
+
   INSERT INTO STAFF15(EMPNUM,GRADE,CITY)
         VALUES('E2',52,'Newyork');
 ERROR 23502: Column 'EMPNAME'  cannot accept a NULL value.
 ij> -- PASS:0312 If ERROR, check constraint, 0 rows inserted?
+
   SELECT COUNT(*) FROM STAFF15;
 1          
 -----------
 1          
 ij> -- PASS:0312 If count = 1?
+
+
   COMMIT WORK;
 ij> -- END TEST >>> 0312 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr005.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr005.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr005.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr005.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR005
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr005.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,64 +30,87 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0313 CHECK <comp. predicate> in <tab. cons.>, update!
+
 -- setup
   DELETE FROM STAFF5;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF5
         VALUES('E2','Tom',14,'Newyork');
 1 row inserted/updated/deleted
 ij> UPDATE STAFF5
         SET GRADE = 20;
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
+ERROR 23513: The check constraint 'STAFF5_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF5'.
 ij> -- PASS:0313 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF5
         WHERE GRADE = 14;
 1          
 -----------
 1          
 ij> -- PASS:0313 If count = 1?
+
+
 -- END TEST >>> 0313 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0314 CHECK <comp. predicate> in <col. cons.>, update!
+
 -- setup
   DELETE FROM STAFF6;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF6
         VALUES('E2','Tom',14,'Newyork');
 1 row inserted/updated/deleted
 ij> UPDATE STAFF6
         SET GRADE = 20;
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF6'.
+ERROR 23513: The check constraint 'STAFF6_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF6'.
 ij> -- PASS:0314 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF6
         WHERE GRADE = 14;
 1          
 -----------
 1          
 ij> -- PASS:0314 If count = 1?
+
 -- END TEST >>> 0314 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0315 CHECK <between predicate> in <tab. cons.>, update!
+
 -- setup
   DELETE FROM STAFF7;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF7
         VALUES('E2','Tom',14,'Newyork');
 1 row inserted/updated/deleted
 ij> UPDATE STAFF7
         SET GRADE = 21;
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF7'.
+ERROR 23513: The check constraint 'STAFF7_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF7'.
 ij> -- PASS:0315 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF7
         WHERE GRADE = 14;
 1          
 -----------
 1          
 ij> -- PASS:0315 If count = 1?
+
+
   COMMIT WORK;
 ij> -- END TEST >>> 0315 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr006.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr006.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr006.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr006.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR006
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr006.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,8 +30,11 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0316 CHECK <null predicate> in <tab. cons.>, update!
+
 -- setup
   DELETE FROM STAFF8;
 1 row inserted/updated/deleted
@@ -39,28 +44,36 @@
 ij> UPDATE STAFF8
         SET EMPNAME = NULL
         WHERE EMPNUM = 'E1';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF8'.
+ERROR 23513: The check constraint 'STAFF8_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF8'.
 ij> -- PASS:0316 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF8
         WHERE EMPNAME = 'Alice';
 1          
 -----------
 1          
 ij> -- PASS:0316 If count = 1?
+
 -- END TEST >>> 0316 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0317 CHECK X IS NOT NULL, NOT X IS NULL same, by update!
+
 -- setup
   DELETE FROM STAFF13;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF13
         VALUES('E1','Alice',36,'Deale');
 1 row inserted/updated/deleted
 ij> UPDATE STAFF13
         SET EMPNAME = NULL
         WHERE EMPNUM = 'E1';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF13'.
+ERROR 23513: The check constraint 'STAFF13_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF13'.
 ij> -- PASS:0317 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*)
         FROM STAFF13
         WHERE EMPNAME = 'Alice';
@@ -68,20 +81,28 @@
 -----------
 1          
 ij> -- PASS:0317 If count = 1?
+
+
 -- END TEST >>> 0317 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0318 CHECK <like predicate> in <tab. cons.>, update!
+
 -- setup
   DELETE FROM STAFF9;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF9
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
 ij> UPDATE STAFF9
         SET EMPNAME = 'Thomas'
         WHERE EMPNUM = 'E3';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
+ERROR 23513: The check constraint 'STAFF9_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
 ij> -- PASS:0318 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*)
         FROM STAFF9
         WHERE EMPNAME = 'Susan';
@@ -89,8 +110,11 @@
 -----------
 1          
 ij> -- PASS:0318 If count = 1?
+
   COMMIT WORK;
 ij> -- END TEST >>> 0318 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
+
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr007.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr007.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr007.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr007.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR007
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr007.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,28 +30,39 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0319 CHECK <in predicate> in <tab. cons.>, update!
+
 -- setup
   DELETE FROM STAFF10;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> INSERT INTO STAFF10
         VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
 ij> UPDATE STAFF10
         SET GRADE = 5
         WHERE EMPNUM = 'E3';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF10'.
+ERROR 23513: The check constraint 'STAFF10_GRADE' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF10'.
 ij> -- PASS:0319 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF10
         WHERE GRADE = 11;
 1          
 -----------
 1          
 ij> -- PASS:0319 If count = 1?
+
+
 -- END TEST >>> 0319 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0320 CHECK combination pred. in <tab. cons.>, update!
+
 -- setup
   DELETE FROM STAFF11;
 1 row inserted/updated/deleted
@@ -59,22 +72,29 @@
 ij> UPDATE STAFF11
         SET GRADE = 5
         WHERE EMPNUM = 'E3';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
+ERROR 23513: The check constraint 'STAFF11_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
 ij> -- PASS:0320 If ERROR, check constraint, 0 rows updated?
+
   UPDATE STAFF11
         SET EMPNAME = 'Tom'
         WHERE EMPNUM = 'E3';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
+ERROR 23513: The check constraint 'STAFF11_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
 ij> -- PASS:0320 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF11
         WHERE EMPNAME = 'Susan' AND GRADE = 11;
 1          
 -----------
 1          
 ij> -- PASS:0320 If count = 1?
+
 -- END TEST >>> 0320 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0321 CHECK if X NOT LIKE/IN, NOT X LIKE/IN same, update!
+
 -- setup
   DELETE FROM STAFF12;
 1 row inserted/updated/deleted
@@ -84,17 +104,24 @@
 ij> UPDATE STAFF12
         SET GRADE = 5
         WHERE EMPNUM = 'E3';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF12'.
+ERROR 23513: The check constraint 'STAFF12_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF12'.
 ij> -- PASS:0321 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF12
         WHERE GRADE = 11;
 1          
 -----------
 1          
 ij> -- PASS:0321 If count = 1?
+
+
 -- END TEST >>> 0321 <<< END TEST
+
 -- *************************************************
+
+
 -- TEST:0322 CHECK <null predicate> in <col. cons>, update!
+
 -- setup
   DELETE FROM STAFF15;
 1 row inserted/updated/deleted
@@ -106,14 +133,18 @@
         WHERE EMPNUM = 'E1';
 ERROR 23502: Column 'EMPNAME'  cannot accept a NULL value.
 ij> -- PASS:0322 If ERROR, check constraint, 0 rows updated?
+
   SELECT COUNT(*) FROM STAFF15
         WHERE EMPNAME = 'Alice';
 1          
 -----------
 1          
 ij> -- PASS:0322 If count = 1?
+
+
   COMMIT WORK;
 ij> -- END TEST >>> 0322 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr027.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr027.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr027.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr027.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR027
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr027.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,47 +30,59 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
+
 -- TEST:0446 Table CHECK constraint allows unknown (NULL)!
+
    DELETE FROM STAFF5;
 1 row inserted/updated/deleted
 ij> INSERT INTO STAFF5 VALUES('E7','Mimi',NULL,'Miami');
 1 row inserted/updated/deleted
 ij> -- PASS:0446 If 1 row inserted?
+
    INSERT INTO STAFF5 VALUES('E8','Joe',NULL,'Boston');
 1 row inserted/updated/deleted
 ij> -- PASS:0446 If 1 row inserted?
+
    INSERT INTO STAFF5(EMPNUM) VALUES('E9');
 1 row inserted/updated/deleted
 ij> -- PASS:0446 If 1 row inserted?
+
 --O   UPDATE STAFF
    UPDATE HU.STAFF
        SET GRADE = NULL
        WHERE EMPNUM = 'E1';
 1 row inserted/updated/deleted
 ij> -- PASS:0446 If 1 row updated?
+
    INSERT INTO STAFF5 
         SELECT *
 --O         FROM STAFF;
          FROM HU.STAFF;
 5 rows inserted/updated/deleted
 ij> -- PASS:0446 If 5 rows inserted?
+
    UPDATE STAFF5 
        SET GRADE = NULL
        WHERE EMPNUM = 'E2';
 1 row inserted/updated/deleted
 ij> -- PASS:0446 If 1 row updated?
+
    UPDATE STAFF5
        SET GRADE = NULL 
        WHERE EMPNUM = 'E4';
 1 row inserted/updated/deleted
 ij> -- PASS:0446 If 1 row updated?
+
    SELECT COUNT(*)
        FROM STAFF5;
 1          
 -----------
 8          
 ij> -- PASS:0446 If count = 8?
+
    SELECT COUNT(*)
        FROM STAFF5
        WHERE GRADE IS NULL;
@@ -76,28 +90,35 @@
 -----------
 6          
 ij> -- PASS:0446 If count = 6?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0446 <<< END TEST
 -- *********************************************
+
 -- TEST:0447 NULLs with check constraint and check option!
+
    DELETE FROM STAFF6;
 1 row inserted/updated/deleted
 ij> --O   INSERT INTO STAFF6_WITH_GRADES
 --O       VALUES('X1','Vicki',NULL,'Houston');
 -- PASS:0447 If ERROR, view check constraint, 0 rows inserted?
+
    INSERT INTO STAFF6
        VALUES('X2','Tina',NULL,'Orlando');
 1 row inserted/updated/deleted
 ij> -- PASS:0447 If 1 row inserted?
+
 --O   SELECT COUNT(*)
 --O       FROM STAFF6_WITH_GRADES;
 -- PASS:0447 If count = 0?
+
    SELECT COUNT(*)
       FROM STAFF6;
 1          
 -----------
 1          
 ij> -- PASS:0447 If count = 1?
+
    SELECT EMPNAME
        FROM STAFF6
        WHERE GRADE IS NULL;
@@ -105,101 +126,128 @@
 --------------------
 Tina                
 ij> -- PASS:0447 If EMPNAME is Tina?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0447 <<< END TEST
 -- *********************************************
+
 -- TEST:0448 PRIMARY KEY implies UNIQUE!
+
    DELETE FROM STAFF9;
 1 row inserted/updated/deleted
 ij> INSERT INTO STAFF9(EMPNUM,EMPNAME)
        VALUES('D1','Muddley');
 1 row inserted/updated/deleted
 ij> -- PASS:0448 If 1 row inserted?
+
+
    INSERT INTO STAFF9(EMPNUM,EMPNAME)
        VALUES('D1','Muddley');
-ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'STAFF9'.
+ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'STAFF9_PK' defined on 'STAFF9'.
 ij> -- PASS:0448 If ERROR, unique constraint, 0 rows inserted?
+
    INSERT INTO STAFF9(EMPNUM,EMPNAME)
        VALUES('d1','Muddley');
 1 row inserted/updated/deleted
 ij> -- PASS:0448 If 1 row inserted?
+
    SELECT COUNT(*)
        FROM STAFF9;
 1          
 -----------
 2          
 ij> -- PASS:0448 If count = 2?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0448 <<< END TEST
 -- *********************************************
+
 -- TEST:0449 Constraint definition is case sensitive!
+
    DELETE FROM STAFF9;
 1 row inserted/updated/deleted
 ij> INSERT INTO STAFF9(EMPNUM,EMPNAME)
        VALUES('Z1','Tina');
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
+ERROR 23513: The check constraint 'STAFF9_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF9'.
 ij> -- PASS:0449 If ERROR, check constraint, 0 rows inserted?
+
    INSERT INTO STAFF9(EMPNUM,EMPNAME)
        VALUES('Z2','tina');
 1 row inserted/updated/deleted
 ij> -- PASS:0449 If 1 row inserted?
+
    INSERT INTO STAFF9(EMPNUM,EMPNAME)
        VALUES('Z3','ANTHONY');
 1 row inserted/updated/deleted
 ij> -- PASS:0449 If 1 row inserted?
+
    SELECT COUNT(*)
         FROM STAFF9;
 1          
 -----------
 2          
 ij> -- PASS:0449 If count = 2?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0449 <<< END TEST
 -- *********************************************
+
 -- TEST:0450 Referential integrity is case sensitive!
+
    INSERT INTO DEPT
        VALUES(11,'VOLLEYBALL','VICKI');
 1 row inserted/updated/deleted
 ij> -- PASS:0450 If 1 row inserted?
+
    INSERT INTO DEPT 
        VALUES(10,'volleyball','vicki');
 1 row inserted/updated/deleted
 ij> -- PASS:0450 If 1 row inserted?
 -- NOTE:0450 insert lower case value of above.
+
    SELECT COUNT(*) FROM DEPT WHERE DNO = 10;
 1          
 -----------
 1          
 ij> -- PASS:0450 If count = 1?
+
 --O   INSERT INTO EMP
 --O       VALUES(13,'MARY','Dancer',15,'VOLLEYBALL',010101);
 -- PASS:0450 If 1 row inserted?
+
    DELETE FROM DEPT
        WHERE DNO = 10;
 1 row inserted/updated/deleted
 ij> -- PASS:0450 If 1 row deleted?
+
 --O   UPDATE DEPT
 --O       SET DNAME = 'EDUCATION'
 --O       WHERE DNAME = 'Education';
 -- PASS:0450 If RI ERROR, children exist, 0 rows updated?
+
 --O   SELECT * FROM DEPT ORDER BY DNO;
 -- PASS:0450 If 5 rows selected?
 -- PASS:0450 If DNO values are 11, 12, 13, 14, 15?
 -- PASS:0450 If DNAME = 'Education' (not 'EDUCATION') for DNO = 14?
+
 --O   INSERT INTO EMP
 --O       VALUES(28,'BARBARA','Jogger',14,'EDUCATION',010101);
 -- PASS:0450 If RI ERROR, parent missing, 0 rows inserted?
+
 --O   UPDATE EMP
 --O       SET DNAME = 'PHYSICS'
 --O       WHERE ENO = 25;
 -- PASS:0450 If RI ERROR, parent missing, 0 rows updated?
+
 --O   SELECT ENO, ENAME, DNO, DNAME 
 --O       FROM EMP ORDER BY ENO;
 -- PASS:0450 If 8 rows selected?
 -- PASS:0450 If ENO values are 13, 21 through 27?
 -- PASS:0450 If DNAME = 'Physics' (not 'PHYSICS') for ENO = 25?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0450 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr030.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr030.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr030.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cdr030.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE CDR030  
+
 -- SQL Test Suite, V6.0, Interactive SQL, cdr030.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SUN
    set schema SUN;
 0 rows inserted/updated/deleted
@@ -28,7 +30,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SUN                                                                                                                             
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- NOTE Direct support for SQLCODE or SQLSTATE is not required
 -- NOTE    in Interactive Direct SQL, as defined in FIPS 127-2.
 -- NOTE   ********************* instead ***************************
@@ -40,24 +44,29 @@
 -- NOTE    "warning" or "no data", then the system shall display
 -- NOTE    a message indicating that the statement completed,
 -- NOTE    giving a textual description of the "warning" or "no data."
+
 -- TEST:0516 SQLSTATE 23502: integrity constraint violation!
+
 --O   INSERT INTO EMP 
 --O         VALUES (41,'Tom','China Architecture',
 --O                 20,'Architecture',040553);
 -- PASS:0516 If ERROR, integrity constraint violation, 0 rows inserted?
 -- PASS:0516 OR RI ERROR, parent missing, 0 rows inserted?
 -- PASS:0516 OR SQLSTATE = 23502 OR SQLCODE < 0?
+
 --O   DELETE FROM EMP
 --O         WHERE ENO = 21;
 -- PASS:0516 If ERROR, integrity constraint violation, 0 rows deleted?
 -- PASS:0516 OR RI ERROR, children exist, 0 rows deleted?
 -- PASS:0516 OR SQLSTATE = 23502 OR SQLCODE < 0?
+
 --O   UPDATE EMP
 --O         SET ENAME = 'Thomas'
 --O         WHERE ENO = 21;
 -- PASS:0516 If ERROR, integrity constraint violation, 0 rows updated?
 -- PASS:0516 OR RI ERROR, chldren exist, 0 rows updated?
 -- PASS:0516 OR SQLSTATE = 23502 OR SQLCODE < 0?
+
 -- setup 
    DELETE FROM STAFF7;
 1 row inserted/updated/deleted
@@ -66,27 +75,32 @@
          VALUES ('XXX');
 1 row inserted/updated/deleted
 ij> -- PASS:0516 If 1 row inserted?
+
    INSERT INTO STAFF7 (EMPNUM) 
          VALUES ('XXX');
-ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'STAFF7'.
+ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'STAFF7_PK' defined on 'STAFF7'.
 ij> -- PASS:0516 If ERROR, integrity constraint violation, 0 rows inserted?
 -- PASS:0516 OR ERROR, unique constraint, 0 rows inserted?
 -- PASS:0516 OR SQLSTATE = 23502 OR SQLCODE < 0?
+
 -- setup
    DELETE FROM PROJ3;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> -- UNIQUE (PNUM)
    INSERT INTO PROJ3 (PNUM) VALUES ('787');
 1 row inserted/updated/deleted
 ij> INSERT INTO PROJ3 (PNUM) VALUES ('789');
 1 row inserted/updated/deleted
 ij> -- PASS:0516 If 1 row inserted?
+
    UPDATE PROJ3          SET PNUM = '787' 
                        WHERE PNUM = '789';
-ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'PROJ3'.
+ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'PROJ3_UNIQUE' defined on 'PROJ3'.
 ij> -- PASS:0516 If ERROR, integrity constraint violation, 0 rows updated?
 -- PASS:0516 OR ERROR, unique constraint, 0 rows updated?
 -- PASS:0516 OR SQLSTATE = 23502 OR SQLCODE < 0?
+
 -- setup
    DELETE FROM STAFF11;
 1 row inserted/updated/deleted
@@ -94,25 +108,28 @@
          VALUES('E3','Susan',11,'Hawaii');
 1 row inserted/updated/deleted
 ij> -- PASS:0516 If 1 row inserted?
+
 -- (CHECK GRADE NOT IN (5,22))
    UPDATE STAFF11
          SET GRADE = 5
          WHERE EMPNUM = 'E3';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
+ERROR 23513: The check constraint 'STAFF11_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
 ij> -- PASS:0516 If ERROR, integrity constraint violation, 0 rows updated?
 -- PASS:0516 OR ERROR, check constraint, 0 rows updated?
 -- PASS:0516 OR SQLSTATE = 23502 OR SQLCODE < 0?
+
 -- (CHECK NOT EMPNAME LIKE 'T%')
    UPDATE STAFF11
          SET EMPNAME = 'Tom'
          WHERE EMPNUM = 'E3';
-ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
+ERROR 23513: The check constraint 'STAFF11_GRADE_EMPNAME' was violated while performing an INSERT or UPDATE on table 'SUN.STAFF11'.
 ij> -- PASS:0516 If ERROR, integrity constraint violation, 0 rows updated?
 -- PASS:0516 OR ERROR, check constraint, 0 rows updated?
 -- PASS:0516 OR SQLSTATE = 23502 OR SQLCODE < 0?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0516 <<< END TEST
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml001.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml001.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml001.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml001.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML001
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml001.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,8 +14,12 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
+
 -- TEST:0001 SELECT with ORDER BY DESC!
+
                 SELECT EMPNUM,HOURS
                      FROM WORKS
                      WHERE PNUM='P2'
@@ -25,9 +31,12 @@
 E2 |80    
 E1 |20    
 ij> -- PASS:0001 If 4 rows selected and last EMPNUM = 'E1'?
+
 -- END TEST >>> 0001 <<< END TEST
 -- *********************************************
+
 -- TEST:0002 SELECT with ORDER BY integer ASC!
+
                 SELECT EMPNUM,HOURS
                      FROM WORKS
                      WHERE PNUM='P2'
@@ -39,9 +48,12 @@
 E1 |20    
 E2 |80    
 ij> -- PASS:0002 If 4 rows selected and last HOURS = 80?
+
 -- END TEST >>> 0002 <<< END TEST
 -- *********************************************
+
 -- TEST:0003 SELECT with ORDER BY DESC integer, named column!
+
                 SELECT EMPNUM,HOURS
                      FROM WORKS
                      WHERE PNUM = 'P2'
@@ -53,9 +65,12 @@
 E3 |20    
 E1 |20    
 ij> -- PASS:0003 If 4 rows selected and last EMPNUM = 'E1'?
+
 -- END TEST >>> 0003 <<< END TEST
 -- *********************************************
+
 -- TEST:0004 SELECT with UNION, ORDER BY integer DESC!
+
                 SELECT WORKS.EMPNUM 
                      FROM WORKS
                      WHERE WORKS.PNUM = 'P2'
@@ -72,9 +87,12 @@
 E2 
 E1 
 ij> -- PASS:0004 If 5 rows selected and last EMPNUM = 'E1'?
+
 -- END TEST >>> 0004 <<< END TEST
 -- *********************************************
+
 -- TEST:0005 SELECT with UNION ALL!
+
                 SELECT WORKS.EMPNUM 
                      FROM WORKS
                      WHERE WORKS.PNUM = 'P2'
@@ -91,9 +109,12 @@
 E3 
 E5 
 ij> -- PASS:0005 If 6 rows selected?
+
 -- END TEST >>> 0005 <<< END TEST
 -- *********************************************
+
 -- TEST:0158 SELECT with UNION and NOT EXISTS subquery!
+
                 SELECT EMPNAME,PNUM,HOURS
                      FROM STAFF,WORKS
                      WHERE STAFF.EMPNUM = WORKS.EMPNUM
@@ -128,9 +149,12 @@
 Ed                  |P5 |80    
 Ed                  |P6 |12    
 ij> -- PASS:0158 If 21 rows selected?
+
 -- END TEST >>> 0158 <<< END TEST
 -- *********************************************
+
 -- TEST:0159 SELECT with 2 UNIONs, ORDER BY 2 integers!
+
              SELECT PNUM,EMPNUM,HOURS
                   FROM WORKS
                   WHERE HOURS=80
@@ -156,9 +180,12 @@
 P3 |E1 |80    
 P5 |E4 |80    
 ij> -- PASS:0159 If 10 rows selected?
+
 -- END TEST >>> 0159 <<< END TEST
 -- *********************************************
+
 -- TEST:0160 SELECT with parenthesized UNION, UNION ALL!
+
              SELECT PNUM,EMPNUM,HOURS
                   FROM WORKS
                   WHERE HOURS=12
@@ -187,7 +214,9 @@
 P4 |E4 |40    
 P5 |E4 |80    
 ij> -- PASS:0160 If 14 rows selected?
+
 -- END TEST >>> 0160 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml004.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml004.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml004.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml004.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML004
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml004.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,7 +14,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0008 SQLCODE 100:SELECT on empty table !
      SELECT EMPNUM,HOURS
           FROM WORKS
@@ -21,14 +25,18 @@
 EM&|HOURS 
 ----------
 ij> -- PASS:0008 If 0 rows selected, SQLCODE = 100, end of data?
+
 -- END TEST >>> 0008 <<< END TEST
 -- ****************************************************************
+
 -- TEST:0009 SELECT NULL value!
+
 -- setup
      INSERT INTO WORKS
             VALUES('E9','P9',NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:0009 If 1 row is inserted?
+
      SELECT EMPNUM
           FROM WORKS
           WHERE HOURS IS NULL;
@@ -36,6 +44,7 @@
 ---
 E9 
 ij> -- PASS:0009 If EMPNUM = 'E9'?
+
           SELECT EMPNUM, HOURS
                FROM WORKS
                WHERE PNUM = 'P9'
@@ -44,18 +53,27 @@
 ----------
 E9 |NULL  
 ij> -- PASS:0009 If EMPNUM = 'E9' and HOURS is NULL?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0009 <<< END TEST
 -- ******************************************************************
+
 -- NO_TEST:0161 FETCH NULL value without indicator, SQLCODE < 0!
+
 -- Testing Indicators
+
 -- **********************************************************
+
 -- NO_TEST:0162 FETCH NULL value with indicator syntax!
+
 -- Testing indicators
+
 -- ****************************************************************
+
 -- NO_TEST:0010 FETCH truncated CHAR column with indicator!
+
 -- Testing indicators
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml005.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml005.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml005.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml005.out Fri Oct 27 13:04:21 2006
@@ -1,7 +1,9 @@
 ij> -- MODULE DML005
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml005.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -11,19 +13,24 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0011 FIPS sizing - DECIMAL (15)!
 -- FIPS sizing TEST
+
 -- setup
 --O     DELETE FROM LONGINT;
      DELETE FROM LONGINTTAB;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> -- setup
 --O     INSERT INTO LONGINT
      INSERT INTO LONGINTTAB
             VALUES(123456789012345.);
 1 row inserted/updated/deleted
 ij> -- PASS:0011 If 1 row is inserted?
+
      SELECT LONG_INT, LONG_INT /1000000, LONG_INT - 123456789000000.
 --O          FROM LONGINT;
           FROM LONGINTTAB;
@@ -32,7 +39,8 @@
 123456789012345 |123456789.0123450000000000        |12345            
 ij> -- PASS:0011 If values are (123456789012345, 123456789, 12345), but?
 -- PASS:0011 Second value may be between 123456788 and 123456790?
+
 -- END TEST >>> 0011 <<< END TEST
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml008.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml008.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml008.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml008.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML008
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml008.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU 
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,7 +14,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0016 SELECT ALL syntax!
      SELECT ALL EMPNUM
           FROM WORKS
@@ -22,8 +26,10 @@
 E1 
 E1 
 ij> -- PASS:0016 If 2 rows are selected and both EMPNUMs are 'E1'?
+
 -- END TEST >>> 0016 <<< END TEST
 -- *************************************************************
+
 -- TEST:0164 SELECT:default is ALL, not DISTINCT!
      SELECT EMPNUM
           FROM WORKS
@@ -33,8 +39,10 @@
 E1 
 E1 
 ij> -- PASS:0164 If 2 rows are selected and both EMPNUMs are 'E1'?
+
 -- END TEST >>> 0164 <<< END TEST
 -- ************************************************************
+
 -- TEST:0017 SELECT:checks DISTINCT!
      SELECT DISTINCT EMPNUM
           FROM WORKS
@@ -43,8 +51,10 @@
 ---
 E1 
 ij> -- PASS:0017 If 1 row is selected and EMPNUM = 'E1'?
+
 -- END TEST >>> 0017 <<< END TEST
 -- ***********************************************************
+
 -- TEST:0018 SQLCODE = 100, SELECT with no data!
      SELECT EMPNUM,PNUM
           FROM WORKS
@@ -52,8 +62,10 @@
 EM&|PN&
 -------
 ij> -- PASS:0018 If 0 rows selected, SQLCODE = 100, end of data?
+
 -- END TEST >>> 0018 <<< END TEST
 -- ***********************************************************
+
 -- TEST:0019 SQLCODE = 0, SELECT with data!
      SELECT EMPNUM,HOURS
           FROM WORKS
@@ -62,14 +74,18 @@
 ----------
 E1 |20    
 ij> -- PASS:0019 If HOURS = 20 ?
+
 -- END TEST >>> 0019 <<< END TEST
 -- **********************************************************
+
 -- TEST:0020 SELECT NULL value !
+
 -- setup
      INSERT INTO WORKS
          VALUES('E18','P18',NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:0020 If 1 row is inserted?
+
       SELECT EMPNUM,HOURS  
            FROM   WORKS
           WHERE  EMPNUM='E18' AND PNUM='P18';
@@ -77,15 +93,21 @@
 ----------
 E18|NULL  
 ij> -- PASS:0020 If EMPNUM = 'E18' and HOURS is NULL?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0020 <<< END TEST
 -- **********************************************************
+
 -- NO_TEST:0021 SELECT CHAR(m) column into shorter var, get indic = m!
+
 -- Testing indicators
+
 -- ***********************************************************
+
 -- NO_TEST:0165 Truncate CHAR column SELECTed into shorter var!
+
 -- Testing host identifiers
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml009.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml009.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml009.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml009.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML009
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml009.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,13 +14,17 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0022 INSERT(column list) VALUES(literals and NULL)!
+
 -- setup
      INSERT INTO WORKS(PNUM,EMPNUM,HOURS)
             VALUES ('P22','E22',NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:0022 If 1 row inserted?
+
       SELECT EMPNUM,PNUM
            FROM   WORKS
            WHERE  HOURS IS NULL;
@@ -26,20 +32,25 @@
 -------
 E22|P22
 ij> -- PASS:0022 If EMPNUM = 'E22'?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0022 <<< END TEST
 -- **************************************************************
+
 -- TEST:0023 DEC precision >= col.def.: ERROR if left-truncate!
+
 -- setup
      DELETE FROM TEMP_S;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> COMMIT WORK;
 ij> -- setup
      INSERT INTO TEMP_S(EMPNUM,GRADE,CITY)
           VALUES('E23',2323.4,'China');
 1 row inserted/updated/deleted
 ij> -- PASS:0023 If 1 row inserted?
+
 --O     SELECT COUNT(*)
      SELECT *
           FROM TEMP_S;
@@ -47,12 +58,14 @@
 --------------------------
 E23 |2323 |China          
 ij> -- PASS:0023 If count = 1?
+
 -- setup
      INSERT INTO TEMP_S
             VALUES('E23',23234,'China');
 ERROR 22003: The resulting value is outside the range for the data type DECIMAL/NUMERIC(4,0).
 ij> -- PASS:0023 If 1 row inserted or ?
 -- PASS:0023 insert fails due to precision of 23234?
+
 --O      SELECT COUNT(*)
       SELECT *
            FROM TEMP_S;
@@ -60,11 +73,14 @@
 --------------------------
 E23 |2323 |China          
 ij> -- PASS:0023 If count = 1 or 2 (depending on previous insertion)?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0023 <<< END TEST
 -- ***************************************************************
+
 -- TEST:0024 INSERT:<query spec.> is empty: SQLCODE = 100!
+
 -- setup
      INSERT INTO TEMP_S
             SELECT EMPNUM,GRADE,CITY
@@ -72,13 +88,16 @@
                  WHERE GRADE > 13;
 0 rows inserted/updated/deleted
 ij> -- PASS:0024 If 0 rows selected, SQLCODE = 100, end of data?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0024 <<< END TEST
 -- *************************************************************
+
 -- TEST:0025 INSERT:<query spec.> is not empty!
      DELETE FROM TEMP_S;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij> -- setup
      INSERT INTO TEMP_S(EMPNUM,GRADE,CITY)
             SELECT EMPNUM,GRADE,CITY
@@ -86,6 +105,7 @@
                  WHERE GRADE > 12;
 2 rows inserted/updated/deleted
 ij> -- PASS:0025 If 2 rows are inserted?
+
 --O      SELECT COUNT(*)
       SELECT *
            FROM TEMP_S;
@@ -94,13 +114,17 @@
 E3  |13   |Vienna         
 E5  |13   |Akron          
 ij> -- PASS:0025 If count = 2?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0025 <<< END TEST
 -- *************************************************************
+
 -- TEST:0026 INSERT into view with check option and unique violation!
+
 --0     SELECT COUNT(*) FROM STAFF;
 -- PASS:0026 If count = 5?
+
 -- setup
 --0     INSERT INTO TEMP_SS
 --0            SELECT EMPNUM,GRADE,CITY
@@ -108,11 +132,14 @@
 --0                 WHERE GRADE = 10;
 -- PASS:0026 If ERROR, view check constraint, 0 rows inserted  OR ?
 -- PASS:0026 If ERROR, unique constraint, 0 rows inserted?
+
 --0     SELECT COUNT(*) FROM STAFF;
 -- PASS:0026 If count = 5?
+
 -- restore
 --0     ROLLBACK WORK;
+
 -- END TEST >>> 0026 <<< END TEST
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml010.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml010.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml010.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml010.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML010
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml010.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,13 +14,17 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0027 INSERT short string in long col -- space padding !
+
 -- setup 
      INSERT INTO TMP (T1, T2, T3) 
             VALUES ( 'xxxx',23,'xxxx');
 1 row inserted/updated/deleted
 ij> -- PASS:0027 If 1 row inserted?
+ 
       SELECT *
            FROM TMP
            WHERE T2 = 23 AND T3 = 'xxxx      ';
@@ -26,16 +32,20 @@
 --------------------------
 xxxx      |23  |xxxx      
 ij> -- PASS:0027 If T1 = 'xxxx      ' ?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0027 <<< END TEST
 -- ************************************************************* 
+
 -- TEST:0028 Insert String that fits Exactly in Column!
+
 -- setup
      INSERT INTO TMP (T1, T2, T3) 
             VALUES ('xxxxxxxxxx', 23,'xxxxxxxxxx');
 1 row inserted/updated/deleted
 ij> -- PASS:0028 If 1 row inserted?
+
       SELECT *
            FROM TMP
            WHERE T2 = 23;
@@ -43,16 +53,20 @@
 --------------------------
 xxxxxxxxxx|23  |xxxxxxxxxx
 ij> -- PASS:0028 If T1 = 'xxxxxxxxxx'?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0028 <<< END TEST
 -- ***********************************************************
+
 -- TEST:0031 INSERT(column list) VALUES(NULL and literals)!
+
 -- setup
      INSERT INTO TMP (T2, T3, T1) 
             VALUES (NULL,'zz','z');
 1 row inserted/updated/deleted
 ij> -- PASS:0031 If 1 row inserted?
+
       SELECT *
            FROM   TMP
            WHERE  T2 IS NULL;
@@ -60,9 +74,11 @@
 --------------------------
 z         |NULL|zz        
 ij> -- PASS:0031 If T1 = 'z         '?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0031 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml011.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml011.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml011.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml011.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML011
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml011.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,27 +14,35 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0033 UPDATE view without <WHERE clause>!
+
 -- setup
 --O     UPDATE TEMP_SS
 --O          SET GRADE = 15;
 -- PASS:0033 If 2 rows are updated ?
+
 --O     SELECT COUNT(*)
 --O          FROM TEMP_SS
 --O          WHERE GRADE = 15;
 -- PASS:0033 If count = 2?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0033 <<< END TEST
 -- ***************************************************************
+
 -- TEST:0034 UPDATE table with SET column in <WHERE clause>!
+
 -- setup
      UPDATE STAFF
           SET GRADE = 2*GRADE
           WHERE GRADE = 13;
 2 rows inserted/updated/deleted
 ij> -- PASS:0034 If 2 rows are updated?
+
      SELECT COUNT(*)
           FROM STAFF
           WHERE GRADE = 26;
@@ -40,11 +50,14 @@
 -----------
 2          
 ij> -- PASS:0034 If count = 2?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0034 <<< END TEST
 -- ***********************************************************
+
 -- TEST:0035 UPDATE with correlated subquery in <WHERE clause>!
+
 -- setup
      UPDATE STAFF
           SET GRADE=10*STAFF.GRADE
@@ -54,6 +67,7 @@
                       WHERE STAFF.EMPNUM = WORKS.EMPNUM);
 1 row inserted/updated/deleted
 ij> -- PASS:0035 If 1 row is updated?
+
      SELECT COUNT(*)
           FROM   STAFF
           WHERE  GRADE=130;
@@ -61,27 +75,34 @@
 -----------
 1          
 ij> -- PASS:0035 If count = 1?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0035 <<< END TEST
 -- ***************************************************************
+
 -- TEST:0036 UPDATE view globally with check option violation!
+
      SELECT COUNT(*) FROM STAFF WHERE GRADE = 11;
 1          
 -----------
 0          
 ij> -- PASS:0036 If count = 0?
+
 --O     UPDATE TEMP_SS
 --O          SET GRADE = 11;
 -- PASS:0036 If ERROR, view check constraint, 0 rows updated?
+
      SELECT COUNT(*) FROM STAFF WHERE GRADE = 11;
 1          
 -----------
 0          
 ij> -- PASS:0036 If count = 0?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0036 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml012.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml012.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml012.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml012.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML012
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml012.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,7 +14,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0037 DELETE without WHERE clause!
      SELECT COUNT(*)
           FROM STAFF;
@@ -20,15 +24,18 @@
 -----------
 5          
 ij> -- PASS:0037 If count = 5?
+
       DELETE FROM STAFF;
 5 rows inserted/updated/deleted
 ij> -- PASS:0037 If 5 rows deleted?
+
       SELECT COUNT(*)
            FROM STAFF;
 1          
 -----------
 0          
 ij> -- PASS:0037 If count = 0?
+
 -- restore
      ROLLBACK WORK;
 ij> -- Testing Rollback
@@ -38,8 +45,10 @@
 -----------
 5          
 ij> -- PASS:0037 If count = 5?
+
 -- END TEST >>> 0037 <<< END TEST
 -- **************************************************************
+
 -- TEST:0038 DELETE with correlated subquery in WHERE clause!
      SELECT COUNT(*)
           FROM WORKS;
@@ -47,6 +56,7 @@
 -----------
 12         
 ij> -- PASS:0038 If count = 12?
+
      DELETE FROM WORKS
            WHERE WORKS.PNUM IN
                  (SELECT PROJ.PNUM
@@ -55,12 +65,14 @@
                        AND PROJ.CITY='Tampa');
 1 row inserted/updated/deleted
 ij> -- PASS:0038 If 1 row deleted?
+
       SELECT COUNT(*)
            FROM WORKS;
 1          
 -----------
 11         
 ij> -- PASS:0038 If count = 11?
+
 -- restore
       ROLLBACK WORK;
 ij> -- Testing Rollback
@@ -70,7 +82,8 @@
 -----------
 12         
 ij> -- PASS:0038 If count = 12?
+
 -- END TEST >>> 0038 <<< END TEST
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file



Mime
View raw message