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 [6/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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml155.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml155.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml155.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml155.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML155  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml155.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:0850 Comparing fixed vs. variable length caracter strings!
+
    CREATE TABLE T850 (
 --O     T850KEY INT NOT NULL UNIQUE,
      T850KEY INT NOT NULL constraint t850_unique UNIQUE,
@@ -23,19 +27,23 @@
      T850LVC VARCHAR (20));
 0 rows inserted/updated/deleted
 ij> -- PASS:0850 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO T850 VALUES (
      10, '1234567890', '1234567890', '1234567890   ');
 1 row inserted/updated/deleted
 ij> -- PASS:0850 If 1 row inserted successfully?
+
    INSERT INTO T850 VALUES (
      5, '12345     ', '12345', '12345');
 1 row inserted/updated/deleted
 ij> -- PASS:0850 If 1 row inserted successfully?
+
    INSERT INTO T850 VALUES (
      0, '          ', '', '                    ');
 1 row inserted/updated/deleted
 ij> -- PASS:0850 If 1 row inserted successfully?
+
 --O   SELECT COUNT(*) 
    SELECT * 
      FROM T850 WHERE T850C = T850VC;
@@ -45,18 +53,21 @@
 5          |12345      |12345     |12345               
 0          |           |          |                    
 ij> -- PASS:0850 If COUNT = 3?
+
    SELECT T850KEY 
      FROM T850 WHERE T850VC = '1234567890     ';
 T850KEY    
 -----------
 10         
 ij> -- PASS:0850 If T850KEY = 10?
+
    SELECT T850KEY 
      FROM T850 WHERE T850VC = '12345  ';
 T850KEY    
 -----------
 5          
 ij> -- PASS:0850 If T850KEY = 5?
+
    SELECT T850KEY 
 --N     FROM T850 WHERE T850VC = '1234567890     '; error in NIST test
      FROM T850 WHERE T850VC = '               ';
@@ -65,6 +76,7 @@
 0          
 ij> --N this corresponds to the esql/c test
 -- PASS:0850 If T850KEY = 0?
+
 --O   SELECT COUNT(*)
    SELECT * 
      FROM T850 WHERE T850C = '1234567890';
@@ -72,6 +84,7 @@
 -------------------------------------------------------
 10         |1234567890 |1234567890|1234567890          
 ij> -- INFORMATIONAL
+
 --O   SELECT COUNT(*) 
    SELECT *
      FROM T850 WHERE T850C = '12345';
@@ -79,6 +92,7 @@
 -------------------------------------------------------
 5          |12345      |12345     |12345               
 ij> -- INFORMATIONAL
+
 --O   SELECT COUNT(*) 
    SELECT * 
      FROM T850 WHERE T850VC = T850LVC;
@@ -88,6 +102,7 @@
 5          |12345      |12345     |12345               
 0          |           |          |                    
 ij> -- PASS:0850 If COUNT = 3?
+
 --O   SELECT COUNT(*) 
    SELECT * 
      FROM T850 WHERE T850VC = '12345          ';
@@ -95,6 +110,7 @@
 -------------------------------------------------------
 5          |12345      |12345     |12345               
 ij> -- PASS:0850 If COUNT = 1?
+
 --O   SELECT COUNT(*) 
    SELECT * 
      FROM T850 WHERE T850VC = '12345  ';
@@ -102,6 +118,7 @@
 -------------------------------------------------------
 5          |12345      |12345     |12345               
 ij> -- PASS:0850 If COUNT = 1?
+
 --O   SELECT COUNT(*)
    SELECT * 
      FROM T850 WHERE T850LVC = '12345          ';
@@ -109,6 +126,7 @@
 -------------------------------------------------------
 5          |12345      |12345     |12345               
 ij> -- PASS:0850 If COUNT = 1?
+
 --O   SELECT COUNT(*) 
    SELECT * 
      FROM T850 WHERE T850LVC = '12345  ';
@@ -116,6 +134,7 @@
 -------------------------------------------------------
 5          |12345      |12345     |12345               
 ij> -- PASS:0850 If COUNT = 1?
+
 --O   SELECT COUNT(*) 
    SELECT * 
      FROM T850 WHERE T850C = '12345          ';
@@ -123,6 +142,7 @@
 -------------------------------------------------------
 5          |12345      |12345     |12345               
 ij> -- PASS:0850 If COUNT = 1?
+
 --O   SELECT COUNT(*) 
    SELECT * 
      FROM T850 WHERE T850C = '12345  ';
@@ -130,6 +150,7 @@
 -------------------------------------------------------
 5          |12345      |12345     |12345               
 ij> -- PASS:0850 If COUNT = 1?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE T850 CASCADE;
    DROP TABLE T850 ;
@@ -139,4 +160,4 @@
 -- *********************************************
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml158.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml158.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml158.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml158.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML158  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml158.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 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:0857 <join condition> set function, outer reference! Error
+
    DELETE FROM WORKS
      WHERE EXISTS 
      (SELECT * FROM PROJ JOIN STAFF
@@ -23,6 +27,7 @@
       AND PNUM = WORKS.PNUM);
 ERROR 42972: An ON clause associated with a JOIN operator is not valid.
 ij> -- PASS:0857 If ERROR OR SQLSTATE = 42X04
+
    SELECT EMPNUM, PNUM FROM WORKS
        ORDER BY EMPNUM, PNUM;
 EM&|PN&
@@ -54,6 +59,7 @@
 -- PASS:0857 If    E4        P2  ?
 -- PASS:0857 If    E4        P4  ?
 -- PASS:0857 If    E4        P5  ?
+
    ROLLBACK WORK;
 ij> SELECT EMPNUM, SUM (HOURS) FROM WORKS OWORKS
        GROUP BY EMPNUM
@@ -75,6 +81,7 @@
 --               ======    ==========
 -- PASS:0857 If  E1        184       ?
 -- PASS:0857 If  E4        140       ?
+
    SELECT EMPNUM, SUM (HOURS) FROM WORKS OWORKS
        GROUP BY EMPNUM
        HAVING EMPNUM IN (
@@ -95,9 +102,10 @@
 --               ======    ==========
 -- PASS:0857 If  E1        184       ?
 -- PASS:0857 If  E4        140       ?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0857 <<< 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/dml160.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml160.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml160.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml160.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML160  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml160.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:0859 <joined table> contained in <select list>!
+
    SELECT EMPNUM, (SELECT COUNT(*) FROM HU.WORKS JOIN HU.PROJ
      ON HU.WORKS.PNUM = HU.PROJ.PNUM
      AND BUDGET > AVG (OSTAFF.GRADE) * 1000
@@ -29,10 +33,13 @@
 -- PASS:0859 If    E3       1  ?
 -- PASS:0859 If    E4       2  ?
 -- PASS:0859 If    E1       4  ?  
+
    COMMIT WORK;
 ij> -- END TEST >>> 0859 <<< END TEST
 -- *********************************************
+
 -- TEST:0860 Domains over various data types!
+
 --O   CREATE DOMAIN EPOCH_NOT_NORM AS DECIMAL (5, 2);
 --O-- PASS:0860 If domain created successfully?
 --O
@@ -56,8 +63,8 @@
 --O   COMMIT WORK;
 --O
 --O   CREATE DOMAIN TIDETIMESTAMP AS TIMESTAMP WITH TIME ZONE
---O    CHECK (VALUE BETWEEN TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00')
---O    AND TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'));
+--O    CHECK (VALUE BETWEEN TIMESTAMP( '1994-01-01 00:00:00+00:00')
+--O    AND TIMESTAMP( '2025-12-31 23:59:59+00:00'));
 --O-- PASS:0860 If domain created successfully?
 --O
 --O   COMMIT WORK;
@@ -198,23 +205,23 @@
 --O-- PASS:0860 If COUNT = 4?
 --O
 --O   INSERT INTO PENDING VALUES (
---O     300, TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'),
---O          TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'), 0);
+--O     300, TIMESTAMP( '1995-12-15 00:00:00-05:00'),
+--O          TIMESTAMP( '1995-12-17 00:00:00-05:00'), 0);
 --O-- PASS:0860 If 1 row inserted successfully?
 --O
 --O   INSERT INTO PENDING VALUES (
---O     101, TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'),
---O          TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'), 1);
+--O     101, TIMESTAMP( '2025-12-30 19:00:00-05:00'),
+--O          TIMESTAMP( '2025-12-31 19:00:00-05:00'), 1);
 --O-- PASS:0860 If ERROR - integrity constraint violation?
 --O
 --O   INSERT INTO PENDING VALUES (
---O     101, TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'),
---O          TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'), 1);
+--O     101, TIMESTAMP( '2025-12-30 19:00:00-05:00'),
+--O          TIMESTAMP( '2025-12-31 18:59:59-05:00'), 1);
 --O-- PASS:0860 If 1 row inserted successfully?
 --O
 --O   INSERT INTO PENDING VALUES (
---O     102, TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'),
---O       TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:00'), 2);
+--O     102, TIMESTAMP( '1993-12-31 19:00:00-05:00'),
+--O       TIMESTAMP( '1994-01-02 00:00:00-05:00'), 2);
 --O-- PASS:0860 If 1 row inserted successfully?
 --O
 --O   SELECT YEAR( CHECK_DATES)
@@ -272,36 +279,6 @@
 --O-- END TEST >>> 0860 <<< END TEST
 --O-- *********************************************
 --O-- *************************************************////END-OF-MODULE
--- Simple addition to check the test has a security manager installed.
-run resource '/org/apache/derbyTesting/functionTests/util/testRoutines.sql';
-ij> --
---   Licensed to the Apache Software Foundation (ASF) under one or more
---   contributor license agreements.  See the NOTICE file distributed with
---   this work for additional information regarding copyright ownership.
---   The ASF licenses this file to You under the Apache License, Version 2.0
---   (the "License"); you may not use this file except in compliance with
---   the License.  You may obtain a copy of the License at
---
---      http://www.apache.org/licenses/LICENSE-2.0
---
---   Unless required by applicable law or agreed to in writing, software
---   distributed under the License is distributed on an "AS IS" BASIS,
---   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---   See the License for the specific language governing permissions and
---   limitations under the License.
---
--- Changed to create individual procedures so that this will work with JSR169. 
--- Direct call to 'installRoutines' uses nested connection
-CREATE PROCEDURE TESTROUTINE.SET_SYSTEM_PROPERTY(IN PROPERTY_KEY VARCHAR(32000), IN PROPERTY_VALUE VARCHAR(32000)) NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.setSystemProperty' language java parameter style java;
-0 rows inserted/updated/deleted
-ij> CREATE PROCEDURE TESTROUTINE.SLEEP(IN SLEEP_TIME_MS BIGINT) NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.sleep' language java parameter style java;
-0 rows inserted/updated/deleted
-ij> CREATE FUNCTION TESTROUTINE.HAS_SECURITY_MANAGER() RETURNS INT NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.hasSecurityManager' language java parameter style java;
-0 rows inserted/updated/deleted
-ij> CREATE FUNCTION TESTROUTINE.READ_FILE(FILE_NAME VARCHAR(60), ENCODING VARCHAR(60)) RETURNS VARCHAR(32000) NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.readFile' language java parameter style java;
-0 rows inserted/updated/deleted
-ij> values TESTROUTINE.HAS_SECURITY_MANAGER();
-1          
------------
-1          
-ij> 
+
+;
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml162.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml162.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml162.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml162.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML162  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml162.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:0863 <joined table> directly contained in cursor,view!
+
    CREATE VIEW BLIVET (CITY, PNUM, EMPNUM, EMPNAME, GRADE,
       HOURS, PNAME, PTYPE, BUDGET) AS
 --0      HU.STAFF NATURAL JOIN HU.WORKS NATURAL JOIN HU.PROJ;
@@ -23,6 +27,7 @@
 	  ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0863 If view created successfully?
+
    COMMIT WORK;
 ij> SELECT COUNT(*) 
      FROM BLIVET WHERE EMPNUM = 'E1';
@@ -30,12 +35,14 @@
 -----------
 3          
 ij> -- PASS:0863 If COUNT = 3?
+
    SELECT COUNT(*) 
      FROM BLIVET WHERE EMPNUM <> 'E1';
 1          
 -----------
 3          
 ij> -- PASS:0863 If COUNT = 3?
+
    SELECT * FROM HU.STAFF LEFT OUTER JOIN HU.WORKS
       ON (HU.STAFF.EMPNUM=HU.WORKS.EMPNUM);
 EMP&|EMPNAME             |GRADE|CITY           |EMP&|PNUM|HOURS 
@@ -54,6 +61,7 @@
 E4  |Don                 |12   |Deale          |E4  |P5  |80    
 E5  |Ed                  |13   |Akron          |NULL|NULL|NULL  
 ij> -- PASS:0863 If 13 rows are returned?
+
    COMMIT WORK;
 ij> --0   DROP VIEW BLIVET CASCADE;
    DROP VIEW BLIVET ;
@@ -63,4 +71,4 @@
 -- *********************************************
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml165.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml165.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml165.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml165.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML165  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml165.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER            
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -14,35 +16,43 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:0870 Non-identical descriptors in UNION!
+
    CREATE TABLE APPLES (
      KEY1 INT,
      APPLE_NAME CHAR (15));
 0 rows inserted/updated/deleted
 ij> -- PASS:0870 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE ORANGES (
      KEY2 FLOAT,
      ORANGE_NAME VARCHAR (10));
 0 rows inserted/updated/deleted
 ij> -- PASS:0870 If table ceated successfully?
+
    COMMIT WORK;
 ij> INSERT INTO APPLES VALUES (
      1, 'Granny Smith');
 1 row inserted/updated/deleted
 ij> -- PASS:0870 If 1 row inserted successfully?
+
    INSERT INTO APPLES VALUES (
      2, 'Red Delicious');
 1 row inserted/updated/deleted
 ij> -- PASS:0870 If 1 row inserted successfully?
+
    INSERT INTO ORANGES VALUES (
      1.5E0, 'Navel');
 1 row inserted/updated/deleted
 ij> -- PASS:0870 If 1 row inserted successfully?
+
    INSERT INTO ORANGES VALUES (
      2.5E0, 'Florida');
 1 row inserted/updated/deleted
 ij> -- PASS:0870 If 1 row inserted successfully?
+
    SELECT * FROM APPLES UNION ALL SELECT * FROM ORANGES
      ORDER BY 1;
 1                     |2              
@@ -58,19 +68,22 @@
 -- PASS:0870 If   1.5 (+ or - 0.01)    Navel?
 -- PASS:0870 If   2.0 (+ or - 0.01)    Red Delicious?
 -- PASS:0870 If   2.5 (+ or - 0.01)    Florida?
+
    COMMIT WORK;
 ij> --O   DROP TABLE APPLES CASCADE;
    DROP TABLE APPLES ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0870 If table dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP TABLE ORANGES CASCADE;
    DROP TABLE ORANGES ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0870 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0870 <<< 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/dml168.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml168.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml168.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml168.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML168  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml168.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -13,56 +15,80 @@
 FLATER                                                                                                                          
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
 --O   ROLLBACK WORK;
+
 -- date_time print
+
 -- TEST:0876 SQL_IDENTIFIER and CHARACTER_DATA domains!
+
 --O   CREATE TABLE T0876 (
 --O     C1 INFORMATION_SCHEMA.SQL_IDENTIFIER,
 --O     C2 INFORMATION_SCHEMA.CHARACTER_DATA);
 -- PASS:0876 If table created successfully?
+
 --O   COMMIT WORK;
+
 --O   INSERT INTO T0876 VALUES ('T0876',
 --O     'This table tests a couple of domains.');
 -- PASS:0876 If 1 row inserted successfully?
+
 --O   SELECT COUNT(*) 
 --O     FROM T0876
 --O     WHERE C1 = 'T0876';
 -- PASS:0876 If COUNT = 1?
+
 --O   COMMIT WORK;
+
 --O   DROP TABLE T0876 CASCADE;
 -- PASS:0876 If table dropped successfully?
+
 --O   COMMIT WORK;
+
 -- END TEST >>> 0876 <<< END TEST
 -- *********************************************
+
 -- TEST:0878 Keyword COLUMN in ALTER TABLE is optional!
+
    CREATE TABLE T0878 (C1 INT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0878 If table created successfully?
+
    COMMIT WORK;
 ij> ALTER TABLE T0878 ADD C2 CHAR (4);
 0 rows inserted/updated/deleted
 ij> -- PASS:0878 If table altered successfully?
+
    COMMIT WORK;
 ij> --O   ALTER TABLE T0878
 --O     ALTER C2 SET DEFAULT 'ABCD';
 -- PASS:0878 If table altered successfully?
+
 --O   COMMIT WORK;
+
 --O   ALTER TABLE T0878
 --O     DROP C1 CASCADE;
 -- PASS:0878 If table altered successfully?
+
 --O   COMMIT WORK;
+
 --O   INSERT INTO T0878 VALUES (DEFAULT);
 -- PASS:0878 If 1 row inserted successfully?
+
 --O   SELECT * FROM T0878;
 -- PASS:0878 If answer = 'ABCD'?
+
 --O   COMMIT WORK;
+
 --O  DROP TABLE T0878 CASCADE;
   DROP TABLE T0878 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0878 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0878 <<< END TEST
 -- *********************************************
+
 -- TEST:0879 <drop table constraint definition>!
+
    CREATE TABLE T0879 (
      C1 INT,
      C2 INT NOT NULL,
@@ -70,60 +96,77 @@
        CONSTRAINT REFME UNIQUE (C2));
 0 rows inserted/updated/deleted
 ij> -- PASS:0879 If table created successfully?
+
    COMMIT WORK;
 ij> --O   CREATE TABLE U0879 (
 --O     C1 INT REFERENCES T0879 (C2));
 -- PASS:0879 If table created successfully?
+
 --O   COMMIT WORK;
+
    ALTER TABLE T0879
 --O     DROP CONSTRAINT DELME RESTRICT;
      DROP CONSTRAINT DELME ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0879 If table altered successfully?
+
    COMMIT WORK;
 ij> INSERT INTO T0879 VALUES (0, 0);
 1 row inserted/updated/deleted
 ij> -- PASS:0879 If 1 row inserted successfully?
+
    INSERT INTO T0879 VALUES (-1, -1);
 1 row inserted/updated/deleted
 ij> -- PASS:0879 If 1 row inserted successfully?
+
    SELECT COUNT(*) FROM T0879;
 1          
 -----------
 2          
 ij> -- PASS:0879 If COUNT = 2?
+
 --O   INSERT INTO U0879 VALUES (20);
 -- PASS:0879 If ERROR - integrity constraint violation?
+
    INSERT INTO T0879 VALUES (2, 0);
 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 'REFME' defined on 'T0879'.
 ij> -- PASS:0879 If ERROR - integrity constraint violation?
+
    COMMIT WORK;
 ij> --O   ALTER TABLE T0879
 --O     DROP CONSTRAINT REFME RESTRICT;
 -- PASS:0879 If ERROR - syntax error or access rule violation?
+
 --O   COMMIT WORK;
+
    ALTER TABLE T0879
 --O     DROP CONSTRAINT REFME CASCADE;
      DROP CONSTRAINT REFME ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0879 If table altered successfully?
+
    COMMIT WORK;
 ij> --O   INSERT INTO U0879 VALUES (20);
 -- PASS:0879 If 1 row inserted successfully?
+
    INSERT INTO T0879 VALUES (0, 0);
 1 row inserted/updated/deleted
 ij> -- PASS:0879 If 1 row inserted successfully?
+
    COMMIT WORK;
 ij> --O   DROP TABLE T0879 CASCADE;
    DROP TABLE T0879 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0879 If table dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP TABLE U0879 CASCADE;
 -- PASS:0879 If table dropped successfully?
+
 --O   COMMIT WORK;
+
 -- END TEST >>> 0879 <<< 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/dml170.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml170.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml170.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml170.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML170  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml170.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -13,8 +15,11 @@
 FLATER                                                                                                                          
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
 --O   ROLLBACK WORK;
+
 -- date_time print
+
 -- TEST:0880 Long constraint names, cursor names!
+
    CREATE TABLE T0880 (
      C1 INT NOT NULL, C2 INT NOT NULL,
      CONSTRAINT
@@ -22,16 +27,20 @@
      PRIMARY KEY (C1, C2));
 0 rows inserted/updated/deleted
 ij> -- PASS:0880 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO T0880 VALUES (0, 1);
 1 row inserted/updated/deleted
 ij> -- PASS:0880 If 1 row inserted successfully?
+
    INSERT INTO T0880 VALUES (1, 2);
 1 row inserted/updated/deleted
 ij> -- PASS:0880 If 1 row inserted successfully?
+
    INSERT INTO T0880 VALUES (1, 2);
 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 'It was the best of' defined on 'T0880'.
 ij> -- PASS:0880 If ERROR - integrity constraint violation?
+
    SELECT C1 FROM T0880 ORDER BY C1;
 C1         
 -----------
@@ -42,6 +51,7 @@
 --                ==
 -- PASS:0880 If   0 ?
 -- PASS:0880 If   1 ?
+
    COMMIT WORK;
 ij> ALTER TABLE T0880
      DROP CONSTRAINT
@@ -50,59 +60,80 @@
     ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0880 If table altered successfully?
+
    COMMIT WORK;
 ij> INSERT INTO T0880 VALUES (0, 1);
 1 row inserted/updated/deleted
 ij> -- PASS:0880 If 1 row inserted successfully?
+
    SELECT COUNT (*) FROM T0880;
 1          
 -----------
 3          
 ij> -- PASS:0880 If COUNT = 3?
+
    COMMIT WORK;
 ij> --O   DROP TABLE T0880 CASCADE;
    DROP TABLE T0880 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0880 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0880 <<< END TEST
 -- *********************************************
+
 -- TEST:0881 Long character set names, domain names!
+
 --O   CREATE CHARACTER SET
 --O     "Little boxes on the hillside, Little boxes made of ticky-tacky"
 --O     GET SQL_TEXT;
 -- PASS:0881 If character set created successfully?
+
 --O   COMMIT WORK;
+
 --O   CREATE DOMAIN
 --O     "Little boxes on the hillside, Little boxes all the same."
 --O     CHAR (4) CHARACTER SET
 --O     "Little boxes on the hillside, Little boxes made of ticky-tacky";
 -- PASS:0881 If domain created successfully?
+
 --O   COMMIT WORK;
+
 --O   CREATE TABLE T0881 ( C1
 --O     "Little boxes on the hillside, Little boxes all the same.");
 -- PASS:0881 If table created successfully?
+
 --O   COMMIT WORK;
+
 --O   INSERT INTO T0881 VALUES ('ABCD');
 -- PASS:0881 If insert completed successfully?
+
 --O   SELECT COUNT(*) FROM T0881
 --O     WHERE C1 = 'ABCD';
 -- PASS:0881 If COUNT = 1?
+
 --O   COMMIT WORK;
+
 --O   DROP TABLE T0881 CASCADE;
 -- PASS:0881 if table dropped successfully?
+
 --O   COMMIT WORK;
+
 --O   DROP DOMAIN
 --O     "Little boxes on the hillside, Little boxes all the same."
 --O     CASCADE;
 -- PASS:0881 If domain dropped successfully?
+
 --O   COMMIT WORK;
+
 --O   DROP CHARACTER SET
 --O   "Little boxes on the hillside, Little boxes made of ticky-tacky";
 -- PASS:0881 If character set dropped successfully?
+
 --O   COMMIT WORK;
+
 -- END TEST >>> 0881 <<< 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/dml173.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml173.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml173.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml173.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML173  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml173.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -14,13 +16,16 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:0885 FIPS sizing, VARCHAR (1000)!
+
    CREATE TABLE CONTACTS (
      NAME CHAR (20),
      DESCRIPTION VARCHAR (1000),
      KEYWORDS VARCHAR (1000));
 0 rows inserted/updated/deleted
 ij> -- PASS:0885 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO CONTACTS VALUES ('Harry',
 --O original lines lack the '||' operator
@@ -84,6 +89,7 @@
 'warehouse security integrity feedback');
 1 row inserted/updated/deleted
 ij> -- PASS:0885 If 1 row inserted successfully?
+
 --O   SELECT COUNT(*) 
    SELECT  name
      FROM CONTACTS
@@ -151,6 +157,7 @@
 --------------------
 Harry               
 ij> -- PASS:0885 If COUNT = 1?
+
 --O   SELECT COUNT(*) 
    SELECT  name
      FROM CONTACTS
@@ -160,6 +167,7 @@
 --------------------
 Harry               
 ij> -- PASS:0885 If COUNT = 1?
+
    COMMIT WORK;
 ij> --O   DROP TABLE CONTACTS CASCADE;
    DROP TABLE CONTACTS ;
@@ -169,4 +177,4 @@
 -- *********************************************
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml174.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml174.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml174.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml174.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML174  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml174.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -14,13 +16,16 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:0886 FIPS sizing, VARCHAR (1000)!
+
    CREATE TABLE CONTACTS (
      NAME CHAR (20),
      DESCRIPTION VARCHAR (1000),
      KEYWORDS VARCHAR (1000));
 0 rows inserted/updated/deleted
 ij> -- PASS:0886 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO CONTACTS VALUES ('Harry',
 --O original lacks '||' operator
@@ -84,6 +89,7 @@
 'warehouse security integrity feedback');
 1 row inserted/updated/deleted
 ij> -- PASS:0886 If 1 row inserted successfully?
+
 --O   SELECT COUNT(*) 
    SELECT  name
      FROM CONTACTS
@@ -151,6 +157,7 @@
 --------------------
 Harry               
 ij> -- PASS:0886 If COUNT = 1?
+
 --O   SELECT COUNT(*) 
    SELECT  name
      FROM CONTACTS
@@ -160,14 +167,16 @@
 --------------------
 Harry               
 ij> -- PASS:0886 If COUNT = 1?
+
    COMMIT WORK;
 ij> --O   DROP TABLE CONTACTS CASCADE;
    DROP TABLE CONTACTS ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0886 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0886 <<< 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/dml177.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml177.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml177.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml177.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML177  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml177.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -14,29 +16,36 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:0889 FIPS sizing, INTEGER binary prec >= 31!
+
    CREATE TABLE NOMAIL (C1 INT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0889 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO NOMAIL VALUES (2147483647);
 1 row inserted/updated/deleted
 ij> -- PASS:0889 If 1 row inserted successfully?
+
    INSERT INTO NOMAIL VALUES (-2147483647);
 1 row inserted/updated/deleted
 ij> -- PASS:0889 If 1 row inserted successfully?
+
    SELECT C1 
      FROM NOMAIL WHERE C1 > 0;
 C1         
 -----------
 2147483647 
 ij> -- PASS:0889 If C1 = 2147483647?
+
    SELECT C1 
      FROM NOMAIL WHERE C1 < 0;
 C1         
 -----------
 -2147483647
 ij> -- PASS:0889 If C1 = -2147483647?
+
    SELECT C1 - 2147483646 
      FROM NOMAIL
      WHERE C1 > 0;
@@ -44,6 +53,7 @@
 -----------
 1          
 ij> -- PASS:0889 If value = 1?
+
    SELECT C1 + 2147483646 
      FROM NOMAIL
      WHERE C1 < 0;
@@ -51,21 +61,25 @@
 -----------
 -1         
 ij> -- PASS:0889 If value = -1?
+
    UPDATE NOMAIL
      SET C1 = C1 + 2147483646
      WHERE C1 < 0;
 1 row inserted/updated/deleted
 ij> -- PASS:0889 If update completed successfully?
+
    SELECT C1 
      FROM NOMAIL WHERE C1 < 0;
 C1         
 -----------
 -1         
 ij> -- PASS:0889 If C1 = -1?
+
    UPDATE NOMAIL
      SET C1 = C1 - 1;
 2 rows inserted/updated/deleted
 ij> -- PASS:0889 If update completed successfully?
+
    SELECT COUNT(*) 
      FROM NOMAIL
      WHERE C1 = 2147483645;
@@ -73,6 +87,7 @@
 -----------
 0          
 ij> -- PASS:0889 If COUNT = 0?
+
    SELECT COUNT(*) 
      FROM NOMAIL
      WHERE C1 = 2147483646;
@@ -80,6 +95,7 @@
 -----------
 1          
 ij> -- PASS:0889 If COUNT = 1?
+
    SELECT COUNT(*) 
      FROM NOMAIL
      WHERE C1 = 2147483647;
@@ -87,37 +103,46 @@
 -----------
 0          
 ij> -- PASS:0889 If COUNT = 0?
+
    COMMIT WORK;
 ij> --0   DROP TABLE NOMAIL CASCADE;
    DROP TABLE NOMAIL ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0889 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0889 <<< END TEST
 -- *********************************************
+
 -- TEST:0890 FIPS sizing, SMALLINT binary prec >= 15!
+
    CREATE TABLE YESMAIL (C1 SMALLINT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0890 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO YESMAIL VALUES (32767);
 1 row inserted/updated/deleted
 ij> -- PASS:0890 If 1 row inserted successfully?
+
    INSERT INTO YESMAIL VALUES (-32767);
 1 row inserted/updated/deleted
 ij> -- PASS:0890 If 1 row inserted successfully?
+
    SELECT C1 
      FROM YESMAIL WHERE C1 > 0;
 C1    
 ------
 32767 
 ij> -- PASS:0890 If C1 = 32767?
+
    SELECT C1 
      FROM YESMAIL WHERE C1 < 0;
 C1    
 ------
 -32767
 ij> -- PASS:0890 If C1 = -32767?
+
    SELECT C1 - 32766 
      FROM YESMAIL
      WHERE C1 > 0;
@@ -125,6 +150,7 @@
 -----------
 1          
 ij> -- PASS:0890 If value = 1?
+
    SELECT C1 + 32766 
      FROM YESMAIL
      WHERE C1 < 0;
@@ -132,21 +158,25 @@
 -----------
 -1         
 ij> -- PASS:0890 If value = -1?
+
    UPDATE YESMAIL
      SET C1 = C1 + 32766
      WHERE C1 < 0;
 1 row inserted/updated/deleted
 ij> -- PASS:0890 If update completed successfully?
+
    SELECT C1 
      FROM YESMAIL WHERE C1 < 0;
 C1    
 ------
 -1    
 ij> -- PASS:0890 If C1 = -1?
+
    UPDATE YESMAIL
      SET C1 = C1 - 1;
 2 rows inserted/updated/deleted
 ij> -- PASS:0890 If update completed successfully?
+
    SELECT COUNT(*) 
      FROM YESMAIL
      WHERE C1 = 32765;
@@ -154,6 +184,7 @@
 -----------
 0          
 ij> -- PASS:0890 If COUNT = 0?
+
    SELECT COUNT(*) 
      FROM YESMAIL
      WHERE C1 = 32766;
@@ -161,6 +192,7 @@
 -----------
 1          
 ij> -- PASS:0890 If COUNT = 1?
+
    SELECT COUNT(*) 
      FROM YESMAIL
      WHERE C1 = 32767;
@@ -168,14 +200,16 @@
 -----------
 0          
 ij> -- PASS:0890 If COUNT = 0?
+
    COMMIT WORK;
 ij> --0   DROP TABLE YESMAIL CASCADE;
    DROP TABLE YESMAIL ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0890 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0890 <<< 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/dml178.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml178.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml178.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml178.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML178  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml178.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:0891 FIPS sizing, 250 columns, 4000 char data statement!
+
    CREATE TABLE L1 (
 C1 INT, C2 INT, C3 INT, C4 INT, C5 INT, C6 INT, 
 C7 INT, C8 INT, C9 INT, C10 INT, C11 INT, C12 INT, 
@@ -60,6 +64,7 @@
 C247 INT, C248 INT, C249 INT, C250 INT);
 0 rows inserted/updated/deleted
 ij> -- PASS:0891 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO L1 VALUES (
 1, 2, 3, 4, 5, 6, 
@@ -106,6 +111,7 @@
 247, 248, 249, 250);
 1 row inserted/updated/deleted
 ij> -- PASS:0891 If 1 row inserted successfully?
+
    UPDATE L1 SET
 C1 = C1 + 1, C2 = C2 + 1, C3 = C3 + 1, 
 C4 = C4 + 1, C5 = C5 + 1, C6 = C6 + 1, 
@@ -193,6 +199,7 @@
 C250 = C250 +1;
 1 row inserted/updated/deleted
 ij> -- PASS:0891 If update completed successfully?
+
 -- modified select to avoid a problem with sed in processing test result
    SELECT
 C1, C2, C3, C4, C5, C6, 
@@ -248,14 +255,16 @@
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
 128        |129        |130        |131        |132        |133        |134        |135        |136        |137        |138        |139        |140        |141        |142        |143        |144        |145        |146        |147        |148        |149        |150        |151        |152        |153        |154        |155        |156        |157        |158        |159        |160        |161        |162        |163        |164        |165        |166        |167        |168        |169        |170        |171        |172        |173        |174        |175        |176        |177        |178        |179        |180        |181        |182        |183        |184        |185        |186        |187        |188        |189        |190        |191        |192        |193        |194        |195        |196        |197        |198        |199        |200        |201        |202        |203        |204        |205        |206        |207        |208        |209        |210  
       |211        |212        |213        |214        |215        |216        |217        |218        |219        |220        |221        |222        |223        |224        |225        |226        |227        |228        |229        |230        |231        |232        |233        |234        |235        |236        |237        |238        |239        |240        |241        |242        |243        |244        |245        |246        |247        |248        |249        |250        |251        
 ij> -- PASS:0891 If 250 values are returned with values from 2 thru 251?
+
    COMMIT WORK;
 ij> --O   DROP TABLE L1 CASCADE;
    DROP TABLE L1 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0891 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0891 <<< 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/dml179.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml179.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml179.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml179.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML179  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml179.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:0892 FIPS sizing, rowlen >= 8000, statement var >= 4000!
+
    CREATE TABLE T0892 (
      INTKEY NUMERIC (3) NOT NULL PRIMARY KEY,
      NAAM VARCHAR (1000),
@@ -27,6 +31,7 @@
      DESCRIPT3 VARCHAR (978));
 0 rows inserted/updated/deleted
 ij> -- PASS:0892 If table created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO T0892 (INTKEY, NAAM, ADDRESS, KEYWORDS, DESCRIPT3) 
               VALUES (0,
@@ -91,6 +96,7 @@
 'this is going to be overwritten');
 1 row inserted/updated/deleted
 ij> -- PASS:0892 If 1 row inserted successfully?
+
    UPDATE T0892
      SET FUNCTION1 =
 'Harry works in the Redundancy Automation Division of the ' ||
@@ -125,6 +131,7 @@
   WHERE INTKEY = 0;
 1 row inserted/updated/deleted
 ij> -- PASS:0892 If update completed successfully?
+
    UPDATE T0892
      SET FUNCTION2 = FUNCTION1,
      DESCRIPT1 = FUNCTION1,
@@ -132,6 +139,7 @@
      DESCRIPT3 = SUBSTR (FUNCTION1, 1, 978);
 1 row inserted/updated/deleted
 ij> -- PASS:0892 If update completed successfully?
+
    SELECT LENGTH (NAAM) +
                 LENGTH (ADDRESS) +
                 LENGTH (KEYWORDS) +
@@ -146,14 +154,16 @@
 -----------
 8000       
 ij> -- PASS:0892 If LENGTH = 8000?
+
    COMMIT WORK;
 ij> --O   DROP TABLE T0892 CASCADE;
    DROP TABLE T0892 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0892 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0892 <<< 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/dml181.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml181.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml181.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml181.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML181  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml181.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:0894 FIPS sizing, length of column lists >= 750!
+
    CREATE TABLE LONG_NAMED_PEOPLE (
      FIRSTNAME VARCHAR (373) NOT NULL,
      LASTNAME VARCHAR (373) NOT NULL,
@@ -22,6 +26,7 @@
      PRIMARY KEY (FIRSTNAME, LASTNAME));
 0 rows inserted/updated/deleted
 ij> -- PASS:0894 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE ORDERS (
      FIRSTNAME VARCHAR (373),
@@ -32,6 +37,7 @@
 	REFERENCES LONG_NAMED_PEOPLE);
 0 rows inserted/updated/deleted
 ij> -- PASS:0894 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE VIEW PEOPLE_ORDERS AS
 --O     SELECT * FROM LONG_NAMED_PEOPLE  JOIN ORDERS 
@@ -39,6 +45,7 @@
      ON (a.FIRSTNAME=ORDERS.FIRSTNAME and a.LASTNAME=ORDERS.LASTNAME);
 0 rows inserted/updated/deleted
 ij> -- PASS:0894 If view created successfully?
+
    COMMIT WORK;
 ij> INSERT INTO LONG_NAMED_PEOPLE VALUES (
 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' ||
@@ -58,6 +65,7 @@
 20);
 1 row inserted/updated/deleted
 ij> -- PASS:0894 If 1 row inserted successfully?
+
    INSERT INTO LONG_NAMED_PEOPLE VALUES (
 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' ||
 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' ||
@@ -76,6 +84,7 @@
 25);
 1 row inserted/updated/deleted
 ij> -- PASS:0894 If 1 row inserted successfully?
+
    INSERT INTO ORDERS VALUES (
 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' ||
 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' ||
@@ -95,6 +104,7 @@
 29.95);
 1 row inserted/updated/deleted
 ij> -- PASS:0894 If 1 row inserted successfully?
+
    INSERT INTO ORDERS VALUES (
 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' ||
 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' ||
@@ -114,6 +124,7 @@
 19.95);
 1 row inserted/updated/deleted
 ij> -- PASS:0894 If 1 row inserted successfully?
+
    INSERT INTO ORDERS VALUES (
 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' ||
 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' ||
@@ -133,6 +144,7 @@
 9.95);
 1 row inserted/updated/deleted
 ij> -- PASS:0894 If 1 row inserted successfully?
+
    SELECT FIRSTNAME, LASTNAME, AVG(COST)
      FROM PEOPLE_ORDERS
      GROUP BY LASTNAME, FIRSTNAME
@@ -147,6 +159,7 @@
 --                   ==           ==            ==
 -- PASS:0894 If  aaaaaaaa....    bbbbbbbb....  24.95 (+ or - 0.01)?
 -- PASS:0894 If  cccccccc....    dddddddd....   9.95 (+ or - 0.01)?
+
    COMMIT WORK;
 ij> --O   DROP TABLE ORDERS CASCADE;
    drop view people_orders;
@@ -154,14 +167,16 @@
 ij> DROP TABLE ORDERS ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0894 If table dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP TABLE LONG_NAMED_PEOPLE CASCADE;
    DROP TABLE LONG_NAMED_PEOPLE ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0894 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0894 <<< 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/dml182.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml182.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml182.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml182.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  DML182  
+
 -- SQL Test Suite, V6.0, Interactive SQL, dml182.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:0895 FIPS sizing, columns in list >= 15!
+
    CREATE TABLE ID_CODES (
      CODE1 INT NOT NULL,
      CODE2 INT NOT NULL,
@@ -36,6 +40,7 @@
        CODE11, CODE12, CODE13, CODE14, CODE15));
 0 rows inserted/updated/deleted
 ij> -- PASS:0895 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE ORDERS (
      CODE1 INT,
@@ -61,6 +66,7 @@
      REFERENCES ID_CODES);
 0 rows inserted/updated/deleted
 ij> -- PASS:0895 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE VIEW ID_ORDERS (CODE1, CODE2, CODE3, CODE4, 
 	CODE5, CODE6, CODE7, CODE8, CODE9, CODE10,
@@ -76,6 +82,7 @@
          a.CODE11=ORDERS.CODE11 and a.CODE12=ORDERS.CODE12 and a.CODE13=ORDERS.CODE13 and a.CODE14=ORDERS.CODE14 and a.CODE15=ORDERS.CODE15);
 0 rows inserted/updated/deleted
 ij> -- PASS:0895 If view created successfully
+
    COMMIT WORK;
 ij> INSERT INTO ID_CODES VALUES (
      1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
@@ -99,6 +106,7 @@
      9.95);
 1 row inserted/updated/deleted
 ij> -- PASS:0895 If 5 rows inserted successfully in previous 5 inserts?
+
    SELECT CODE1, CODE2, CODE3, CODE4, CODE5,
        CODE6, CODE7, CODE8, CODE9, CODE10,
        CODE11, CODE12, CODE13, CODE14, CODE15,
@@ -119,6 +127,7 @@
 --                 =========
 -- PASS:0895 If    24.95 (+ or - 0.01)  ?
 -- PASS:0895 If     9.95 (+ or - 0.01)  ?
+
    COMMIT WORK;
 ij> --O   DROP TABLE ORDERS CASCADE;
    drop view id_orders;
@@ -126,14 +135,16 @@
 ij> DROP TABLE ORDERS ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0895 If table dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP TABLE ID_CODES CASCADE;
    DROP TABLE ID_CODES ;
 0 rows inserted/updated/deleted
 ij> -- PASS:0895 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 0895 <<< 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/flattab.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/flattab.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/flattab.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/flattab.out Fri Oct 27 13:04:21 2006
@@ -3,9 +3,11 @@
 -- ****** THIS FILE SHOULD BE RUN UNDER AUTHORIZATION ID FLATER **
 -- ***************************************************************
 -- MODULE  FLATTAB  
+
 -- SQL Test Suite, V6.0, Interactive SQL, flattab.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION FLATER
    set schema FLATER;
 0 rows inserted/updated/deleted
@@ -15,12 +17,16 @@
 --------------------------------------------------------------------------------------------------------------------------------
 FLATER                                                                                                                          
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- This routine initializes the contents of tables:
 --      BASE_VS1, USIG and U_SIG
 -- This routine may be run at any time to re-initialize tables.
+
    DELETE FROM BASE_VS1;
 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 BASE_VS1 VALUES (0,1);
 1 row inserted/updated/deleted
 ij> INSERT INTO BASE_VS1 VALUES (1,0);
@@ -34,14 +40,17 @@
 -----------
 4          
 ij> -- PASS:Setup If count = 4?
+
    DELETE FROM USIG;
 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 USIG VALUES (0,2);
 1 row inserted/updated/deleted
 ij> INSERT INTO USIG VALUES (1,3);
 1 row inserted/updated/deleted
 ij> DELETE FROM U_SIG;
 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 U_SIG VALUES (4,6);
 1 row inserted/updated/deleted
 ij> INSERT INTO U_SIG VALUES (5,7);
@@ -51,12 +60,15 @@
 -----------
 2          
 ij> -- PASS:Setup If count = 2?
+
    SELECT COUNT(*) FROM U_SIG;
 1          
 -----------
 2          
 ij> -- PASS:Setup If count = 2?
+
    COMMIT WORK;
 ij> -- *************************************************////END-OF-MODULE
+
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema1.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema1.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema1.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema1.out Fri Oct 27 13:04:21 2006
@@ -5,8 +5,11 @@
 -- ***************************************************************
 -- ****** THIS FILE SHOULD BE RUN UNDER AUTHORIZATION ID HU ******
 -- ***************************************************************
+
 -- This file defines the base tables used in most of the tests.
+
 -- This is a standard schema definition.
+
   CREATE SCHEMA
 --O  AUTHORIZATION HU;
   HU;
@@ -21,7 +24,7 @@
 ij> CREATE TABLE HU.ECCO (C1 CHAR(2));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE STAFF
-   (EMPNUM   CHAR(3) NOT NULL UNIQUE,
+   (EMPNUM   CHAR(3) NOT NULL CONSTRAINT STAFF_UNIQUE UNIQUE,
     EMPNAME  CHAR(20),
     GRADE    DECIMAL(4),
     CITY     CHAR(15));
@@ -154,6 +157,8 @@
 ij> CREATE TABLE TEXT1024  (TEXXT VARCHAR(1024));
 0 rows inserted/updated/deleted
 ij> -- The following tables are used to test the limitations (12-14-88)
+
+
   CREATE TABLE T240(STR240 CHAR(240));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE DEC15(COL1 DECIMAL(15,7));
@@ -245,6 +250,7 @@
 ij> CREATE TABLE WHICH_SCHEMA1 (C1 CHAR (50));
 0 rows inserted/updated/deleted
 ij> -- ************* create view statements follow *************
+
    CREATE VIEW TESTREPORT AS
     SELECT TESTNO, RESULT, TESTTYPE
     FROM BASE_TESTREPORT;
@@ -397,4 +403,4 @@
 ij> CREATE VIEW VSTAFF3 AS SELECT * FROM STAFF3;
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema4.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema4.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema4.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema4.out Fri Oct 27 13:04:21 2006
@@ -1,4 +1,3 @@
-WARNING 01J01: Database 'wombat' not created, connection made to existing database instead.
 ij> -- SQL Test Suite, V6.0, Schema Definition, schema4.std
 -- 59-byte ID
 -- TEd Version #
@@ -6,7 +5,9 @@
 -- ******************************************************************
 -- ****** THIS FILE SHOULD BE RUN UNDER AUTHORIZATION ID SULLIVAN1
 -- ******************************************************************
+
 -- This is a standard schema definition.
+
 --O   CREATE SCHEMA AUTHORIZATION SULLIVAN1
    CREATE SCHEMA SULLIVAN1;
 0 rows inserted/updated/deleted
@@ -21,8 +22,10 @@
 0 rows inserted/updated/deleted
 ij> --O    GRANT ALL PRIVILEGES ON AUTH_TABLE TO HU
 --O    GRANT SELECT ON MUL_SCH TO HU
+
 -- The following tables are used to run concurrency program pairs
 --    e.g MPA001 and MPB001 use the tables with prefix MP1_ 
+
  CREATE TABLE MP1_MM2 (NUMTEST NUMERIC(10));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE MP1_NN (NUMTEST NUMERIC(9));
@@ -58,6 +61,7 @@
 ij> CREATE TABLE MP5_TT (TESTTYPE CHAR(3), KOUNT DECIMAL(4));
 0 rows inserted/updated/deleted
 ij> -- The following tables are used to run interactive concurrency program pairs.
+
  CREATE TABLE TTT (ANUM NUMERIC(4) NOT NULL UNIQUE, AUTHOR CHAR(1));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE TT (DOLLARS NUMERIC(4), ANUM NUMERIC(4));
@@ -68,6 +72,7 @@
  CREATE TABLE BB (BNUM NUMERIC(4));
 0 rows inserted/updated/deleted
 ij> --O this is a dup of a table in a different schema...
+
 --  Test GRANT UPDATE for additional columns beyond those WITH GRANT OPTION.
 --  expect error message!
 --  In SCHEMA1 for USER HU is the following grant:
@@ -77,6 +82,8 @@
 --O   GRANT SELECT,UPDATE ON HU.STAFF3
 --O           TO SULLIVAN1
 --O           WITH GRANT OPTION
+
+
  CREATE TABLE MP6_MM2 (NUMTEST NUMERIC(10));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE MP6_NN (NUMTEST NUMERIC(9));
@@ -123,4 +130,4 @@
 0 rows inserted/updated/deleted
 ij> -- ************* End of Schema *************
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out Fri Oct 27 13:04:21 2006
@@ -5,7 +5,9 @@
 -- *******************************************************************
 -- ****** THIS FILE SHOULD BE RUN UNDER AUTHORIZATION ID FLATER ******
 -- *******************************************************************
+
 -- This is a standard schema definition.
+
 --0 CREATE SCHEMA AUTHORIZATION FLATER
  CREATE SCHEMA FLATER;
 0 rows inserted/updated/deleted
@@ -17,6 +19,7 @@
    -- is the Right Thing and ought to be required, but I speak only for
    -- myself.
    -- CREATE VIEW FR1 AS SELECT * FROM DV1
+
    CREATE TABLE CONCATBUF (ZZ CHAR(240));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE USIG (C1 INT, C_1 INT);
@@ -70,30 +73,38 @@
 --0   GRANT ALL PRIVILEGES ON BASE_WCOV TO SCHANZLE
 --0   GRANT ALL PRIVILEGES ON WCOV TO SCHANZLE
 --0   GRANT ALL PRIVILEGES ON VS1 TO SCHANZLE
+
+
    -- Test granting of privileges that we don't have to start with.
    -- We have GRANT OPTION, but we should not be able to grant unrestricted
    -- update on STAFF3 since our own update is restricted to two columns.
    -- Do not change SCHEMA1 to grant unrestricted update.
    -- * expect error message *
 --0   GRANT SELECT, UPDATE ON HU.STAFF3 TO SCHANZLE
+
    -- Same thing for views.
    -- * expect error message *
 --0   GRANT SELECT, UPDATE ON HU.VSTAFF3 TO SCHANZLE
+
    -- See whether GRANT ALL PRIVILEGES gives you GRANT OPTION.
    -- It should not.  GRANT OPTION is not technically a privilege.
    -- * expect error message *
 --0   GRANT SELECT ON CUGINI.BADG1 TO SCHANZLE
+
    -- See whether GRANT OPTION on a view gives you GRANT OPTION
    -- on the base table.
    -- * expect error message *
 --0   GRANT SELECT ON CUGINI.BADG2 TO SCHANZLE
+
    -- Delimited identifiers.
    CREATE VIEW "SULLIVAN.SELECT" ("sullivan.select") AS
      SELECT C1 FROM BASE_VS1;
 0 rows inserted/updated/deleted
 ij> --0   GRANT ALL PRIVILEGES ON "SULLIVAN.SELECT" TO SCHANZLE
+   
    -- Please be aware of the following errata; they are not being
    -- tested here.
+
    -- Check for erratum which allowed duplicate
    --   <unique constraint definition>s
    -- Reference ISO/IEC JTC1/SC21 N6789 section 11.7 SR7
@@ -103,9 +114,11 @@
    -- CREATE TABLE T0512 (C1 INT NOT NULL, C2 INT NOT NULL, C3 INT NOT NULL,
    --   UNIQUE (C1,C2), UNIQUE (C3), UNIQUE (C2,C1))
    CREATE TABLE T0512 (C1 INT NOT NULL, C2 INT NOT NULL, C3 INT NOT NULL,
-   UNIQUE (C1,C2), UNIQUE (C3), UNIQUE (C2,C1));
-ERROR 42Z93: Constraints 'xxxxGENERATED-IDxxxx' and 'xxxxGENERATED-IDxxxx' have the same set of columns, which is not allowed. 
+   CONSTRAINT T0512_C1C2 UNIQUE (C1,C2), UNIQUE (C3),
+   CONSTRAINT T0512_C2C1 UNIQUE (C2,C1));
+ERROR 42Z93: Constraints 'T0512_C2C1' and 'T0512_C1C2' have the same set of columns, which is not allowed. 
 ij> --0 PASS: if there was an error for a duplicate unique constraint
+
    -- Check for erratum which allowed recursive view definitions.
    -- Reference ISO/IEC JTC1/SC21 N6789 section 11.19 <view definition> SR4
    --   and Annex E #6
@@ -117,6 +130,8 @@
    SELECT T0513.C2, BASE_VS1.C1 FROM T0513, BASE_VS1;
 ERROR 42X05: Table/View 'T0513' does not exist.
 ij> --0 PASS: if an error is returned that the view is circular
+
 -- ************* End of Schema *************
+
 disconnect;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema8.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema8.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema8.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema8.out Fri Oct 27 13:04:21 2006
@@ -5,11 +5,15 @@
 -- ***************************************************************
 -- ****** THIS FILE SHOULD BE RUN UNDER AUTHORIZATION ID SUN *****
 -- ***************************************************************
+
 -- This file defines the base tables used in most of the CDR tests.
+
 -- This non-standard schema definition is provided so that
 -- implementations which require semicolons to terminate statements,
 -- but which are otherwise conforming, can still execute the
 -- remaining tests.
+
+
   CREATE SCHEMA
 --O      AUTHORIZATION SUN;
       SUN;
@@ -19,6 +23,7 @@
 ij> CREATE TABLE SUN.ECCO (C1 CHAR(2));
 0 rows inserted/updated/deleted
 ij> --O  CREATE TABLE ECCO (C1 CHAR(2));
+
   CREATE TABLE STAFF
    (EMPNUM   CHAR(3) NOT NULL,
     EMPNAME  CHAR(20),
@@ -50,7 +55,7 @@
     PTYPE    CHAR(6),
     BUDGET   DECIMAL(9),
     CITY     CHAR(15),
-    UNIQUE (PNUM));
+    CONSTRAINT PROJ3_UNIQUE UNIQUE (PNUM));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE WORKS3
    (EMPNUM   CHAR(3) NOT NULL,
@@ -79,44 +84,47 @@
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (GRADE > 0 AND GRADE < 20));
+                CONSTRAINT STAFF5_GRADE CHECK (GRADE > 0 AND GRADE < 20));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE STAFF6 (EMPNUM    CHAR(3) NOT NULL,
                 EMPNAME  CHAR(20),
-                GRADE DECIMAL(4) CHECK (GRADE > 0 AND GRADE < 20),
+                GRADE DECIMAL(4)
+                CONSTRAINT STAFF6_GRADE CHECK (GRADE > 0 AND GRADE < 20),
                 CITY   CHAR(15));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE STAFF7 (EMPNUM    CHAR(3) NOT NULL,
                 EMPNAME  CHAR(20),
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
-                PRIMARY KEY (EMPNUM),
-                CHECK (GRADE BETWEEN 1 AND 20));
+                CONSTRAINT STAFF7_PK  PRIMARY KEY (EMPNUM),
+                CONSTRAINT STAFF7_GRADE CHECK (GRADE BETWEEN 1 AND 20));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE STAFF8 (EMPNUM    CHAR(3) NOT NULL,
                 EMPNAME  CHAR(20),
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (EMPNAME IS NOT NULL));
+                CONSTRAINT STAFF8_EMPNAME CHECK (EMPNAME IS NOT NULL));
 0 rows inserted/updated/deleted
-ij> CREATE TABLE STAFF9 (EMPNUM    CHAR(3) NOT NULL PRIMARY KEY,
+ij> CREATE TABLE STAFF9 (EMPNUM    CHAR(3) NOT NULL
+                CONSTRAINT STAFF9_PK PRIMARY KEY,
                 EMPNAME  CHAR(20),
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
-                CHECK (EMPNAME NOT LIKE 'T%'));
+                CONSTRAINT STAFF9_EMPNAME CHECK (EMPNAME NOT LIKE 'T%'));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE STAFF10 (EMPNUM    CHAR(3) NOT NULL,
                 EMPNAME  CHAR(20),
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (GRADE NOT IN (5,22)));
+                CONSTRAINT STAFF10_GRADE CHECK (GRADE NOT IN (5,22)));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE STAFF11 (EMPNUM    CHAR(3) NOT NULL PRIMARY KEY,
                 EMPNAME  CHAR(20),
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
+                CONSTRAINT STAFF11_GRADE_EMPNAME
                 CHECK (GRADE NOT IN (5,22) 
                             AND EMPNAME NOT LIKE 'T%'));
 0 rows inserted/updated/deleted
@@ -125,6 +133,7 @@
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
+                CONSTRAINT STAFF12_GRADE_EMPNAME
                 CHECK (NOT GRADE IN (5,22) 
                             AND NOT EMPNAME LIKE 'T%'));
 0 rows inserted/updated/deleted
