You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/10/27 22:04:30 UTC

svn commit: r468514 [4/7] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ tests/lang/ tests/nist/

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml079.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml079.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml079.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml079.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML079
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml079.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,24 +14,32 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
+
 -- TEST:0451 UNIQUEness is case sensitive!
+
          UPDATE STAFF SET EMPNUM = 'e2'
            WHERE EMPNUM = 'E4';
 1 row inserted/updated/deleted
 ij> -- PASS:0451 If 1 row updated?  
+
          INSERT INTO STAFF(EMPNUM)
            VALUES ('E1');
-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 'STAFF'.
+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 'STAFF_UNIQUE' defined on 'STAFF'.
 ij> -- PASS:0451 If ERROR, unique constraint, 0 rows inserted?
+ 
          INSERT INTO STAFF(EMPNUM)
            VALUES ('e1');
 1 row inserted/updated/deleted
 ij> -- PASS:0451 If 1 row inserted?
+
          UPDATE STAFF
            SET EMPNUM = 'E1' WHERE EMPNUM = 'e1';
-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 'STAFF'.
+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 'STAFF_UNIQUE' defined on 'STAFF'.
 ij> -- PASS:0451 If ERROR, unique constraint, 0 rows updated?
+
          SELECT * FROM STAFF;
 EM&|EMPNAME             |GRADE|CITY           
 ----------------------------------------------
@@ -41,42 +51,51 @@
 e1 |NULL                |NULL |NULL           
 ij> -- PASS:0451 If 6 rows are selected?
 -- PASS:0451 If EMPNUMs are 'e1','e2','E1','E2','E3','E5'?
+      
          INSERT INTO WORKS (EMPNUM,PNUM)
            VALUES ('e1','p2');
 1 row inserted/updated/deleted
 ij> -- PASS:0451 If 1 row inserted?
+   
          INSERT INTO WORKS (EMPNUM,PNUM)
            VALUES ('E1','p2');
 1 row inserted/updated/deleted
 ij> -- PASS:0451 If 1 row inserted?
+  
          INSERT INTO WORKS (EMPNUM,PNUM) 
            VALUES ('E1','P2');
 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 'WORKSC1' defined on 'WORKS'.
 ij> -- PASS:0451 If ERROR, unique constraint, 0 rows inserted?
+     
          INSERT INTO WORKS (EMPNUM,PNUM)
            VALUES ('e1', 'P2');
 1 row inserted/updated/deleted
 ij> -- PASS:0451 If 1 row inserted?
+     
          UPDATE WORKS
            SET EMPNUM = 'E1'
            WHERE PNUM = 'P5' AND EMPNUM = 'E4';
 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 'WORKSC1' defined on 'WORKS'.
 ij> -- PASS:0451 If ERROR, unique constraint, 0 rows updated?
+
          UPDATE WORKS
            SET EMPNUM = 'e1'
            WHERE PNUM = 'P5' AND EMPNUM = 'E4';
 1 row inserted/updated/deleted
 ij> -- PASS:0451 If 1 row updated?
+
          UPDATE WORKS
            SET PNUM = 'P4'
            WHERE PNUM = 'P2' AND EMPNUM = 'E4';
 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 'WORKSC1' defined on 'WORKS'.
 ij> -- PASS:0451 If ERROR, unique constraint, 0 rows updated?
+
          UPDATE WORKS
            SET PNUM = 'p4'
            WHERE PNUM = 'P2' AND EMPNUM = 'E4';
 1 row inserted/updated/deleted
 ij> -- PASS:0451 If 1 row updated?
+
           SELECT * FROM WORKS
              ORDER BY EMPNUM, PNUM;
 EM&|PN&|HOURS 
@@ -100,10 +119,13 @@
 -- PASS:0451 If EMPNUM/PNUM values include ?
 -- PASS:0451    e1/p2, E1/p2, e1/P2, e1/P5, E4/p4 ? 
 -- PASS:0451 If no EMPNUM/PNUM values are duplicates ?
+
          ROLLBACK WORK;
 ij> -- END TEST >>> 0451 <<< END TEST
 -- *********************************************
+
 -- TEST:0452 Order of precedence, left-to-right in UNION [ALL]!
+
       SELECT EMPNAME FROM STAFF
              UNION
       SELECT EMPNAME FROM STAFF
@@ -122,6 +144,7 @@
 Don                 
 Ed                  
 ij> -- PASS:0452 If 10 rows selected?
+
       SELECT EMPNAME FROM STAFF
              UNION ALL
       SELECT EMPNAME FROM STAFF
@@ -135,9 +158,12 @@
 Don                 
 Ed                  
 ij> -- PASS:0452 If 5 rows selected? 
+
 -- END TEST >>> 0452 <<< END TEST
 -- *********************************************
+
 -- TEST:0453 NULL with empty subquery of ALL, SOME, ANY!
+
    UPDATE PROJ
        SET CITY = NULL WHERE PNAME = 'IRM';
 1 row inserted/updated/deleted
@@ -149,6 +175,7 @@
 ---------------
 NULL           
 ij> -- PASS:0453 If count = 1?
+
 --O   SELECT COUNT(*)
    SELECT CITY 
        FROM PROJ
@@ -164,6 +191,7 @@
 NULL           
 Deale          
 ij> -- PASS:0453 If count = 6?
+
 --O   SELECT COUNT(*)
    SELECT CITY 
        FROM PROJ
@@ -179,6 +207,7 @@
 NULL           
 Deale          
 ij> -- PASS:0453 If count = 6?
+
 --O   SELECT COUNT(*)
    SELECT CITY 
        FROM PROJ
@@ -188,6 +217,7 @@
 CITY           
 ---------------
 ij> -- PASS:0453 If count = 0?
+
 --O   SELECT COUNT(*)
    SELECT CITY 
        FROM PROJ
@@ -197,6 +227,7 @@
 CITY           
 ---------------
 ij> -- PASS:0453 If count = 0?
+
 --O   SELECT COUNT(*)
    SELECT CITY 
        FROM PROJ
@@ -206,6 +237,7 @@
 CITY           
 ---------------
 ij> -- PASS:0453 If count = 0?
+
 --O   SELECT COUNT(*)
    SELECT CITY 
        FROM PROJ
@@ -215,8 +247,10 @@
 CITY           
 ---------------
 ij> -- PASS:0453 If count = 0?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0453 <<< 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/dml080.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml080.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml080.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml080.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML080  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml080.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SCHANZLE
    create schema SHANZLE;
 0 rows inserted/updated/deleted
@@ -14,7 +16,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SCHANZLE                                                                                                                        
 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 ***************************
@@ -26,50 +30,70 @@
 -- 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:0462 SQLCODE 100: DELETE with no data!
+
    DELETE FROM HU.STAFF 
          WHERE EMPNUM = 'E7';
 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> -- PASS:0462 If SQLCODE = 100 or no data, 0 rows deleted?
+
    DELETE FROM HU.STAFF;
 5 rows inserted/updated/deleted
 ij> -- PASS:0462 If 5 rows deleted?
+
    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> -- PASS:0462 If SQLCODE = 100 or no data, 0 rows deleted?
+
    DELETE FROM HU.STAFF
          WHERE EMPNUM = 'E1';
 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> -- PASS:0462 If SQLCODE = 100 or no data, 0 rows deleted?
+
 -- restore 
    ROLLBACK WORK;
 ij> -- END TEST >>> 0462 <<< END TEST
 -- *********************************************
+
 -- TEST:0463 SQLCODE 100: UPDATE with no data!
+
    UPDATE HU.STAFF
          SET CITY = 'NOWHERE'
          WHERE EMPNAME = 'NOBODY';
 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> -- PASS:0463 If SQLCODE = 100 or no data, 0 rows updated? 
+
    UPDATE HU.STAFF
          SET GRADE = 11;
 5 rows inserted/updated/deleted
 ij> -- PASS:0463 If 5 rows updated?
+
    DELETE FROM HU.STAFF;
 5 rows inserted/updated/deleted
 ij> -- PASS:0463 If 5 rows deleted?
+
    UPDATE HU.STAFF
          SET CITY = 'NOWHERE';
 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> -- PASS:0463 If SQLCODE = 100 or no data, 0 rows updated?
+
    UPDATE HU.STAFF
          SET CITY = 'NOWHERE'
          WHERE EMPNAME = 'NOBODY';
 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> -- PASS:0463 If SQLCODE = 100 or no data, 0 rows updated?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0463 <<< 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/dml081.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml081.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml081.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml081.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML081  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml081.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SCHANZLE
    set schema SCHANZLE;
 0 rows inserted/updated/deleted
@@ -12,7 +14,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SCHANZLE                                                                                                                        
 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 ***************************
@@ -24,7 +28,9 @@
 -- 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:0487 SQLSTATE 00000: successful completion!
+
 --O   SELECT COUNT(*) 
    SELECT * 
          FROM HU.WORKS;
@@ -44,9 +50,12 @@
 E4 |P5 |80    
 ij> -- PASS:0487 If count = 12?
 -- PASS:0487 OR SQLSTATE = 00000: successful completion?
+
 -- END TEST >>> 0487 <<< END TEST
 -- *********************************************
+
 -- TEST:0488 SQLSTATE 21000: cardinality violation!
+
 --O   SELECT COUNT(*) 
    SELECT * 
          FROM HU.WORKS
@@ -56,9 +65,12 @@
 ERROR 21000: Scalar subquery is only allowed to return a single row.
 ij> -- PASS:0488 If ERROR, cardinality violation, 0 rows selected? 
 -- PASS:0488 OR SQLSTATE = 21000 OR SQLCODE < 0?            
+ 
 -- END TEST >>> 0488 <<< END TEST
 -- *********************************************
+
 -- TEST:0489 SQLSTATE 02000: no data!
+
    SELECT GRADE
          FROM HU.STAFF 
          WHERE EMPNUM = 'xx';
@@ -66,11 +78,14 @@
 -----
 ij> -- PASS:0489 If 0 rows selected?
 -- PASS:0489 OR SQLSTATE = 02000: no data OR SQLCODE = 100? 
+
    DELETE FROM HU.STAFF
          WHERE GRADE = 11;
 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> -- PASS:0489 If 0 rows deleted?
 -- PASS:0489 OR SQLSTATE = 02000: no data OR SQLCODE = 100?
+
    INSERT INTO HU.STAFF (EMPNUM,GRADE)
          SELECT EMPNUM, 9 
                FROM HU.WORKS
@@ -78,16 +93,21 @@
 0 rows inserted/updated/deleted
 ij> -- PASS:0489 If 0 rows inserted?
 -- PASS:0489 OR SQLSTATE = 02000: no data OR SQLCODE = 100?
+
    UPDATE HU.STAFF SET CITY = 'Ho'
          WHERE GRADE = 15;
 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> -- PASS:0489 If 0 rows updated?
 -- PASS:0489 OR SQLSTATE = 02000: no data OR SQLCODE = 100?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0489 <<< END TEST
 -- *********************************************
+
 -- TEST:0490 SQLSTATE 22012: data exception/division by zero!
+
 -- setup
    INSERT INTO HU.STAFF
          VALUES ('E6','Fidel',0,'Havana');
@@ -101,6 +121,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- PASS:0490 If ERROR, data exception/division by zero, 0 rows selected?
 -- PASS:0490 OR SQLSTATE = 22012 OR SQLCODE < 0?
+
    SELECT 16/GRADE 
          FROM HU.STAFF
          WHERE EMPNAME = 'Fidel';
@@ -109,12 +130,14 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- PASS:0490 If ERROR, data exception/division by zero, 0 rows selected?
 -- PASS:0490 OR SQLSTATE = 22012 OR SQLCODE < 0?
+
    SELECT COUNT(*) 
          FROM HU.STAFF
          GROUP BY CITY HAVING SUM(GRADE/0) > 44;
 ERROR 22012: Attempt to divide by zero.
 ij> -- PASS:0490 If ERROR, data exception/division by zero, 0 rows selected?
 -- PASS:0490 OR SQLSTATE = 22012 OR SQLCODE < 0?
+
 --O   SELECT COUNT(*) 
    SELECT * 
          FROM HU.STAFF WHERE GRADE = 
@@ -124,12 +147,14 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- PASS:0490 If ERROR, data exception/division by zero, 0 rows selected?
 -- PASS:0490 OR SQLSTATE = 22012 OR SQLCODE < 0?
+
    UPDATE HU.STAFF 
          SET GRADE = GRADE/0 
          WHERE GRADE = 12;
 ERROR 22012: Attempt to divide by zero.
 ij> -- PASS:0490 If ERROR, data exception/division by zero, 0 rows updated?
 -- PASS:0490 OR SQLSTATE = 22012 OR SQLCODE < 0?
+
    INSERT INTO HU.STAFF 
          SELECT 'X','Y',HOURS/0,'z' 
                FROM HU.WORKS 
@@ -137,12 +162,16 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- PASS:0490 If ERROR, data exception/division by zero, 0 rows inserted?
 -- PASS:0490 OR SQLSTATE = 22012 OR SQLCODE < 0?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0490 <<< END TEST
 -- *********************************************
+
 -- NO_TEST:0502 SQLSTATE 24000: invalid cursor state!
+
 -- Testing cursors
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml082.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml082.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml082.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml082.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML082  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml082.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SCHANZLE
    set schema SCHANZLE;
 0 rows inserted/updated/deleted
@@ -12,7 +14,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SCHANZLE                                                                                                                        
 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 ***************************
@@ -24,141 +28,178 @@
 -- 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."
+ 
 -- NO_TEST:0491 SQLSTATE 22022: data exception/indicator overflow!
+
 -- Testing indicators 
+
 -- *********************************************
+
 -- TEST:0492 SQLSTATE 22019: data exception/invalid escape char!
+
 -- setup
 --O   UPDATE HU.STAFF 
 --O         SET CITY = 'Percent%Xunder_'
 --O         WHERE EMPNUM = 'E1';
+
 --O   SELECT COUNT(*) 
 --O         FROM HU.STAFF 
 --O         WHERE CITY LIKE '%XX%X_%' ESCAPE 'XX';
 -- PASS:0492 If ERROR, data exception/invalid escape char?
 -- PASS:0492 0 rows selected OR SQLSTATE = 22019 OR SQLCODE < 0?
+
 --O   SELECT COUNT(*)
 --O         FROM HU.STAFF
 --O         WHERE CITY LIKE '%XX%X_%' ESCAPE 'X';
 -- PASS:0492 If count = 1?
+
 --O   SELECT COUNT(*)
 --O         FROM HU.STAFF
 --O         WHERE CITY LIKE '%XX_%' ESCAPE 'XX';
 -- PASS:0492 If ERROR, data exception/invalid escape char?
 -- PASS:0492 0 rows selected OR SQLSTATE = 22019 OR SQLCODE < 0?
+
 --O   SELECT COUNT(*) 
 --O         FROM HU.STAFF WHERE CITY
 --O         LIKE '%XX_%' ESCAPE 'X';
 -- PASS:0492 If count = 1?
+
 -- restore
 --O   ROLLBACK WORK;
+
 -- END TEST >>> 0492 <<< END TEST
 -- *********************************************
+
 -- TEST:0493 SQLSTATE 22025: data exception/invalid escape seq.!
+
 -- setup
 --O   DELETE FROM CPBASE;
 --O   INSERT INTO CPBASE 
 --O         VALUES(82,'Per%X&und_');
+
 --O   SELECT COUNT(*) 
 --O         FROM CPBASE WHERE JUNK1
 --O         LIKE 'P%X%%X' ESCAPE 'X';
 -- PASS:0493 If ERROR, data exception/invalid escape seq.?
 -- PASS:0493 0 rows selected OR SQLSTATE = 22025 OR SQLCODE < 0?
+
 --O   SELECT COUNT(*) 
 --O         FROM CPBASE WHERE JUNK1
 --O         LIKE 'P%X%%' ESCAPE 'X';
 -- PASS:0493 If count = 1?
+
 --O   INSERT INTO HU.STAFF 
 --O         SELECT 'E12','ff',KC,'gg' 
 --O               FROM CPBASE
 --O               WHERE JUNK1 LIKE '%X%%Xd_' ESCAPE 'X';
 -- PASS:0493 If ERROR, data exception/invalid escape seq.?
 -- PASS:0493 0 rows inserted OR SQLSTATE = 22025 OR SQLCODE < 0?
+
 --O   INSERT INTO HU.STAFF 
 --O         SELECT 'E13','ff',KC,'gg' 
 --O               FROM CPBASE
 --O               WHERE JUNK1 LIKE '%X%%X_' ESCAPE 'X';
 -- PASS:0493 If 1 row is inserted?
+
 --O   UPDATE CPBASE
 --O         SET KC = -1
 --O         WHERE JUNK1 LIKE '%?X%' ESCAPE '?';
 -- PASS:0493 If ERROR, data exception/invalid escape seq.?
 -- PASS:0493 0 rows updated OR SQLSTATE = 22025 OR SQLCODE < 0?
+
 --O   UPDATE CPBASE 
 --O         SET KC = -1
 --O         WHERE JUNK1 LIKE '%?%X%' ESCAPE '?';
 -- PASS:0493 If 1 row is updated?
+
 --O   DELETE FROM CPBASE
 --O         WHERE JUNK1 LIKE '_e%&u%' ESCAPE '&';
 -- PASS:0493 If ERROR, data exception/invalid escape seq.?
 -- PASS:0493 0 rows deleted OR SQLSTATE = 22025 OR SQLCODE < 0?
+
 --O   DELETE FROM CPBASE
 --O         WHERE JUNK1 LIKE '_e%&&u%' ESCAPE '&';
 -- PASS:0493 If 1 row is deleted?
+
 -- restore
 --O   ROLLBACK WORK;
+
 -- END TEST >>> 0493 <<< END TEST
 -- *********************************************
+
 -- TEST:0494 SQLSTATE 22003: data exception/numeric value out of range!
+
 -- setup
    DELETE FROM HU.HH;
 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.HH 
          VALUES (10);
 1 row inserted/updated/deleted
 ij> -- PASS:0494 If 1 row is inserted? 
 -- PASS:0494 OR ERROR, data exception/numeric value out of range?
 -- PASS:0494 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0?
+
    INSERT INTO HU.HH 
          VALUES (100);
 1 row inserted/updated/deleted
 ij> -- PASS:0494 If 1 row is inserted?
 -- PASS:0494 OR ERROR, data exception/numeric value out of range?
 -- PASS:0494 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0?
+
    INSERT INTO HU.HH 
          VALUES (1000);
 1 row inserted/updated/deleted
 ij> -- PASS:0494 If 1 row is inserted?
 -- PASS:0494 OR ERROR, data exception/numeric value out of range?
 -- PASS:0494 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0?