@@ -133,7 +142,7 @@
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (NOT EMPNAME IS NULL));
+                CONSTRAINT STAFF13_EMPNAME CHECK (NOT EMPNAME IS NULL));
 0 rows inserted/updated/deleted
 ij> CREATE TABLE STAFF15 (EMPNUM    CHAR(3),
                 EMPNAME  CHAR(20) NOT NULL,
@@ -367,6 +376,7 @@
 0 rows inserted/updated/deleted
 ij> -- The following tables, STAFF_M and PROJ_M reference each other.
      -- Table STAFF_M has a "forward reference" to PROJ_M.
+                              
      CREATE TABLE STAFF_M
         (EMPNUM   CHAR(3) NOT NULL,
          EMPNAME  CHAR(20),
@@ -390,6 +400,7 @@
           REFERENCES PROJ_M (PNUM);
 0 rows inserted/updated/deleted
 ij> --   The following table is self-referencing.
+
         CREATE TABLE STAFF_C
            (EMPNUM   CHAR(3) NOT NULL,
             EMPNAME  CHAR(20),
@@ -425,21 +436,26 @@
 --O               (SEX_CODE  CHAR(1)  DEFAULT 'F',
 --O                NICKNAME  CHAR(20) DEFAULT 'No nickname given',
 --O                INSURANCE1 CHAR(5)  DEFAULT 'basic');
+
 --O   CREATE TABLE EXACT_DEF
 --O               (BODY_TEMP NUMERIC(4,1) DEFAULT 98.6,
 --O                MAX_NUM   NUMERIC(5)   DEFAULT -55555,
 --O                MIN_NUM   DEC(6,6)     DEFAULT .000001);
+
 --O   CREATE TABLE APPROX_DEF
 --O               (X_COUNT   REAL DEFAULT 1.78E12,
 --O                Y_COUNT   REAL DEFAULT -9.99E10,
 --O                Z_COUNT   REAL DEFAULT 3.45E-11,
 --O                ZZ_COUNT  REAL DEFAULT -7.6777E-7);
+
 --O   CREATE TABLE SIZE_TAB
 --O               (COL1 CHAR(75)  DEFAULT 
 --O'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz0123456789012',
 --O                COL2 INTEGER   DEFAULT -999888777,
 --O                COL3 DEC(15,6) DEFAULT 987654321.123456,
 --O                COL4 REAL      DEFAULT -1.048576E22);   
+
+
    CREATE TABLE COMMODITY
          (C_NUM INTEGER NOT NULL,
           C_NAME CHAR(7) NOT NULL UNIQUE,
@@ -486,11 +502,13 @@
       REFERENCES T6118REF (COL1, COL2, COL4, COL3, COL5, COL6));
 0 rows inserted/updated/deleted
 ij> -- ********************** create view statements *****************
+
   CREATE VIEW TESTREPORT AS
     SELECT TESTNO, RESULT, TESTTYPE
     FROM HU.TESTREPORT;
 0 rows inserted/updated/deleted
 ij> --O    FROM TESTREPORT;
+
 --O   CREATE VIEW DOLLARS_PER_POUND (COMMODITY, UNIT_PRICE, FROM_DATE, TO_DATE)
 --O      AS SELECT COMMODITY.C_NAME, 
 --O                SUM(TOT_PRICE * DOLLAR_EQUIV) / SUM(UNITS * POUND_EQUIV),
@@ -501,13 +519,16 @@
 --O            AND C_TRANSACTION.MEASURE  = MEASURE_TABLE.MEASURE
 --O         GROUP BY COMMODITY.C_NAME
 --O         HAVING SUM(TOT_PRICE * DOLLAR_EQUIV) > 10000;
+
 -- View COST_PER_UNIT for OPTIONAL test 0403
 -- Remove view from schema if it causes errors.
+
 --O   CREATE VIEW COST_PER_UNIT
 --O     (COMMODITY, UNIT_PRICE, CURRENCY, MEASURE)
 --O      AS SELECT COMMODITY, UNIT_PRICE * POUND_EQUIV / DOLLAR_EQUIV,
 --O                CURRENCY, MEASURE
 --O            FROM DOLLARS_PER_POUND, CURRENCY_TABLE, MEASURE_TABLE;
+
         CREATE VIEW STAFF6_WITH_GRADES AS
                           SELECT EMPNUM,EMPNAME,GRADE,CITY
                           FROM STAFF6
@@ -515,23 +536,34 @@
   ;
 0 rows inserted/updated/deleted
 ij> --O                          WITH CHECK OPTION;
+
 -- ************** grant statements follow *************
 --O       GRANT SELECT ON SUN.ECCO TO PUBLIC;
+        
 --O        GRANT INSERT ON TESTREPORT
 --O             TO PUBLIC;
+
 --O        GRANT REFERENCES ON ACR_SCH_P TO SULLIVAN
 --O              WITH GRANT OPTION;
+        
 --O        GRANT ALL PRIVILEGES ON PROJ_P
 --O             TO SULLIVAN;
+
 --O        GRANT ALL PRIVILEGES ON T6118REF TO FLATER;
+
 --O        GRANT ALL PRIVILEGES ON T118 TO FLATER;
+
 --O        GRANT ALL PRIVILEGES ON T6 TO FLATER;
+
 --  Test GRANT without grant permission below.
 --  "WITH GRANT OPTION" purposefully omitted from SUN's GRANT. 
 --  Do not insert text "WITH GRANT OPTION"
+
 --O        GRANT REFERENCES ON STAFF_P
 --O             TO SULLIVAN;
+
 --O        GRANT REFERENCES (C_NUM) ON COMMODITY TO SCHANZLE;
+
 -- ************* End of Schema *************
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sdl012.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sdl012.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sdl012.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sdl012.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE SDL012
+
 -- SQL Test Suite, V6.0, Interactive SQL, sdl012.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION HU
    set schema HU;
 0 rows inserted/updated/deleted
@@ -12,22 +14,27 @@
 --------------------------------------------------------------------------------------------------------------------------------
 HU                                                                                                                              
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
 -- TEST:0148 CREATE Table with NOT NULL!
+
      INSERT INTO STAFF1(EMPNAME,GRADE,CITY)
             VALUES('Carmen',40,'Boston');
 ERROR 23502: Column 'EMPNUM'  cannot accept a NULL value.
 ij> -- PASS:0148 If ERROR, NOT NULL constraint, 0 rows inserted?
 -- NOTE:0148 Not Null Column EMPNUM is missing.
+
 --O      SELECT COUNT(*)
       SELECT *
            FROM STAFF1;
 EM&|EMPNAME             |GRADE|CITY           
 ----------------------------------------------
 ij> -- PASS:0148 If count = 0?
+
 -- restore
      ROLLBACK WORK;
 ij> -- END TEST >>> 0148 <<< 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/temp_cts5sch2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5sch2.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5sch2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5sch2.out Fri Oct 27 13:04:21 2006
@@ -205,6 +205,7 @@
 --O   TT2          TIME WITH TIME ZONE,
 --O   TS2          TIMESTAMP WITH TIME ZONE,
 --O   PRIMARY KEY (PK));
+    
   CREATE TABLE CL_DATA_TYPE
    (CL_CHAR CHAR(10),
     CL_NUM NUMERIC,
@@ -262,6 +263,7 @@
 --O      CONSTRAINT constr_3 REFERENCES TEST12849B
 --O      ON DELETE CASCADE,
 --O    CONSTRAINT constr_2 UNIQUE (col_str1, col_str2));
+
   CREATE TABLE T4
    (STR110 CHAR(110) NOT NULL,
     NUM6   NUMERIC(6) NOT NULL,
@@ -285,6 +287,8 @@
 --O   ( COLUN   NUMERIC(5) UNIQUE,
 --O     COLSTR1 CHAR(10)    CHARACTER SET CS,
 --O     COLSTR2 VARCHAR(10) CHARACTER SET CS);
+
+
   CREATE TABLE CL_STANDARD
    (
     COL_NUM1 NUMERIC(4),
@@ -305,12 +309,15 @@
 ij> --O  CREATE TABLE TAB734
 --O   ( CSTR1 NCHAR(10),
 --O     CSTR2 NCHAR VARYING(12));
+
+
 --O-- LATIN1 is not required by SQL-92 DWF 1996-02-21
 --O--  CREATE TABLE TABLATIN1
 --O--  ( COL1 CHARACTER(10) CHARACTER SET LATIN1,
 --O--    COL2 CHAR(12)      CHARACTER SET LATIN1,
 --O--    COL3 VARCHAR(15)   CHARACTER SET LATIN1,
 --O--    COL4 NUMERIC(5));
+
   CREATE TABLE ET
   (col1    CHAR(3),
    col2    CHAR(20),
@@ -330,6 +337,7 @@
 --O   colthu  INTEGER,
 --O   coltmu  INTEGER,
 --O   TT2     TIME WITH TIME ZONE);
+
   CREATE TABLE CONCATBUF (ZZ CHAR(240));
 0 rows inserted/updated/deleted
 ij> CREATE VIEW TESTREPORT AS
@@ -373,4 +381,4 @@
 --O
 --O-- ************* End of Schema *************
 commit;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5tab.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5tab.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5tab.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_cts5tab.out Fri Oct 27 13:04:21 2006
@@ -40,10 +40,12 @@
 --O
    DELETE FROM CTS1.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 CTS1.ECCO VALUES ('NL');
 1 row inserted/updated/deleted
 ij> DELETE FROM 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> INSERT INTO STAFF VALUES ('E1','Alice',12,'Deale');
 1 row inserted/updated/deleted
 ij> INSERT INTO STAFF VALUES ('E2','Betty',10,'Vienna');
@@ -56,6 +58,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM 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 WORKS VALUES  ('E1','P1',40);
 1 row inserted/updated/deleted
 ij> INSERT INTO WORKS VALUES  ('E1','P2',20);
@@ -82,6 +85,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM 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> INSERT INTO VTABLE VALUES(10,+20,30,40,10.50);
 1 row inserted/updated/deleted
 ij> INSERT INTO VTABLE VALUES(0,1,2,3,4.25);
@@ -92,6 +96,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM CTS1.STAFFb;
 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 CTS1.STAFFb VALUES (10000,'Fred',40,'P2','Vienna','M');
 1 row inserted/updated/deleted
 ij> INSERT INTO CTS1.STAFFb VALUES (10000,'Fred',40,'P2','Vienna','M');
@@ -118,6 +123,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM CTS1.STAFFa;
 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 CTS1.STAFFa VALUES (40,10000,'E6',2,'Fred');
 1 row inserted/updated/deleted
 ij> INSERT INTO CTS1.STAFFa VALUES (40,10000,'E6',2,'Fred');
@@ -144,6 +150,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM STAFFc;
 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 STAFFc VALUES ('E1','Alice',12,'Deale',NULL);
 1 row inserted/updated/deleted
 ij> INSERT INTO STAFFc VALUES ('E2','Betty',10,'Vienna','E1');
@@ -160,6 +167,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM STAFF_CTS2;
 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 STAFF_CTS2 VALUES ('E1','Alice',12,'Deale');
 1 row inserted/updated/deleted
 ij> INSERT INTO STAFF_CTS2 VALUES ('E1','Alice',12,'Deale');
@@ -178,6 +186,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM STAFF_CTS;
 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 STAFF_CTS VALUES ('P1','Deale',12,'Don');
 1 row inserted/updated/deleted
 ij> INSERT INTO STAFF_CTS VALUES ('P3','Vienna',10,'Betty');
@@ -190,6 +199,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM EMPLOYEES2;
 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 EMPLOYEES2 VALUES ('Atherton',1);
 1 row inserted/updated/deleted
 ij> INSERT INTO EMPLOYEES2 VALUES ('Botham',2);
@@ -206,6 +216,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM A;
 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 A VALUES (1, 15);
 1 row inserted/updated/deleted
 ij> INSERT INTO A VALUES (3, 17);
@@ -238,6 +249,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM TT;
 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 TT (TTA, TTC) VALUES (1, 99);
 1 row inserted/updated/deleted
 ij> INSERT INTO TT (TTA, TTB) VALUES (2, 98);
@@ -250,6 +262,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM TU;
 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 TU VALUES ('ab', 3);
 1 row inserted/updated/deleted
 ij> INSERT INTO TU (TUE) VALUES (5);
@@ -263,6 +276,7 @@
 ij> INSERT INTO TU VALUES ('gh', 11);
 1 row inserted/updated/deleted
 ij> --O   DELETE FROM TT2;
+
 --O   INSERT INTO TT2 VALUES (1,INTERVAL '17-3' YEAR TO MONTH,13);
 --O
 --O   INSERT INTO TT2 (TTA,TTB) VALUES (2,INTERVAL '5-6' YEAR TO MONTH);
@@ -275,6 +289,7 @@
 --O
    DELETE FROM TV;
 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 TV VALUES (1,'a');
 1 row inserted/updated/deleted
 ij> INSERT INTO TV VALUES (2,'b');
@@ -287,6 +302,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM TW;
 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 TW VALUES ('b',2);
 1 row inserted/updated/deleted
 ij> INSERT INTO TW VALUES ('g',1);
@@ -299,6 +315,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM TX;
 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 TX (TX1, TX3) VALUES (1, 'Susan');
 1 row inserted/updated/deleted
 ij> INSERT INTO TX (TX1, TX2) VALUES (2, 'lemon');
@@ -311,6 +328,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM TEST12849B;
 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 TEST12849B VALUES (1);
 1 row inserted/updated/deleted
 ij> INSERT INTO TEST12849B VALUES (2);
@@ -321,6 +339,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM TABX760;
 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 TABX760 VALUES (10,'SPYROS',25000);
 1 row inserted/updated/deleted
 ij> INSERT INTO TABX760 VALUES (11,'ALEXIS',18000);
@@ -347,29 +366,31 @@
 --O
 --O   INSERT INTO CTS1.TTIME3 VALUES (
 --O     1,TIME( '23:05:00'),TIME( '12:15:00-11:45'),
---O     TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:05'));
+--O     TIMESTAMP( '1995-07-07 08:15:00+03:05'));
 --O
 --O   INSERT INTO CTS1.TTIME3 VALUES(
 --O     2,TIME( '05:10:00'),TIME( '00:07:00+08:39'), 
---O     TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:05'));
+--O     TIMESTAMP( '2000-10-09 03:03:00+04:05'));
 --O
 --O   INSERT INTO CTS1.TTIME3 VALUES (
 --O     3,TIME( '12:11:00'),TIME( '23:19:00+10:32'), 
---O     TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:16'));
+--O     TIMESTAMP( '1997-01-16 12:17:00-12:16'));
 --O
 --O   INSERT INTO CTS1.TTIME3 VALUES (
 --O     4,TIME( '05:10:00'),TIME( '00:07:00+08:39'), 
---O     TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:05'));
+--O     TIMESTAMP( '2000-10-09 03:03:00+04:05'));
 --O
 --O   INSERT INTO CTS1.TTIME3 VALUES (
 --O     5,TIME( '17:39:00'),TIME( '08:28:00-11:45'), 
---O     TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:05'));
+--O     TIMESTAMP( '1994-12-31 20:00:00+04:05'));
 --O
 --O   INSERT INTO CTS1.TTIME3 VALUES (
 --O     6,TIME( '17:39:00'),TIME( '08:28:00-11:45'), 
---O     TIMESTAMP( 'xxxxxxFILTERED-TIMESTAMPxxxxx:05'));
+--O     TIMESTAMP( '1994-12-31 20:00:00+04:05'));
+
    DELETE FROM CL_STANDARD;
 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 CL_STANDARD VALUES (1000,'NICKOS',4000,'ATHENS');
 1 row inserted/updated/deleted
 ij> INSERT INTO CL_STANDARD VALUES (1001,'MARIA',4001,'RHODES');
@@ -382,6 +403,7 @@
 1 row inserted/updated/deleted
 ij> DELETE FROM TABLE728a;
 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 TABLE728a VALUES ('NICKOS','GEORGE');
 1 row inserted/updated/deleted
 ij> INSERT INTO TABLE728a VALUES ('HARRY','TANIA');
@@ -402,6 +424,7 @@
 --O
    DELETE FROM CL_DATA_TYPE;
 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 CL_DATA_TYPE VALUES ('GEORGE',1,10,100);
 1 row inserted/updated/deleted
 ij> INSERT INTO CL_DATA_TYPE VALUES ('NICK',2,20,200);
@@ -417,4 +440,4 @@
 ij> COMMIT WORK;
 ij> --O-- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_schem10.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_schem10.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_schem10.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/temp_schem10.out Fri Oct 27 13:04:21 2006
@@ -6,9 +6,13 @@
 -- ***************************************************************
 -- ****** THIS FILE SHOULD BE RUN UNDER AUTHORIZATION ID SCHANZLE 
 -- ***************************************************************
+
 -- This file defines base tables used in the CDR tests.
+
 -- This is a standard schema definition.
+
 -- Constraints:  column vs. column
+
    create schema SCHANZLE;
 0 rows inserted/updated/deleted
 ij> set schema SCHANZLE;
@@ -43,4 +47,4 @@
 ij> commit;
 ij> -- ************* End of Schema *************
 ;
-ij> 
+ij> 
\ No newline at end of file



Mime
View raw message