+
    INSERT INTO HU.HH 
          VALUES (10000);
 1 row inserted/updated/deleted
 ij> -- PASS:0494 If 1 row is inserted?
 -- PASS:0494 OR ERROR, data exception/numeric value out of range?
 -- PASS:0494 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0?
+
    INSERT INTO HU.HH
          VALUES (100000);
 ERROR 22003: The resulting value is outside the range for the data type SMALLINT.
 ij> -- PASS:0494 If 1 row is inserted?
 -- PASS:0494 OR ERROR, data exception/numeric value out of range?
 -- PASS:0494 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0?
+    
    INSERT INTO HU.HH
          VALUES (1000000);
 ERROR 22003: The resulting value is outside the range for the data type SMALLINT.
 ij> -- PASS:0494 If 1 row is inserted?
 -- PASS:0494 OR ERROR, data exception/numeric value out of range?
 -- PASS:0494 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0?
+    
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0494 <<< END TEST
 -- *********************************************
+
 -- TEST:0505 SQLSTATE 44000: with check option violation!
+
 --O   INSERT INTO FLATER.WCOV 
 --O         VALUES (0);
 -- PASS:0505 If ERROR, with check option violation?
 -- PASS:0505 0 rows inserted OR SQLSTATE = 44000 OR SQLCODE < 0?
+
 --O   INSERT INTO FLATER.WCOV
 --O         VALUES (75);
 -- PASS:0505 If 1 row is inserted?
+
 --O   UPDATE FLATER.WCOV
 --O         SET C1 = -C1 
 --O         WHERE C1 = 75;
 -- PASS:0505 If ERROR, with check option violation?
 -- PASS:0505 0 rows updated OR SQLSTATE = 44000 OR SQLCODE < 0?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0505 <<< 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/dml083.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML083
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml083.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SCHANZLE
    set schema SCHANZLE;
 0 rows inserted/updated/deleted
@@ -12,7 +14,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SCHANZLE                                                                                                                        
 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 ***************************
@@ -24,20 +28,27 @@
 -- 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."
+
 -- NO_TEST:0496 SQLSTATE 22002: data exception/null, value, no indic.!
+
 -- Testing indicators
+
 -- *********************************************
+
 -- TEST:0498 SQLSTATE 22001: data exception/string right trunc.!
+
    INSERT INTO HU.STAFF 
          VALUES ('E6','Earl Brown',11,'Claggetsville Maryland');
 ERROR 22001: A truncation error was encountered trying to shrink CHAR 'Claggetsville Maryland' to length 15.
 ij> -- PASS:0498 If ERROR, data exception/string right trunc.?
 -- PASS:0498 If 0 rows inserted OR SQLSTATE = 22001 OR SQLCODE < 0?
+
    INSERT INTO HU.STAFF 
          VALUES ('E7','Ella Brown',12,'Claggetsville Maryland');
 ERROR 22001: A truncation error was encountered trying to shrink CHAR 'Claggetsville Maryland' to length 15.
 ij> -- PASS:0498 If ERROR, data exception/string right trunc.?
 -- PASS:0498 If 0 rows inserted OR SQLSTATE = 22001 OR SQLCODE < 0?
+
 --O   SELECT COUNT(*)
    SELECT *
          FROM HU.STAFF;
@@ -49,14 +60,18 @@
 E4 |Don                 |12   |Deale          
 E5 |Ed                  |13   |Akron          
 ij> -- PASS:0498 If count = 5?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0498 <<< END TEST
 -- *********************************************
+
 -- TEST:0500 SQLSTATE 01003: warning/null value elim. in set function!
+
 -- setup
    DELETE FROM HU.HH;
 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.HH 
          VALUES (3);
 1 row inserted/updated/deleted
@@ -71,6 +86,7 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:0500 If WARNING, null value eliminated in set function?
 -- PASS:0500 OR SQLSTATE = 01003?
+
 -- setup
    UPDATE HU.STAFF 
          SET GRADE = NULL
@@ -85,6 +101,7 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:0500 If WARNING, null value eliminated in set function?
 -- PASS:0500 OR SQLSTATE = 01003?
+
    SELECT SUM(DISTINCT GRADE)
          FROM HU.STAFF;
 1        
@@ -93,12 +110,14 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:0500 If WARNING, null value eliminated in set function?
 -- PASS:0500 OR SQLSTATE = 01003?
+
    INSERT INTO HU.HH 
          SELECT MAX(GRADE) 
                FROM HU.STAFF;
 1 row inserted/updated/deleted
 ij> -- PASS:0500 If WARNING, null value eliminated in set function?
 -- PASS:0500 OR SQLSTATE = 01003?
+
    DELETE FROM HU.HH 
          WHERE SMALLTEST < (SELECT MIN(GRADE)
                                   FROM HU.STAFF
@@ -106,6 +125,7 @@
 1 row inserted/updated/deleted
 ij> -- PASS:0500 If WARNING, null value eliminated in set function?
 -- PASS:0500 OR SQLSTATE = 01003?
+
    SELECT CITY, COUNT(DISTINCT GRADE) 
          FROM HU.STAFF
          GROUP BY CITY
@@ -122,12 +142,16 @@
 -- PASS:0500   'Deale'           1?
 -- PASS:0500   'Akron'           0?
 -- PASS:0500 OR SQLSTATE = 01003?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0500 <<< END TEST
 -- *********************************************
+
 -- NO_TEST:0501 SQLSTATE 01004: warning/string right truncation!
+
 -- Testing host variables
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml085.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml085.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml085.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml085.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML085  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml085.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SCHANZLE
    set schema SCHANZLE;
 0 rows inserted/updated/deleted
@@ -13,13 +15,16 @@
 SCHANZLE                                                                                                                        
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
 -- date_time print
+
 -- TEST:0508 Delimited identifers!
+
    SELECT COUNT(DISTINCT "sullivan.select")     
      FROM "FLATER"."SULLIVAN.SELECT";
 1          
 -----------
 2          
 ij> -- PASS:0508 If count = 2?
+
    SELECT "A<a"."sullivan.select"    
      FROM "FLATER"."SULLIVAN.SELECT" "A<a";
 sullivan.s&
@@ -30,6 +35,7 @@
 1          
 ij> -- PASS:0508 If 4 rows selected?
 -- PASS:0508 If for each row, "sullivan.select" = 0 OR 1 ?
+
    SELECT "A < a".CITY
      FROM HU.STAFF "A < a"
      WHERE EMPNUM = 'E5';
@@ -37,6 +43,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "0".CITY
      FROM HU.STAFF "0"
      WHERE EMPNUM = 'E5';
@@ -44,6 +51,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT """".CITY
      FROM HU.STAFF  """"
      WHERE EMPNUM = 'E5';
@@ -51,6 +59,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "%".CITY
      FROM HU.STAFF  "%"
      WHERE EMPNUM = 'E5';
@@ -58,6 +67,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "&".CITY
      FROM HU.STAFF  "&"
      WHERE EMPNUM = 'E5';
@@ -65,6 +75,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "'".CITY
      FROM HU.STAFF  "'"
      WHERE EMPNUM = 'E5';
@@ -72,6 +83,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "(".CITY
      FROM HU.STAFF  "("
      WHERE EMPNUM = 'E5';
@@ -79,6 +91,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT ")".CITY
      FROM HU.STAFF  ")"
      WHERE EMPNUM = 'E5';
@@ -86,6 +99,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "*".CITY
      FROM HU.STAFF  "*"
      WHERE EMPNUM = 'E5';
@@ -93,6 +107,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "+".CITY
      FROM HU.STAFF  "+"
      WHERE EMPNUM = 'E5';
@@ -100,6 +115,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT ",".CITY
      FROM HU.STAFF  ","
      WHERE EMPNUM = 'E5';
@@ -107,6 +123,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "-".CITY
      FROM HU.STAFF  "-"
      WHERE EMPNUM = 'E5';
@@ -114,6 +131,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT ".".CITY
      FROM HU.STAFF  "."
      WHERE EMPNUM = 'E5';
@@ -121,6 +139,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "/".CITY
      FROM HU.STAFF  "/"
      WHERE EMPNUM = 'E5';
@@ -128,6 +147,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT ":".CITY
      FROM HU.STAFF  ":"
      WHERE EMPNUM = 'E5';
@@ -135,6 +155,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT ";".CITY
      FROM HU.STAFF  ";"
      WHERE EMPNUM = 'E5';
@@ -142,6 +163,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "<".CITY
      FROM HU.STAFF  "<"
      WHERE EMPNUM = 'E5';
@@ -149,6 +171,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "=".CITY
      FROM HU.STAFF  "="
      WHERE EMPNUM = 'E5';
@@ -156,6 +179,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT ">".CITY
      FROM HU.STAFF  ">"
      WHERE EMPNUM = 'E5';
@@ -163,6 +187,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "?".CITY
      FROM HU.STAFF  "?"
      WHERE EMPNUM = 'E5';
@@ -170,6 +195,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "_".CITY
      FROM HU.STAFF  "_"
      WHERE EMPNUM = 'E5';
@@ -177,6 +203,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "|".CITY
      FROM HU.STAFF  "|"
      WHERE EMPNUM = 'E5';
@@ -184,6 +211,7 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    SELECT "|_?=;:/. -,+*)'&""%".CITY
      FROM HU.STAFF  "|_?=;:/. -,+*)'&""%"
      WHERE EMPNUM = 'E5';
@@ -191,10 +219,13 @@
 ---------------
 Akron          
 ij> -- PASS:0508 If 1 row selected and CITY = 'Akron'?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0508 <<< END TEST
 -- *********************************************
+
 -- TEST:0509 Renaming columns with AS for ORDER BY!
+
 --O   SELECT GRADE AS PROVOLONE, EMPNAME AS EDAM    
    SELECT GRADE  PROVOLONE, EMPNAME  EDAM    
          FROM HU.STAFF    
@@ -213,14 +244,20 @@
 -- PASS:0509         12         'Alice'   ?
 -- PASS:0509         13         'Ed'      ?
 -- PASS:0509         13         'Carmen'  ?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0509 <<< END TEST
 -- *********************************************
+
 -- NO_TEST:0510 <parameter name> = <column name> (OK with SQL-92)!
+
 -- Testing embedded variables
+
 -- *********************************************
+
 -- TEST:0554 More column renaming!
+
    SELECT HU.PROJ.CITY AS PCITY, HU.STAFF.CITY SCITY,
          BUDGET + GRADE * HOURS * 100  REAL_BUDGET    
          FROM HU.STAFF, HU.PROJ, HU.WORKS       
@@ -233,9 +270,10 @@
 Tampa          |Deale          |126000               
 ij> -- PASS:0554 If PCITY = 'Tampa' AND SCITY = 'Deale'?
 -- PASS:0554 AND REAL_BUDGET = 126000?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0554 <<< 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/dml087.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml087.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml087.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml087.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML087  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml087.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -12,14 +14,18 @@
 --------------------------------------------------------------------------------------------------------------------------------
 FLATER                                                                                                                          
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0518 CREATE VIEW with DISTINCT!
+
    SELECT COUNT(*)
          FROM DV1;
 1          
 -----------
 4          
 ij> -- PASS:0518 If count = 4?
+
    SELECT HOURS FROM DV1
          ORDER BY HOURS DESC;
 HOURS 
@@ -31,11 +37,14 @@
 ij> -- PASS:0518 If 4 rows selected AND first HOURS = 80?
 -- PASS:0518 AND second HOURS = 40 AND third HOURS = 20?
 -- PASS:0518 AND fourth HOURS = 12? 
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0518 <<< END TEST;
 -- *********************************************;
+
 -- TEST:0519 CREATE VIEW with subqueries!
+
    SELECT COUNT(*)
          FROM VS2
          WHERE C1 = 0;
@@ -43,6 +52,7 @@
 -----------
 2          
 ij> -- PASS:0519 If count = 2?
+
    SELECT COUNT(*)
          FROM VS2
          WHERE C1 = 1;
@@ -50,35 +60,42 @@
 -----------
 2          
 ij> -- PASS:0519 If count = 2?
+
    SELECT COUNT(*)
          FROM VS3;
 1          
 -----------
 0          
 ij> -- PASS:0519 If count = 0?
+
    SELECT COUNT(*) 
          FROM VS4;
 1          
 -----------
 0          
 ij> -- PASS:0519 If count = 0?
+
    SELECT COUNT(*) 
          FROM VS5;
 1          
 -----------
 2          
 ij> -- PASS:0519 If count = 2?
+
    SELECT COUNT(*)
          FROM VS6;
 1          
 -----------
 2          
 ij> -- PASS:0519 If count = 2?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0519 <<< END TEST;
 -- *********************************************;
+
 -- TEST:0520 Underscores are legal an significant!
+
    SELECT COUNT(*)
          FROM USIG 
          WHERE C1 = 0;
@@ -86,6 +103,7 @@
 -----------
 1          
 ij> -- PASS:0520 If count = 1?
+
    SELECT COUNT(*)
          FROM USIG
          WHERE C1 = 2;
@@ -93,6 +111,7 @@
 -----------
 0          
 ij> -- PASS:0520 If count = 0?
+
    SELECT COUNT(*) 
          FROM USIG
          WHERE C_1 = 0;
@@ -100,6 +119,7 @@
 -----------
 0          
 ij> -- PASS:0520 If count = 0?
+
    SELECT COUNT(*) 
          FROM USIG
          WHERE C_1 = 2;
@@ -107,6 +127,7 @@
 -----------
 1          
 ij> -- PASS:0520 If count = 1?
+
    SELECT COUNT(*)
          FROM USIG
          WHERE C1 = 4;
@@ -114,6 +135,7 @@
 -----------
 0          
 ij> -- PASS:0520 If count = 0?
+
    SELECT COUNT(*) 
          FROM U_SIG
          WHERE C1 = 0;
@@ -121,6 +143,7 @@
 -----------
 0          
 ij> -- PASS:0520 If count = 0?
+
    SELECT COUNT(*) 
          FROM U_SIG 
          WHERE C1 = 4;
@@ -128,6 +151,7 @@
 -----------
 1          
 ij> -- PASS:0520 If count = 1?
+
    SELECT COUNT(*) 
          FROM HU.STAFF U_CN
          WHERE U_CN.GRADE IN
@@ -138,6 +162,7 @@
 -----------
 4          
 ij> -- PASS:0520 If count = 4?
+
    SELECT COUNT(*) 
          FROM HU.STAFF 
          WHERE GRADE > 10;
@@ -145,6 +170,7 @@
 -----------
 4          
 ij> -- PASS:0520 If count = 4?
+
    SELECT COUNT(*) 
          FROM HU.STAFF 
          WHERE GRADE < 10;
@@ -152,9 +178,10 @@
 -----------
 0          
 ij> -- PASS:0520 If count = 0?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0520 <<< 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/dml090.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml090.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml090.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml090.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE DML090  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml090.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,8 +14,11 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0512 <value expression> for IN predicate!
+
    SELECT MIN(PNAME) 
          FROM PROJ, WORKS, STAFF
          WHERE PROJ.PNUM = WORKS.PNUM
@@ -24,6 +29,7 @@
 --------------------
 CALM                
 ij> -- PASS:0512 If PNAME = 'CALM'?
+
    SELECT CITY, COUNT(*)
          FROM PROJ
          GROUP BY CITY
@@ -36,38 +42,51 @@
 Deale          |3          
 ij> -- PASS:0512 If in first row: CITY = 'Vienna' AND count = 2?
 -- PASS:0512 AND in second row: CITY = 'Deale' AND count = 3?
+     
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0512 <<< END TEST
 -- *********************************************;
+
 -- TEST:0513 NUMERIC(4) implies CHECK BETWEEN -9999 AND 9999!
+
 -- setup
 --0   DELETE FROM TEMP_OBSERV;
+
 --0   INSERT INTO TEMP_OBSERV (YEAR_OBSERV)
 --0         VALUES (9999);
 -- PASS:0513 If 1 row is inserted?
+
 --0   INSERT INTO TEMP_OBSERV (YEAR_OBSERV) 
 --0         VALUES (10000);
 -- PASS:0513 If ERROR, constraint violation, 0 rows inserted?
+
 --0   UPDATE TEMP_OBSERV
 --0          SET YEAR_OBSERV = -10000
 --0          WHERE YEAR_OBSERV = 9999;
 -- PASS:0513 If ERROR, constraint violation, 0 rows updated?
+
 --0   INSERT INTO TEMP_OBSERV (YEAR_OBSERV, MAX_TEMP)
 --0          VALUES (-9999, 123.4517);
 -- PASS:0513 If 1 row is inserted?
+
 --0   SELECT COUNT(*) FROM TEMP_OBSERV
 --0         WHERE MAX_TEMP = 123.45
 --0         AND MAX_TEMP NOT BETWEEN 123.4516 AND 123.4518;
 -- PASS:0513 If count = 1?
+
 --0   INSERT INTO TEMP_OBSERV (YEAR_OBSERV, MAX_TEMP)
 --0          VALUES (-9999, 1234.51);
 -- PASS:0513 If ERROR, constraint violation, 0 rows inserted?
+
 -- restore
 --0   ROLLBACK WORK;
+
 -- END TEST >>> 0513 <<< END TEST
 -- *********************************************;
+
 -- TEST:0523 <value expression> for BETWEEN predicate!
+
    SELECT COUNT(*) 
          FROM PROJ
          WHERE 24 * 1000 BETWEEN BUDGET - 5000 AND 50000 / 1.7;
@@ -75,6 +94,7 @@
 -----------
 3          
 ij> -- PASS:0523 If count = 3?
+
    SELECT PNAME
          FROM PROJ
          WHERE 'Tampa' NOT BETWEEN CITY AND 'Vienna'
@@ -83,6 +103,7 @@
 --------------------
 IRM                 
 ij> -- PASS:0523 If PNAME = 'IRM'?
+
 SELECT CITY, COUNT(*)
       FROM PROJ
       GROUP BY CITY
@@ -91,11 +112,15 @@
 ---------------------------
 Deale          |3          
 ij> -- PASS:0523 If CITY = 'Deale' and count = 3?
+ 
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0523 <<< END TEST
 -- *********************************************;
+
 -- TEST:0564 Outer ref. directly contained in HAVING clause!
+
+   
      SELECT EMPNUM, GRADE*1000
 --0           FROM HU.STAFF WHERE GRADE * 1000 > ANY
 --0              (SELECT SUM(BUDGET) FROM HU.PROJ
@@ -108,9 +133,11 @@
 -------------------
 E3 |13000          
 ij> -- PASS:0564 If EMPNUM = E3 and GRADE * 1000 = 13000?
+
 -- restore
    ROLLBACK WORK;
 ij> -- END TEST >>> 0564 <<< 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/dml091.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml091.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml091.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml091.out Fri Oct 27 13:04:21 2006
@@ -16,9 +16,11 @@
 --
 AUTOCOMMIT OFF;
 ij> -- MODULE DML091  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml091.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION SCHANZLE
    set schema SCHANZLE;
 0 rows inserted/updated/deleted
@@ -28,7 +30,9 @@
 --------------------------------------------------------------------------------------------------------------------------------
 SCHANZLE                                                                                                                        
 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,32 +44,40 @@
 -- 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:0497 SQLSTATE 22003: data exception/numeric val.range 2!
+
 -- setup
    DELETE FROM HU.P1;
 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 FOUR_TYPES;
 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.P1 
          VALUES (100000);
 ERROR 22003: The resulting value is outside the range for the data type DECIMAL/NUMERIC(1,0).
 ij> -- PASS:0497 If 1 row is inserted?
 -- PASS:0497 OR ERROR, data exception/numeric value out of range?
 -- PASS:0497 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0? 
+
    INSERT INTO HU.P1 
          VALUES (-1000000);
 ERROR 22003: The resulting value is outside the range for the data type DECIMAL/NUMERIC(1,0).
 ij> -- PASS:0497 If 1 row is inserted?
 -- PASS:0497 OR ERROR, data exception/numeric value out of range?
 -- PASS:0497 OR 0 rows inserted OR SQLSTATE = 22003 OR SQLCODE < 0?
+
    INSERT INTO HU.P1 
          VALUES (-9);
 1 row inserted/updated/deleted
 ij> -- PASS:0497 If 1 row is inserted?
+
    INSERT INTO HU.P1 
          VALUES (9);
 1 row inserted/updated/deleted
 ij> -- PASS:0497 If 1 row is inserted?
+
    UPDATE HU.P1 
          SET NUMTEST = NUMTEST + 100000
       WHERE NUMTEST = 9;
@@ -73,6 +85,7 @@
 ij> -- PASS:0497 If 1 row is updated?
 -- PASS:0497 OR ERROR, data exception/numeric value out of range?
 -- PASS:0497 OR 0 rows updated OR SQLSTATE = 22003 OR SQLCODE < 0?
+ 
    UPDATE HU.P1 SET NUMTEST =
        ((1 + NUMTEST) * 100000)
      WHERE NUMTEST = 100009
@@ -81,6 +94,7 @@
 ij> -- PASS:0497 If 1 row is updated?
 -- PASS:0497 OR ERROR, data exception/numeric value out of range?
 -- PASS:0497 OR 0 rows updated OR SQLSTATE = 22003 OR SQLCODE < 0?
+
    UPDATE HU.P1
          SET NUMTEST = NUMTEST * 200000
          WHERE NUMTEST = -9;
@@ -88,6 +102,7 @@
 ij> -- PASS:0497 If 1 row is updated?
 -- PASS:0497 OR ERROR, data exception/numeric value out of range?
 -- PASS:0497 OR 0 rows updated OR SQLSTATE = 22003 OR SQLCODE < 0?
+
 -- setup
    INSERT INTO FOUR_TYPES 
          VALUES (1,'X',11112222.00,.000003E-25);
@@ -101,6 +116,8 @@
 ij> -- PASS:0497 If 1 row is selected and T_DECIMAL = 1.1112222E+16 ?
 -- PASS:0497 OR ERROR, data exception/numeric value out of range?
 -- PASS:0497 OR 0 rows selected OR SQLSTATE = 22003 OR SQLCODE < 0?
+
+
 -- NOTE:0497 If the following values are too large (not supported),
 -- NOTE:0497  use TEd to decrease them to maximum allowed.
    INSERT INTO FOUR_TYPES (T_REAL) VALUES (-1.555222E+38);
@@ -140,14 +157,17 @@
 -- NOTE:0497 use TEd to enlarge the above values for T_REAL to the
 -- NOTE:0497 maximum allowed by your implementation.
 -- NOTE:0497 If that is not enough, add more INSERTs.
+ 
    SELECT SUM(T_REAL) FROM FOUR_TYPES;
 1            
 -------------
 ERROR 22003: The resulting value is outside the range for the data type REAL.
 ij> -- PASS:0497 If ERROR, data exception/numeric value out of range?
 -- PASS:0497 OR 0 rows selected OR SQLSTATE = 22003 OR SQLCODE < 0?
+
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 0497 <<< 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/dml099.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml099.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml099.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml099.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML099  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml099.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -14,41 +16,54 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- NO_TEST:0581 Implicit numeric casting (feature 9) dynamic!
+
 -- Testing dynamic SQL
+
 -- *********************************************
+
 -- TEST:0582 Implicit numeric casting (feature 9) static!
+
    CREATE TABLE ICAST2 (C1 INT, C2 DOUBLE PRECISION, C3 NUMERIC(5,3));
 0 rows inserted/updated/deleted
 ij> -- PASS:0582 If table is created?
+
    COMMIT WORK;
 ij> INSERT INTO ICAST2 VALUES (.31416E+1, 3, .3142293E+1);
 1 row inserted/updated/deleted
 ij> -- PASS:0582 If 1 row is inserted?
+
    SELECT C1, C2, C3 FROM ICAST2;
 C1         |C2                    |C3     
 ------------------------------------------
 3          |3.0                   |3.142  
 ij> -- PASS:0582 If 1 row is selected with C1 = 3 and C3 = 3.142?
+
    UPDATE ICAST2 SET C1 = 5.2413E+0, C2 = 5, C3 = 5.2413E+0;
 1 row inserted/updated/deleted
 ij> -- PASS:0582 If 1 row is updated?
+
    SELECT C1, C2, C3 FROM ICAST2;
 C1         |C2                    |C3     
 ------------------------------------------
 5          |5.0                   |5.241  
 ij> -- PASS:0582 If 1 row is selected with C1 = 5 and C3 = 5.241?
+
    UPDATE ICAST2 SET C1 = 6.28E+0, C2 = 2.1E+0, C3 = .07E+2;
 1 row inserted/updated/deleted
 ij> -- PASS:0582 If 1 row is updated?
+
    UPDATE ICAST2 SET C1 = C2, C3 = C3 + C2;
 1 row inserted/updated/deleted
 ij> -- PASS:0582 If 1 row is updated?
+
    SELECT C1, C2, C3 FROM ICAST2;
 C1         |C2                    |C3     
 ------------------------------------------
 2          |2.1                   |9.100  
 ij> -- PASS:0582 If 1 row is selected with C1 = 2 and C3 = 9.100?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE ICAST2 CASCADE;
    DROP TABLE ICAST2 ;
@@ -56,8 +71,11 @@
 ij> COMMIT WORK;
 ij> -- END TEST >>> 0582 <<< END TEST
 -- *********************************************
+
 -- NO_TEST:0583 FIPS sizing, Dynamic SQL character strings!
+
 -- Testing dynamic SQL
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml104.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml104.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml104.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml104.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML104  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml104.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER            
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -14,15 +16,19 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:0591 NATURAL JOIN (feature 4) (static)!
+
    CREATE TABLE GROUPS1
   (EMPNUM INT, GRP INT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0591 If table is created?
+
    CREATE TABLE NAMES1
   (EMPNUM INT, NAME CHAR(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:0591 If table is created?
+
   SELECT * FROM NAMES1 JOIN GROUPS1 ON (NAMES1.EMPNUM=GROUPS1.EMPNUM);
 EMPNUM     |NAME |EMPNUM     |GRP        
 -----------------------------------------
@@ -31,34 +37,44 @@
   SELECT * FROM NAMES1 JOIN GROUPS1 ON (NAMES1.EMPNUM=GROUPS1.EMPNUM);
 0 rows inserted/updated/deleted
 ij> -- PASS:0591 If view is created?
+
    COMMIT WORK;
 ij> INSERT INTO GROUPS1 VALUES (0, 10);
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO GROUPS1 VALUES (1, 20);
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO GROUPS1 VALUES (2, 30);
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO GROUPS1 VALUES (3, 40);
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO NAMES1 VALUES (5, 'HARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO NAMES1 VALUES (1, 'MARY');
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO NAMES1 VALUES (7, 'LARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO NAMES1 VALUES (0, 'KERI');
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    INSERT INTO NAMES1 VALUES (9, 'BARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0591 If 1 row is inserted?
+
    SELECT EMPNUM
   FROM NAMGRP1
   WHERE NAME = 'KERI'
@@ -67,6 +83,7 @@
 -----------
 0          
 ij> -- PASS:0591 If 1 row is selected and EMPNUM = 0?
+
    SELECT EMPNUM
   FROM NAMGRP1
   WHERE NAME = 'MARY'
@@ -75,6 +92,7 @@
 -----------
 1          
 ij> -- PASS:0591 If 1 row is selected and EMPNUM = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP1
   WHERE (NAME <> 'MARY'
@@ -90,6 +108,7 @@
 -----------
 0          
 ij> -- PASS:0591 If count = 0?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE NAMES1 CASCADE;
    DROP VIEW NAMGRP1 ;
@@ -97,59 +116,76 @@
 ij> DROP TABLE NAMES1 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0591 If table and view are dropped?
+
 --O   DROP TABLE GROUPS1 CASCADE;
    DROP TABLE GROUPS1 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0591 If table is dropped?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0591 <<< END TEST
 -- *********************************************
+
 -- TEST:0592 INNER JOIN (feature 4) (static)!
+
    CREATE TABLE GROUPS2
   (EMPNUM SMALLINT, GRP INT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0592 If table is created?
+
    CREATE TABLE NAMES2
   (EMPNUM INT, NAME CHAR(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:0592 If table is created?
+
    CREATE VIEW NAMGRP2 (EMPNUM, NAME, NEMPNUM, GRP) AS
   SELECT * FROM NAMES2 INNER JOIN GROUPS2 ON (NAMES2.EMPNUM=GROUPS2.EMPNUM);
 0 rows inserted/updated/deleted
 ij> -- PASS:0592 If view is created?
+
    CREATE VIEW NMGRP2 (EMPNUM, NAME, NEMPNUM, GRP) AS
   SELECT * FROM NAMES2 JOIN GROUPS2 
     ON (NAMES2.EMPNUM=GROUPS2.EMPNUM) WHERE NAMES2.EMPNUM > 0;
 0 rows inserted/updated/deleted
 ij> -- PASS:0592 If view is created?
+
    COMMIT WORK;
 ij> INSERT INTO GROUPS2 VALUES (0, 10);
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO GROUPS2 VALUES (1, 20);
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO GROUPS2 VALUES (2, 30);
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO GROUPS2 VALUES (3, 40);
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO NAMES2 VALUES (5, 'HARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO NAMES2 VALUES (1, 'MARY');
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO NAMES2 VALUES (7, 'LARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO NAMES2 VALUES (0, 'KERI');
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    INSERT INTO NAMES2 VALUES (9, 'BARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0592 If 1 row is inserted?
+
    SELECT EMPNUM
   FROM NAMGRP2
   WHERE NAME = 'KERI'
@@ -158,6 +194,7 @@
 -----------
 0          
 ij> -- PASS:0592 If 1 row is selected and EMPNUM = 0?
+
    SELECT EMPNUM
   FROM NAMGRP2
   WHERE NAME = 'MARY'
@@ -166,6 +203,7 @@
 -----------
 1          
 ij> -- PASS:0592 If 1 row is selected and EMPNUM = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP2
   WHERE NAME <> 'MARY'
@@ -181,6 +219,7 @@
 -----------
 0          
 ij> -- PASS:0592 If count = 0?
+
    SELECT EMPNUM
   FROM NMGRP2
   WHERE NAME = 'MARY'
@@ -189,6 +228,7 @@
 -----------
 1          
 ij> -- PASS:0592 If 1 row is selected and EMPNUM = 1?
+
    SELECT COUNT(*)
   FROM NMGRP2
   WHERE NAME <> 'MARY'
@@ -201,6 +241,7 @@
 -----------
 0          
 ij> -- PASS:0592 If count = 0?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE NAMES2 CASCADE;
    DROP VIEW NMGRP2 ;
@@ -210,60 +251,77 @@
 ij> DROP TABLE NAMES2 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0592 If table and 2 views are dropped?
+
 --O   DROP TABLE GROUPS2 CASCADE;
    DROP TABLE GROUPS2 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0592 If table is dropped?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0592 <<< END TEST
 -- *********************************************
+
 -- TEST:0593 LEFT OUTER JOIN (feature 4) (static)!
+
    CREATE TABLE GROUPS3
   (EMPNUM INT, GRP INT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0593 If table is created?
+
    CREATE TABLE NAMES3
   (EMPNUM INT, NAME CHAR(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:0593 If table is created?
+
    CREATE VIEW NAMGRP3 (EMPNUM, NAME, NEMPNUM, GRP) AS
   SELECT * FROM NAMES3 LEFT OUTER JOIN GROUPS3 ON (NAMES3.EMPNUM=GROUPS3.EMPNUM);
 0 rows inserted/updated/deleted
 ij> -- PASS:0593 If view is created?
+
    CREATE VIEW NMGRP3 (NAME, GRP) AS
   SELECT NAME, GRP FROM NAMES3 LEFT OUTER JOIN GROUPS3
   ON NAMES3.EMPNUM < GROUPS3.EMPNUM
   WHERE NAME <> 'KERI';
 0 rows inserted/updated/deleted
 ij> -- PASS:0593 If view is created?
+
    COMMIT WORK;
 ij> INSERT INTO GROUPS3 VALUES (0, 10);
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO GROUPS3 VALUES (1, 20);
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO GROUPS3 VALUES (2, 30);
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO GROUPS3 VALUES (3, 40);
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO NAMES3 VALUES (5, 'HARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO NAMES3 VALUES (1, 'MARY');
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO NAMES3 VALUES (7, 'LARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO NAMES3 VALUES (0, 'KERI');
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    INSERT INTO NAMES3 VALUES (9, 'BARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0593 If 1 row is inserted?
+
    SELECT COUNT(*)
   FROM NAMGRP3
   WHERE EMPNUM = 0
@@ -273,6 +331,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP3
   WHERE EMPNUM = 1
@@ -282,6 +341,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP3
   WHERE EMPNUM = 5
@@ -291,6 +351,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP3
   WHERE EMPNUM = 7
@@ -300,6 +361,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP3
   WHERE EMPNUM = 9
@@ -309,12 +371,14 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP3;
 1          
 -----------
 5          
 ij> -- PASS:0593 If count = 5?
+
    SELECT COUNT(*)
   FROM NMGRP3
   WHERE NAME = 'HARRY'
@@ -323,6 +387,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NMGRP3
   WHERE NAME = 'MARY'
@@ -331,6 +396,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NMGRP3
   WHERE NAME = 'MARY'
@@ -339,6 +405,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NMGRP3
   WHERE NAME = 'BARRY'
@@ -347,6 +414,7 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NMGRP3
   WHERE NAME = 'LARRY'
@@ -355,12 +423,14 @@
 -----------
 1          
 ij> -- PASS:0593 If count = 1?
+
    SELECT COUNT(*)
   FROM NMGRP3;
 1          
 -----------
 5          
 ij> -- PASS:0593 If count = 5?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE NAMES3 CASCADE;
    DROP VIEW NMGRP3 ;
@@ -370,54 +440,70 @@
 ij> DROP TABLE NAMES3 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0593 If table and 2 views are dropped?
+
 --O   DROP TABLE GROUPS3 CASCADE;
    DROP TABLE GROUPS3 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0593 If table is dropped?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0593 <<< END TEST
 -- *********************************************
+
 -- TEST:0594 RIGHT OUTER JOIN (feature 4) (static)!
+
    CREATE TABLE GROUPS4
   (EMPNUM INT, GRP INT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0594 If table is created?
+
    CREATE TABLE NAMES4
   (EMPNUM DECIMAL (4, 2), NAME CHAR(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:0594 If table is created?
+
    CREATE VIEW NAMGRP4 (NEMPNUM, NAME, EMPNUM, GRP) AS
   SELECT * FROM NAMES4 RIGHT OUTER JOIN GROUPS4 ON (NAMES4.EMPNUM=GROUPS4.EMPNUM);
 0 rows inserted/updated/deleted
 ij> -- PASS:0594 If view is created?
+
    COMMIT WORK;
 ij> INSERT INTO GROUPS4 VALUES (0, 10);
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO GROUPS4 VALUES (1, 20);
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO GROUPS4 VALUES (2, 30);
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO GROUPS4 VALUES (3, 40);
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO NAMES4 VALUES (5.0, 'HARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO NAMES4 VALUES (1.0, 'MARY');
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO NAMES4 VALUES (7.0, 'LARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO NAMES4 VALUES (0.0, 'KERI');
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    INSERT INTO NAMES4 VALUES (9.0, 'BARRY');
 1 row inserted/updated/deleted
 ij> -- PASS:0594 If 1 row is inserted?
+
    SELECT COUNT(*)
   FROM NAMGRP4
   WHERE EMPNUM = 0
@@ -427,6 +513,7 @@
 -----------
 1          
 ij> -- PASS:0594 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP4
   WHERE EMPNUM = 1
@@ -436,6 +523,7 @@
 -----------
 1          
 ij> -- PASS:0594 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP4
   WHERE EMPNUM = 2
@@ -445,6 +533,7 @@
 -----------
 1          
 ij> -- PASS:0594 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP4
   WHERE EMPNUM = 3
@@ -454,12 +543,14 @@
 -----------
 1          
 ij> -- PASS:0594 If count = 1?
+
    SELECT COUNT(*)
   FROM NAMGRP4;
 1          
 -----------
 4          
 ij> -- PASS:0594 If count = 4?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE NAMES4 CASCADE;
    DROP VIEW NAMGRP4 ;
@@ -467,12 +558,14 @@
 ij> DROP TABLE NAMES4 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0594 If table and view are dropped?
+
 --O   DROP TABLE GROUPS4 CASCADE;
    DROP TABLE GROUPS4 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0594 If table is dropped?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0594 <<< 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/dml106.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml106.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml106.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml106.out Fri Oct 27 13:04:21 2006
@@ -1,14 +1,17 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML106  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml106.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
 ij> --N temporarily changed authorization to HU, to simplify schema name usage until
 --N we have permissions; table USIG requires explicit schema name FLATER until
 --N this is changed back
+
 --0   SELECT USER FROM HU.ECCO;
   VALUES USER;
 1                                                                                                                               
@@ -17,28 +20,34 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:0599 UNION in views (feature 8) (static)!
+
    CREATE VIEW UUSIG (U1) AS
   SELECT C1 FROM USIG UNION SELECT C_1 FROM USIG;
 0 rows inserted/updated/deleted
 ij> -- PASS:0599 If view is created?
+
    COMMIT WORK;
 ij> SELECT COUNT(*) FROM UUSIG;
 1          
 -----------
 4          
 ij> -- PASS:0599 If count = 4?
+
    SELECT COUNT(DISTINCT U1) FROM UUSIG;
 1          
 -----------
 4          
 ij> -- PASS:0599 If count = 4?
+
    SELECT COUNT(*) FROM UUSIG WHERE U1 < 0
   OR U1 > 3 OR U1 IS NULL;
 1          
 -----------
 0          
 ij> -- PASS:0599 If count = 0?
+
    COMMIT WORK;
 ij> CREATE VIEW ABOVE_AVERAGE (COLUMN_1, COLUMN_2, COLUMN_3) AS
       SELECT PNUM, BUDGET, CITY
@@ -51,6 +60,7 @@
         WHERE CITY > 'Deale';
 0 rows inserted/updated/deleted
 ij> -- PASS:0599 If view is created?
+
    COMMIT WORK;
 ij> SELECT * FROM ABOVE_AVERAGE ORDER BY COLUMN_1;
 CO&|COLUMN_2  |COLUMN_3       
@@ -64,6 +74,7 @@
 -- PASS:0599    P2   30000  Vienna ?
 -- PASS:0599    P3   30000  Tampa  ?
 -- PASS:0599    P6   50000  Deale  ?
+
    COMMIT WORK;
 ij> CREATE VIEW STAFF_DUP AS
       SELECT EMPNUM, EMPNAME, GRADE, CITY
@@ -72,6 +83,7 @@
       SELECT * FROM HU.STAFF3;
 0 rows inserted/updated/deleted
 ij> -- PASS:0599 If view is created?
+
    COMMIT WORK;
 ij> SELECT * FROM STAFF_DUP ORDER BY CITY;
 EM&|EMPNAME             |GRADE|CITY           
@@ -89,11 +101,13 @@
 ij> -- PASS:0599 If 10 rows selected ?
 -- PASS:0599 If first row contains EMPNUM/CITY values E5 / Akron ?
 -- PASS:0599 If second row contains EMPNUM/CITY values E5 / Akron ?
+
    SELECT COUNT(*) FROM STAFF_DUP;
 1          
 -----------
 10         
 ij> -- PASS:0599 If count = 10 ?
+
    COMMIT WORK;
 ij> CREATE VIEW FOUR_CITIES (C1, C2, C3) AS
       SELECT 'P', CITY, 666
@@ -113,6 +127,7 @@
         WHERE CITY = 'Vienna';
 0 rows inserted/updated/deleted
 ij> -- PASS:0599 If view is created?
+
    COMMIT WORK;
 ij> SELECT C2, C1, C3 FROM FOUR_CITIES ORDER BY C3, C2;
 C2             |&|C3         
@@ -132,21 +147,25 @@
 -- PASS:0599    Vienna  P      666  ?
 -- PASS:0599    Deale   S      777  ?
 -- PASS:0599    Vienna  S      777  ?
+
    SELECT COUNT (*) FROM FOUR_CITIES;
 1          
 -----------
 7          
 ij> -- PASS:0599 If count = 7 ?
+
    SELECT COUNT(*) FROM FOUR_CITIES WHERE C3 > 0;
 1          
 -----------
 4          
 ij> -- PASS:0599 If count = 4 ?
+
    SELECT COUNT(*) FROM FOUR_CITIES WHERE C2 = 'Vienna';
 1          
 -----------
 3          
 ij> -- PASS:0599 If count = 3 ?
+
    COMMIT WORK;
 ij> --0   DROP VIEW ABOVE_AVERAGE CASCADE;
    DROP VIEW ABOVE_AVERAGE ;
@@ -165,46 +184,57 @@
 0 rows inserted/updated/deleted
 ij> COMMIT WORK;
 ij> -- END TEST >>> 0599 <<< END TEST
+
 -- *********************************************
+
 -- TEST:0601 DATETIME data types (feature 5) (static)!
+
    CREATE TABLE TEMPUS (TDATE DATE, TTIME TIME,
 --0  TTIMESTAMP TIMESTAMP, TINT1 INTERVAL YEAR TO MONTH,
   TTIMESTAMP TIMESTAMP);
 0 rows inserted/updated/deleted
 ij> --0  TINT2 INTERVAL DAY TO SECOND);
 -- PASS:0601 If table is created?
+
    COMMIT WORK;
 ij> INSERT INTO TEMPUS VALUES (
   DATE( '1993-08-24'),
   TIME( '16:03:00'),
-  TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx)
+  TIMESTAMP( '1993-08-24 16:03:00')
 --0  , INTERVAL -'1-6' YEAR TO MONTH,
 --0  INTERVAL '13 0:10' DAY TO SECOND);
   );
 1 row inserted/updated/deleted
 ij> -- PASS:0601 If 1 row is inserted?
+
    SELECT DAY( TDATE)
   FROM TEMPUS;
 1          
 -----------
 24         
 ij> -- PASS:0601 If 1 row selected and value is 24?
+
 --0   SELECT COUNT(*) FROM TEMPUS
---0  WHERE (TTIMESTAMP - TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx))
+--0  WHERE (TTIMESTAMP - TIMESTAMP( '1995-02-24 16:03:00'))
 --0  YEAR TO MONTH = TINT1;
 -- PASS:0601 If count = 1?
+
 --0   SELECT COUNT(*) FROM TEMPUS
 --0  WHERE (TTIMESTAMP, TINT1) OVERLAPS
---0  (TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx), INTERVAL '1-6' YEAR TO MONTH);
+--0  (TIMESTAMP( '1995-02-24 16:03:00'), INTERVAL '1-6' YEAR TO MONTH);
 -- PASS:0601 If count = 0?
+
    ROLLBACK WORK;
 ij> --0   DROP TABLE TEMPUS CASCADE;
    DROP TABLE TEMPUS ;
 0 rows inserted/updated/deleted
 ij> COMMIT WORK;
 ij> -- END TEST >>> 0601 <<< END TEST
+
 -- *********************************************
+
 -- TEST:0611 FIPS sizing, DATETIME data types (static)!
+
    CREATE TABLE TSFIPS (
   FIPS1 TIME,
   FIPS2 TIMESTAMP
@@ -213,48 +243,58 @@
   );
 0 rows inserted/updated/deleted
 ij> -- PASS:0611 If table is created?
+
    COMMIT WORK;
 ij> INSERT INTO TSFIPS VALUES (
   TIME( '16:03:00'),
-  TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx')
+  TIMESTAMP( '1996-08-24 16:03:00.999999')
 --0  ,INTERVAL -'99-6' YEAR (2) TO MONTH,
 --0  INTERVAL '99 0:10:00.999999' DAY (2) TO SECOND (6));
   );
 1 row inserted/updated/deleted
 ij> -- PASS:0611 If 1 row is inserted?
+
    SELECT SECOND( FIPS2)
   * 1000000 - 999990 FROM TSFIPS;
 1                     
 ----------------------
 9.0                   
 ij> -- PASS:0611 If 1 row selected and value is 9?
+
 --0   SELECT YEAR( FIPS3),
 --0  MONTH( FIPS3)
 --0  FROM TSFIPS;
 -- PASS:0611 If 1 row selected and values are -99 and -6?
+
 --0   SELECT DAY( FIPS4),
 --0  SECOND( FIPS4) * 1000000 - 999990
 --0  FROM TSFIPS;
 -- PASS:0611 If 1 row selected and values are 99 and 9?
+
    ROLLBACK WORK;
 ij> --0   DROP TABLE TSFIPS CASCADE;
    DROP TABLE TSFIPS ;
 0 rows inserted/updated/deleted
 ij> COMMIT WORK;
 ij> -- END TEST >>> 0611 <<< END TEST
+
 -- *********************************************
+
 -- TEST:0613 <datetime value function> (static)!
+
    CREATE TABLE TSSMALL (
   SMALLD DATE,
   SMALLT TIME,
   SMALLTS TIMESTAMP);
 0 rows inserted/updated/deleted
 ij> -- PASS:0613 If table is created?
+
    COMMIT WORK;
 ij> INSERT INTO TSSMALL VALUES (
   CURRENT_DATE, CURRENT_TIME, CURRENT_TIMESTAMP);
 1 row inserted/updated/deleted
 ij> -- PASS:0613 If 1 row is inserted?
+
    SELECT COUNT(*)
 FROM TSSMALL WHERE
 YEAR( SMALLD) = YEAR( SMALLTS);
@@ -262,6 +302,7 @@
 -----------
 1          
 ij> -- PASS:0613 If count = 1?
+
    SELECT COUNT(*)
 FROM TSSMALL WHERE
 MONTH( SMALLD) = MONTH( SMALLTS);
@@ -269,6 +310,7 @@
 -----------
 1          
 ij> -- PASS:0613 If count = 1?
+
    SELECT COUNT(*)
 FROM TSSMALL WHERE
 DAY( SMALLD) = DAY( SMALLTS);
@@ -276,6 +318,7 @@
 -----------
 1          
 ij> -- PASS:0613 If count = 1?
+
    SELECT COUNT(*)
 FROM TSSMALL WHERE
 HOUR( SMALLT) = HOUR( SMALLTS);
@@ -283,6 +326,7 @@
 -----------
 1          
 ij> -- PASS:0613 If count = 1?
+
    SELECT COUNT(*)
 FROM TSSMALL WHERE
 MINUTE( SMALLT) = MINUTE( SMALLTS);
@@ -290,6 +334,7 @@
 -----------
 1          
 ij> -- PASS:0613 If count = 1?
+
    SELECT COUNT(*)
 FROM TSSMALL WHERE
 SECOND( SMALLT) -
@@ -300,37 +345,46 @@
 -----------
 1          
 ij> -- PASS:0613 If count = 1?
+
    ROLLBACK WORK;
 ij> --0   DROP TABLE TSSMALL CASCADE;
    DROP TABLE TSSMALL ;
 0 rows inserted/updated/deleted
 ij> COMMIT WORK;
 ij> -- END TEST >>> 0613 <<< END TEST
+
 -- *********************************************
+
 -- TEST:0615 DATETIME-related SQLSTATE codes (static)!
+
    CREATE TABLE TSERR (
 --0  BADINT INTERVAL YEAR (2) TO MONTH,
   BADDATE DATE);
 0 rows inserted/updated/deleted
 ij> -- PASS:0615 If table is created?
+
    COMMIT WORK;
 ij> --0   INSERT INTO TSERR VALUES (
 --0  INTERVAL '0-11' YEAR TO MONTH,
 --0  DATE( '9999-01-01') + INTERVAL '1-00' YEAR TO MONTH);
 -- PASS:0615 If ERROR, datetime field overflow, 0 rows inserted?
+
    INSERT INTO TSERR VALUES (
 --0  INTERVAL '9999-11' YEAR TO MONTH,
   DATE( '1984-01-01'));
 1 row inserted/updated/deleted
 ij> -- PASS:0615 If ERROR, interval field overflow, 0 rows inserted?
+
 --0   INSERT INTO TSERR VALUES (
 --0  INTERVAL '1-11' YEAR TO MONTH,
 --0  CAST ('DATE ''1993-02-30''' AS DATE));
 -- PASS:0615 If ERROR, invalid datetime format, 0 rows inserted?
+
 --0   INSERT INTO TSERR VALUES (
 --0  INTERVAL '1-11' YEAR TO MONTH,
 --0  CAST ('1993-02-30' AS DATE));
 -- PASS:0615 If ERROR, invalid datetime format, 0 rows inserted?
+
    ROLLBACK WORK;
 ij> --0   DROP TABLE TSERR CASCADE;
    DROP TABLE TSERR ;
@@ -339,4 +393,4 @@
 ij> -- END TEST >>> 0615 <<< 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/dml108.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml108.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml108.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml108.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML108  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml108.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -14,7 +16,9 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:0617 DATETIME with predicates, set fns (static)!
+
    CREATE TABLE TEMPS (
   ENTERED  TIMESTAMP,
   START    DATE,
@@ -25,6 +29,7 @@
 	);
 0 rows inserted/updated/deleted
 ij> -- PASS:0617 If table is created?
+
    COMMIT WORK;
 ij> CREATE VIEW SUBQ1 AS
   SELECT MIN (HOUR_IN) AS TOO_EARLY,
@@ -35,9 +40,10 @@
   FROM TEMPS;
 0 rows inserted/updated/deleted
 ij> -- PASS:0617 If view is created?
+
    COMMIT WORK;
 ij> INSERT INTO TEMPS VALUES (
-  TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx),
+  TIMESTAMP( '1993-11-10 12:25:14'),
   DATE( '1993-11-12'),
 --0  INTERVAL '4' DAY,
   TIME( '08:30:00'),
@@ -46,8 +52,9 @@
   );
 1 row inserted/updated/deleted
 ij> -- PASS:0617 If 1 row is inserted?
+
    INSERT INTO TEMPS VALUES (
-  TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx),
+  TIMESTAMP( '1993-11-10 13:15:14'),
   DATE( '1993-11-15'),
 --0  INTERVAL '5' DAY,
   TIME( '08:30:00'),
@@ -56,8 +63,9 @@
   );
 1 row inserted/updated/deleted
 ij> -- PASS:0617 If 1 row is inserted?
+
    INSERT INTO TEMPS VALUES (
-  TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx),
+  TIMESTAMP( '1993-11-17 09:56:48'),
   DATE( '1994-11-18'),
 --0  INTERVAL '3' DAY,
   TIME( '09:00:00'),
@@ -66,14 +74,17 @@
   );
 1 row inserted/updated/deleted
 ij> -- PASS:0617 If 1 row is inserted?
+
 --0   SELECT COUNT(*)
 --0  FROM TEMPS WHERE
 --0  LUNCH < INTERVAL '1:00' HOUR TO MINUTE;
 -- PASS:0617 If count = 1?
+
 --0   SELECT COUNT(*)
 --0  FROM TEMPS WHERE
 --0  LUNCH <= INTERVAL '1:00' HOUR TO MINUTE;
 -- PASS:0617 If count = 3?
+
    SELECT COUNT(*)
   FROM TEMPS WHERE
   START <> DATE( '1993-11-15') AND
@@ -82,6 +93,7 @@
 -----------
 1          
 ij> -- PASS:0617 If count = 1?
+
    SELECT COUNT(*)
   FROM TEMPS WHERE
   START = DATE( '1993-11-15') OR
@@ -90,6 +102,7 @@
 -----------
 2          
 ij> -- PASS:0617 If count = 2?
+
    SELECT COUNT(*)
   FROM TEMPS WHERE
   HOUR_OUT > TIME( '17:00:00');
@@ -97,6 +110,7 @@
 -----------
 1          
 ij> -- PASS:0617 If count = 1?
+
    SELECT COUNT(*)
   FROM TEMPS WHERE
   HOUR_OUT >= TIME( '17:00:00');
@@ -104,29 +118,34 @@
 -----------
 2          
 ij> -- PASS:0617 If count = 2?
+
    SELECT COUNT(*)
   FROM TEMPS WHERE
-  ENTERED BETWEEN TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx)AND
-                  TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx);
+  ENTERED BETWEEN TIMESTAMP( '1993-11-10 00:00:00' )AND
+                  TIMESTAMP( '1993-11-10 23:59:59');
 1          
 -----------
 2          
 ij> -- PASS:0617 If count = 2?
+
 --0   SELECT COUNT(*)
 --0  FROM TEMPS WHERE
 --0  HOUR_OUT IN
 --0  (SELECT HOUR_IN + INTERVAL '8' HOUR FROM TEMPS);
 -- PASS:0617 If count = 2?
+
 --0   SELECT COUNT(*)
 --0  FROM TEMPS WHERE
 --0  (START, APPT) OVERLAPS
 --0  (DATE( '1993-11-14'), INTERVAL '2' DAY);
 -- PASS:0617 If count = 2?
+
 --0   SELECT COUNT(*)
 --0  FROM TEMPS WHERE
 --0  HOUR_OUT = ANY
 --0  (SELECT HOUR_IN + INTERVAL '8' HOUR FROM TEMPS);
 -- PASS:0617 If count = 2?
+
    SELECT COUNT(*)
   FROM TEMPS WHERE
   YEAR( ENTERED) <> SOME
@@ -136,6 +155,7 @@
 -----------
 3          
 ij> -- PASS:0617 If count = 3?
+
    SELECT COUNT(*)
   FROM TEMPS WHERE
   YEAR( START) <> ALL
@@ -145,6 +165,7 @@
 -----------
 1          
 ij> -- PASS:0617 If count = 1?
+
    SELECT HOUR( TOO_EARLY)
   * 100 + MINUTE( TOO_EARLY)
   FROM SUBQ1;
@@ -152,6 +173,7 @@
 -----------
 830        
 ij> -- PASS:0617 If 1 row selected and value is 830?
+
    SELECT YEAR( LATEST),
   MONTH( LATEST) * 100 +
   DAY( LATEST)
@@ -160,20 +182,25 @@
 -----------------------
 1994       |1118       
 ij> -- PASS:0617 If 1 row selected and values are 1994, 1118?
+
 --0   SELECT HOUR( AVGLUNCH)
 --0  * 100 + MINUTE( AVGLUNCH)
 --0  FROM SUBQ1;
 -- PASS:0617 If 1 row selected and value is 49 or 50?
 -- NOTE:0617 50 is better but 49 is acceptable.
+
 --0   SELECT HOUR( D_AVGLUNCH)
 --0  * 100 + MINUTE( D_AVGLUNCH)
 --0  FROM SUBQ1;
 -- PASS:0617 If 1 row selected and value is 45?
+
 --0   SELECT DAY( SUMAPPT)
 --0  FROM SUBQ1;
 -- PASS:0617 If 1 row selected and value is 12?
+
 --0   SELECT COUNT (DISTINCT LUNCH) FROM TEMPS;
 -- PASS:0617 If count = 2?
+
    ROLLBACK WORK;
 ij> --0   DROP TABLE TEMPS CASCADE;
    DROP TABLE SUBQ1 ;
@@ -181,8 +208,10 @@
 ij> DROP TABLE TEMPS ;
 ERROR X0Y23: Operation 'DROP TABLE' cannot be performed on object 'TEMPS' because VIEW 'SUBQ1' is dependent on that object.
 ij> -- PASS:0617 If table and view are dropped?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0617 <<< END TEST
+
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file