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 [7/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/xts701.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts701.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts701.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts701.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS701
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts701.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1              
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -14,20 +16,25 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:7004 Compound char. literal in <comparison predicate>!
+
    INSERT INTO T4
       VALUES
       ('This is the first compound character literal.',1,NULL,NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:7004 If 1 row inserted successfully?
+
    INSERT INTO T4
          VALUES('Second character literal.',2,NULL,NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:7004 If 1 row inserted successfully?
+
    INSERT INTO T4
          VALUES('Third character literal.',3,NULL,NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:7004 If 1 row inserted successfully?
+
    SELECT NUM6
          FROM   T4
          WHERE  STR110 = 'This is the compound ' ||
@@ -35,6 +42,7 @@
 NUM6   
 -------
 ij> -- PASS:7004 If 0 rows selected - no data condition?
+
    SELECT COUNT(*)
          FROM   T4
          WHERE  STR110 <> 'This is the first compound ' ||
@@ -43,6 +51,7 @@
 -----------
 2          
 ij> -- PASS:7004 If COUNT = 2?
+
    SELECT NUM6
          FROM   T4
          WHERE  NUM6 = 2 AND 
@@ -52,6 +61,7 @@
 -------
 2      
 ij> -- PASS:7004 If NUM6 = 2?
+
    SELECT NUM6
          FROM   T4
          WHERE  STR110 = 'Third character literal.' || --Comments here
@@ -60,6 +70,7 @@
 NUM6   
 -------
 ij> -- PASS:7004 If 0 rows selected - no data condition?
+
    SELECT NUM6
          FROM   T4
          WHERE  STR110 = 'First fragment' ||
@@ -69,6 +80,7 @@
 NUM6   
 -------
 ij> -- PASS:7004 If 0 rows selected - no data condition?
+
    SELECT NUM6
          FROM   T4
          WHERE  STR110 <= 'Second '    ||
@@ -80,6 +92,7 @@
 -------
 2      
 ij> -- PASS:7004 If NUM6 = 2?
+
    SELECT COUNT(*)
          FROM   T4
          WHERE  STR110 < 'An indifferent' || --Comments
@@ -89,6 +102,7 @@
 -----------
 0          
 ij> -- PASS:7004 If sum of this COUNT and the next COUNT = 3?
+
    SELECT COUNT(*)
          FROM   T4
          WHERE  STR110 >= 'An indifferent' || --Comments
@@ -98,6 +112,7 @@
 -----------
 3          
 ij> -- PASS:7004 If sum of this COUNT and the previous COUNT = 3?
+
    SELECT NUM6
          FROM   T4
          WHERE  STR110 = 'Second '     || 
@@ -110,6 +125,7 @@
 -------
 2      
 ij> -- PASS:7004 If NUM6 = 2?
+
    SELECT NUM6
          FROM   T4
          WHERE  NUM6 = 2 AND STR110 < 'Second '     || 
@@ -118,24 +134,31 @@
 NUM6   
 -------
 ij> -- PASS:7004 If 0 rows selected - no data condition?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7004 <<< END TEST
 -- *********************************************
+
 -- TEST:7005 Compound character literal as inserted value!
+
    INSERT INTO T4
      VALUES
 ('This is the first fragment of a compound character literal,' || --Comments
        ' and this is the second part.',11,NULL,'Compound '   || 
+          
       --Comments   
+                 
        'literal.');
 1 row inserted/updated/deleted
 ij> -- PASS:7005 If 1 row inserted successfully?
+
    INSERT INTO T4
          VALUES('This is a comp' || 
          'ound character literal,'   ||      
          ' in the second table row.',12,NULL,NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:7005 If 1 row inserted successfully?
+
    INSERT INTO T4
          VALUES('This is ' || 
          'a comp'       || 
@@ -144,12 +167,14 @@
          'acter lit' || -- Comments
          'eral, '  || 
      -- Comments        
+           
          'in the th' || 
          'ird ' || 
          'table ' || 
          'row.',13,NULL,NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:7005 If 1 row inserted successfully?
+
    SELECT STR110, COL4 FROM T4 WHERE NUM6 = 11;
 STR110                                                                                                        |COL4                
 -----------------------------------------------------------------------------------------------------------------------------------
@@ -157,12 +182,14 @@
 ij> -- PASS:7005 If STR110 = 'This is the first fragment of a compound
 --                character literal, and this is the second part.'?
 -- PASS:7005 If COL4 = 'Compound literal.'?
+
    SELECT STR110 FROM T4 WHERE  NUM6 = 12;
 STR110                                                                                                        
 --------------------------------------------------------------------------------------------------------------
 This is a compound character literal, in the second table row.                                                
 ij> -- PASS:7005 If STR110 = 'This is a compound character literal, in
 --                        the second table row.'?
+
    SELECT STR110
          FROM   T4
          WHERE  NUM6 = 13;
@@ -171,16 +198,23 @@
 This is a compound character literal, in the third table row.                                                 
 ij> -- PASS:7005 If STR110 = 'This is a compound character literal, in 
 --                        the third table row.'?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7005 <<< END TEST
 -- *********************************************
+
 -- TEST:7006 Compound character literal in a <select list>!
+
    SELECT 'First fragment of a compound character literal, ' || 
  --Comment1   
+     
+     
  --Comment2
      'and second part.',
 'This is the first fragment of a compound character literal,' || --...
      ' this is the second,' || 
+     
+
      ' and this is the third part.'
 --O              FROM   CTS1.ECCO;
               FROM   ECCO;
@@ -192,9 +226,10 @@
 -- PASS:7006 If 2nd value = 'This is the first fragment of a compound 
 --                         character literal, this is the second, and
 --                         this is the third part.'?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7006 <<< 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/xts729.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts729.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts729.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts729.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  XTS729
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts729.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -12,12 +14,15 @@
 --------------------------------------------------------------------------------------------------------------------------------
 CTS1                                                                                                                            
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
+
 -- date_time print
+
    ROLLBACK WORK;
 ij> -- TEST:7029 Column name with 19, 72 and 128 characters!
 -- NOTE:  If long lines are not supported by the ISQL interfac, an
 --        implementation defined line continuation format may be used
 -- Begin 19 character column names
+
    CREATE TABLE TESTA6439
         (COLUMNOFCHARACTERSA CHARACTER(10),
          columnofcharactersb CHARACTER(10),
@@ -25,12 +30,14 @@
          cOlUmNoFNUMERICss_1 NUMERIC(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:7029 If table created successfully?
+
    COMMIT WORK;
 ij> --O   INSERT INTO CTS1.TESTA6439
    INSERT INTO TESTA6439
          VALUES('ABCD','DCBA',1,9999);
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
    COMMIT WORK;
 ij> SELECT COLUMNOFCHARACTERSA, columnofcharactersb,
                 cOlUmNoFNUMERICss_0, cOlUmNoFNUMERICss_1
@@ -43,13 +50,16 @@
 -- PASS:7029 If columnofcharactersb = DCBA?
 -- PASS:7029 If cOlUmNoFNUMERICss_0 = 1?
 -- PASS:7029 If cOlUmNoFNUMERICss_1 = 9999?
+   
    COMMIT WORK;
 ij> --O   DROP TABLE TESTA6439 CASCADE;
    DROP TABLE TESTA6439 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7029 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- End 19 character column names
+
 -- Begin 30 character column names
    CREATE TABLE TESTB6439
 (COLUMNOFCHARACTERDATATYPE123a CHARACTER(3),
@@ -58,32 +68,38 @@
 CoLuMnOfNUMERIC123456789012_1 NUMERIC(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:7029 If table created successfully?
+
    COMMIT WORK;
 ij> --O   INSERT INTO CTS1.TESTB6439
    INSERT INTO TESTB6439
          VALUES('AA','BB',1,2);
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.TESTB6439
    INSERT INTO TESTB6439
          VALUES('CC','DD',3,4);
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.TESTB6439
    INSERT INTO TESTB6439
          VALUES('EE','FF',5,6);
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.TESTB6439
    INSERT INTO TESTB6439
          VALUES('GG','HH',7,8);
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.TESTB6439
    INSERT INTO TESTB6439
          VALUES('II','KK',9,0);
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   SELECT * FROM CTS1.TESTB6439
    SELECT * FROM TESTB6439
           ORDER BY cOlUmNoFNUMERIC123456789012_0;
@@ -101,6 +117,7 @@
 -- PASS:7029   If      EE   FF   5   6?
 -- PASS:7029   If      GG   HH   7   8?
 -- PASS:7029   If      II   KK   9   0?
+
 --O   SELECT  COLUMN_NAME, ORDINAL_POSITION
 --O         FROM INFORMATION_SCHEMA.COLUMNS
 --O         WHERE TABLE_SCHEMA = 'CTS1' AND TABLE_NAME = 'TESTB6439'
@@ -111,18 +128,22 @@
 --                         1234567890123456789012345678901234567890
 --                         1234567890123456789012345678901234567890123?
 -- PASS:7029 If row1,col2 = 1?
+
 -- PASS:7029 If r2,c1 = COLUMNOFCHARACTERDATATYPE12345678901234567890
 --                      1234567890123456789012345678901234567890
 --                      123456789012345678901234567890123456789012B?
 -- PASS:7029 If row2,col2 = 2?
+
 -- PASS:7029 If r3,c1 = COLUMNOFNUMERIC123456789012345678901234567890
 --                      1234567890123456789012345678901234567890
 --                      12345678901234567890123456789012345678901_0?
 -- PASS:7029 If row3,col2 = 3?
+
 -- PASS:7029 If r4,c1 = COLUMNOFNUMERIC123456789012345678901234567890
 --                      1234567890123456789012345678901234567890
 --                      12345678901234567890123456789012345678901_1?
 -- PASS:7029 If row4,col2 = 4?
+
    COMMIT WORK;
 ij> --O   ALTER TABLE CTS1.TESTB6439
    ALTER TABLE TESTB6439
@@ -130,12 +151,14 @@
 columnofcharacterdatatype123C CHAR(3);
 0 rows inserted/updated/deleted
 ij> -- PASS:7029 If table altered successfully?
+
    COMMIT WORK;
 ij> --O   INSERT INTO CTS1.TESTB6439
    INSERT INTO TESTB6439
          VALUES('TTT','TTT',100,100,'ADD');
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   SELECT * FROM CTS1.TESTB6439
    SELECT * FROM TESTB6439
          WHERE columnofcharacterdatatype123C = 'ADD';
@@ -143,35 +166,43 @@
 ----------------------------
 TTT |TTT |100   |100   |ADD 
 ij> -- PASS:7029 If 5 values =  TTT  TTT  100  100  ADD?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE TESTB6439 CASCADE;
    DROP TABLE TESTB6439 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7029 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- End 128 character column names
+
 -- Begin 72 character column names
+
    CREATE TABLE TESTC6439 (COLUMNOFCHARACTERSA CHAR(3),
 columnofcharacterdatatype123a
 CHAR(3));
 0 rows inserted/updated/deleted
 ij> -- PASS:7029 If table created successfully?
+
    COMMIT WORK;
 ij> --O   INSERT INTO CTS1.TESTC6439
    INSERT INTO TESTC6439
          VALUES('aaa','bbb');
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.TESTC6439
    INSERT INTO TESTC6439
          VALUES  ('ccc','ddd');
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.TESTC6439
    INSERT INTO TESTC6439
          VALUES('eee','fff');
 1 row inserted/updated/deleted
 ij> -- PASS:7029 If 1 row inserted successfully?
+
 --O   SELECT * FROM CTS1.TESTC6439
    SELECT * FROM TESTC6439
          ORDER BY COLUMNOFCHARACTERSA;
@@ -185,15 +216,18 @@
 -- PASS:7029 If    aaa    bbb?
 -- PASS:7029 If    ccc    ddd?
 -- PASS:7029 If    eee    fff? 
+
    COMMIT WORK;
 ij> --O   DROP TABLE TESTC6439 CASCADE;
    DROP TABLE TESTC6439 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7029 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- End 72 character column names
+
 -- END TEST >>> 7029 <<< 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/xts730.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts730.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts730.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts730.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS730
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts730.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema HU;
 0 rows inserted/updated/deleted
@@ -14,26 +16,33 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:7030 Table name with 19 characters - delimited!
+
    CREATE TABLE "LONGIDENTIFIERSAAAA" (TNUM NUMERIC(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE "longidentifiersaaab" (TNUM NUMERIC(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE "0""LONGIDENTIFIERS_1" (TNUM NUMERIC(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE "0""LONGIDENTIFIERS_2" (TNUM NUMERIC(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE "lngIDENTIFIER% .,()" (TNUM NUMERIC(5));
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table created successfully?
+
    COMMIT WORK;
 ij> --O   SELECT  COUNT(*)  
    SELECT   tablename 
@@ -61,6 +70,7 @@
 0"LONGIDENTIFIERS_2                                                                                                             
 lngIDENTIFIER% .,()                                                                                                             
 ij> -- PASS:7030 If COUNT = 5?
+
 --O   SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
 --O         WHERE TABLE_SCHEMA = 'CTS1' AND TABLE_TYPE = 'BASE TABLE'
 --O         AND ( TABLE_NAME = 'LONGIDENTIFIERSAAAA'
@@ -77,30 +87,36 @@
 -- PASS:7030 If   LONGIDENTIFIERSAAAA?
 -- PASS:7030 If   lngIDENTIFIER% .,()?
 -- PASS:7030 If   longidentifiersaaab?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE "LONGIDENTIFIERSAAAA" CASCADE;
    DROP TABLE "LONGIDENTIFIERSAAAA" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table dropped successfully?
+
 --O   DROP TABLE "longidentifiersaaab" CASCADE;
    DROP TABLE "longidentifiersaaab" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table dropped successfully?
+
 --O   DROP TABLE "0""LONGIDENTIFIERS_1" CASCADE;
    DROP TABLE "0""LONGIDENTIFIERS_1" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table dropped successfully?
+
 --O   DROP TABLE "0""LONGIDENTIFIERS_2" CASCADE;
    DROP TABLE "0""LONGIDENTIFIERS_2" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table dropped successfully?
+
 --O   DROP TABLE "lngIDENTIFIER% .,()" CASCADE;
    DROP TABLE "lngIDENTIFIER% .,()" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7030 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 7030 <<< 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/xts731.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts731.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts731.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts731.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS731
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts731.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 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:7031 View name with 69 and 128 characters - deliminited!
 -- NOTE:  If long lines are not supported by the ISQL interface, an
 --        implementation defined line continuation format may be used
+
 -- Begin 128 character view names
    CREATE VIEW "LONGIDENTIFIERSAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJKKKKKKKKKKAAAAAAAA" AS SELECT * FROM STAFF;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view created successfully?
+
    COMMIT WORK;
 ij> CREATE VIEW "longidentifiersaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhhiiiiiiiiiijjjjjjjjjjkkkkkkkkkkaaaaaaab" AS SELECT * FROM WORKS;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view created successfully?
+
    COMMIT WORK;
 ij> CREATE VIEW "0""LONGIDENTIFIERSWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWWWWWW_1" AS SELECT * FROM VTABLE;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view created successfully?
+
    COMMIT WORK;
 ij> CREATE VIEW "0""LONGIDENTIFIERSWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWWWWWW_2" AS SELECT * FROM STAFF_CTS;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view created successfully?
+
    COMMIT WORK;
 ij> CREATE VIEW "longIDENTIFIERSWWWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWW% .,()" AS SELECT CITY FROM STAFF;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view created successfully?
+
    COMMIT WORK;
 ij> --O   SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS
 --O               WHERE TABLE_SCHEMA = 'CTS1'
@@ -63,55 +72,68 @@
 -- PASS:7031 If TABLE_NAME = 'longidentifiersaaaaabbbbbbbbbbcccccccccc
 --                ddddddddddeeeeeeeeeeffffffffffgggggggggg
 --                hhhhhhhhhhiiiiiiiiiijjjjjjjjjjkkkkkkkkkkaaaaaaab'?
+
+
 --O   SELECT  COUNT(*) FROM INFORMATION_SCHEMA.VIEWS
 --O         WHERE TABLE_SCHEMA = 'CTS1'
 --O         AND TABLE_NAME = 'LONGIDENTIFIERSAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJKKKKKKKKKKAAAAAAAa';
 -- PASS:7031 If COUNT = 0?
+
 --O   SELECT  COUNT(*) FROM INFORMATION_SCHEMA.VIEWS
 --O         WHERE TABLE_SCHEMA = 'CTS1'
 --O         AND TABLE_NAME = 'longidentifiersaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhhiiiiiiiiiijjjjjjjjjjkkkkkkkkkkaaaaaaaX';
 -- PASS:7031 If COUNT = 0?
+
 --O   SELECT  COUNT(*) FROM INFORMATION_SCHEMA.VIEWS
 --O           WHERE TABLE_SCHEMA = 'CTS1'
 --O           AND TABLE_NAME = '0"LONGIDENTIFIERSWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWWWWWW_3';
 -- PASS:7031 If COUNT = 0?
+
 --O   SELECT  COUNT(*) FROM INFORMATION_SCHEMA.VIEWS
 --O           WHERE TABLE_SCHEMA = 'CTS1'
 --O           AND TABLE_NAME = 'longIDENTIFIERSWWWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWW% .,((';
 -- PASS:7031 If COUNT = 0?
+
    ROLLBACK WORK;
 ij> --O   DROP VIEW "LONGIDENTIFIERSAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJKKKKKKKKKKAAAAAAAA" CASCADE;
    DROP VIEW "LONGIDENTIFIERSAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJKKKKKKKKKKAAAAAAAA" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP VIEW "longidentifiersaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhhiiiiiiiiiijjjjjjjjjjkkkkkkkkkkaaaaaaab" CASCADE;
    DROP VIEW "longidentifiersaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhhiiiiiiiiiijjjjjjjjjjkkkkkkkkkkaaaaaaab" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP VIEW "0""LONGIDENTIFIERSWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWWWWWW_1" CASCADE;
    DROP VIEW "0""LONGIDENTIFIERSWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWWWWWW_1" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP VIEW "0""LONGIDENTIFIERSWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWWWWWW_2" CASCADE;
    DROP VIEW "0""LONGIDENTIFIERSWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWWWWWW_2" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP VIEW "longIDENTIFIERSWWWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWW% .,()" CASCADE;
    DROP VIEW "longIDENTIFIERSWWWWWAAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJWW% .,()" ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view dropped successfully?
+
    COMMIT WORK;
 ij> -- End 128 character view names
+
 -- Begin 69 character view names
    CREATE VIEW 
 "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ""69W"
    (MYCOUNT) AS SELECT COUNT (*) FROM WORKS;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view created successfully?
+
    COMMIT WORK;
 ij> SELECT * FROM
 "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ""69W"
@@ -120,12 +142,14 @@
 -----------
 12         
 ij> -- PASS:7031 If MYCOUNT = 12?
+
    COMMIT WORK;
 ij> CREATE VIEW 
 "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ""69S"
    (MYCOUNT) AS SELECT COUNT (*) FROM STAFF;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view created successfully?
+
    COMMIT WORK;
 ij> SELECT * FROM
 "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ""69S"
@@ -134,22 +158,26 @@
 -----------
 5          
 ij> -- PASS:7031 If MYCOUNT = 5? 
+
    COMMIT WORK;
 ij> DROP VIEW
 "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ""69W"
    ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view dropped successfully?
+
    COMMIT WORK;
 ij> DROP VIEW
 "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ""69S"
    ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7031 If view dropped successfully?
+
    COMMIT WORK;
 ij> -- End 69 character view names
+
 -- END TEST >>> 7031 <<< 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/xts740.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts740.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts740.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts740.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS740
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts740.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -14,66 +16,81 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:7040 COUNT(ALL <column name>) with Nulls in column!
+
    DELETE FROM EMPTY740;
 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:7040 If delete completed successfully?
+
    SELECT COUNT(ALL COL_1) 
          FROM EMPTY740;
 1          
 -----------
 0          
 ij> -- PASS:7040 If COUNT = 0?
+
    SELECT COUNT(COL_2) 
          FROM EMPTY740;
 1          
 -----------
 0          
 ij> -- PASS:7040 If COUNT = 0?
+
    SELECT COUNT(COL_3) 
          FROM EMPTY740;
 1          
 -----------
 0          
 ij> -- PASS:7040 If COUNT = 0?
+
    SELECT COUNT(COL_4) 
          FROM EMPTY740;
 1          
 -----------
 0          
 ij> -- PASS:7040 If COUNT = 0?
+
    SELECT COUNT(ALL COL_5)
          FROM EMPTY740;
 1          
 -----------
 0          
 ij> -- PASS:7040 If COUNT = 0?
+
    INSERT INTO EMPTY740 
          VALUES('NICKOS','NICK',NULL,116,TIME('09:30:30'));
 1 row inserted/updated/deleted
 ij> -- PASS:7040 If 1 row inserted successfully?
+
    INSERT INTO EMPTY740 
          VALUES('MARIA',NULL,NULL,NULL,TIME('15:43:52'));
 1 row inserted/updated/deleted
 ij> -- PASS:7040 If 1 row inserted successfully?
+
    INSERT INTO EMPTY740 
          VALUES('KILLER','BUCK',NULL,127,TIME('15:43:52'));
 1 row inserted/updated/deleted
 ij> -- PASS:7040 If 1 row inserted successfully?
+
    INSERT INTO EMPTY740 
          VALUES('JOYCE',NULL,NULL,17,TIME('12:53:13'));
 1 row inserted/updated/deleted
 ij> -- PASS:7040 If 1 row inserted successfully?
+
    INSERT INTO EMPTY740 
          VALUES('ANGIE','TREE',NULL,7,TIME('16:29:22'));
 1 row inserted/updated/deleted
 ij> -- PASS:7040 If 1 row inserted successfully?
+
    COMMIT WORK;
 ij> SELECT COUNT(COL_1) FROM EMPTY740;
 1          
 -----------
 5          
 ij> -- PASS:7040 If COUNT = 5?
+
    SELECT COUNT(ALL COL_2) FROM EMPTY740;
 1          
 -----------
@@ -81,6 +98,7 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:7040 If   COUNT = 3 and                                     ?
 -- PASS:7040      WARNING - null value eliminated in set function   ?
+
    SELECT COUNT(ALL COL_3) FROM EMPTY740;
 1          
 -----------
@@ -88,6 +106,7 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:7040 If   COUNT = 0 and                                     ?
 -- PASS:7040      WARNING - null value eliminated in set function   ?
+
    SELECT COUNT(ALL COL_4) FROM EMPTY740;
 1          
 -----------
@@ -95,18 +114,21 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:7040 If   COUNT = 4 and                                     ?
 -- PASS:7040      WARNING - null value eliminated in set function   ?
+
    SELECT COUNT(ALL COL_5) FROM EMPTY740;
 1          
 -----------
 5          
 ij> -- PASS:7040 If COUNT = 5?
+
    ROLLBACK WORK;
 ij> DELETE FROM EMPTY740;
 5 rows inserted/updated/deleted
 ij> -- PASS:7040 If deleted completed successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 7040 <<< 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/xts742.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts742.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts742.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts742.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS742
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts742.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -14,21 +16,26 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:7042 COUNT ALL <literal>!
+
    SELECT COUNT(ALL 115.5), COUNT(ALL 'ATHINA'), COUNT(ALL 255), 
          COUNT(*) FROM CL_DATA_TYPE;
 1          |2          |3          |4          
 -----------------------------------------------
 6          |6          |6          |6          
 ij> -- PASS:7042 If COUNTs are 6, 6, 6, 6?
+
 --O   INSERT INTO CTS1.CL_DATA_TYPE VALUES(NULL,55,225,10);
    INSERT INTO CL_DATA_TYPE VALUES(NULL,55,225,10);
 1 row inserted/updated/deleted
 ij> -- PASS:7042 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.CL_DATA_TYPE VALUES(NULL,15,140,NULL);
    INSERT INTO CL_DATA_TYPE VALUES(NULL,15,140,NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:7042 If 1 row inserted successfully?
+
    SELECT COUNT(*),COUNT(ALL 119), COUNT(ALL 'GIORGOS') ,
          COUNT(CL_CHAR),
          COUNT(CL_REAL) FROM CL_DATA_TYPE;
@@ -38,10 +45,12 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:7042 If COUNTs are 8, 8, 8, 6, 7?
 -- PASS:7042 If WARNING - null value eliminated in set function?
+
 --O   INSERT INTO CTS1.CL_DATA_TYPE VALUES(NULL,0,0,NULL);
    INSERT INTO CL_DATA_TYPE VALUES(NULL,0,0,NULL);
 1 row inserted/updated/deleted
 ij> -- PASS:7042 If 1 row inserted successfully?
+
    SELECT COUNT(*), COUNT(ALL 1000), COUNT(ALL 'STEFOS'),
          COUNT(CL_CHAR),
          COUNT(CL_REAL) FROM CL_DATA_TYPE;
@@ -51,9 +60,10 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:7042 If COUNTs = 9, 9, 9, 6, 7?
 -- PASS:7042 If WARNING - null value eliminated in set function?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7042 <<< 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/xts752.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts752.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts752.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts752.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS752
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts752.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -13,14 +15,18 @@
 CTS1                                                                                                                            
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
 --O   ROLLBACK WORK;
+
 -- date_time print
+
 -- TEST:7052 ALTER TABLE ADD TABLE CONSTRAINT!
+
    CREATE TABLE TAB752a
          (COL1 NUMERIC(5) NOT NULL,
           COL2 CHAR(15) NOT NULL UNIQUE,
           COL3 CHAR(15));
 0 rows inserted/updated/deleted
 ij> -- PASS:7052 If table created successfully?
+
    COMMIT WORK;
 ij> CREATE TABLE TAB752b
          (C1 NUMERIC(5) NOT NULL PRIMARY KEY,
@@ -28,48 +34,61 @@
           C3 CHAR(15));
 0 rows inserted/updated/deleted
 ij> -- PASS:7052 If table created successfully?
+
    COMMIT WORK;
 ij> --O   ALTER TABLE CTS1.TAB752a 
    ALTER TABLE TAB752a 
          ADD CONSTRAINT TA752a_PRKEY PRIMARY KEY(COL1);
 0 rows inserted/updated/deleted
 ij> -- PASS:7052 If table altered successfully?
+
    COMMIT WORK;
 ij> --O   SELECT COUNT(*) 
 --O         FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
 --O         WHERE TABLE_SCHEMA = 'CTS1' AND TABLE_NAME = 'TA752A'
 --O         AND CONSTRAINT_NAME = 'TA752A_PRKEY' AND COLUMN_NAME = 'COL1';
 -- PASS:7052 If COUNT = 1?
+
 --O   COMMIT WORK;
+
    ALTER TABLE TAB752b
       ADD CONSTRAINT TA752b_FKEY FOREIGN KEY(C2) 
       REFERENCES TAB752a(COL2);
 0 rows inserted/updated/deleted
 ij> -- PASS:7052 If table altered successfully?
+
 --O   COMMIT WORK;
+
 --O   SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
 --O       WHERE TABLE_SCHEMA = 'CTS1'
 --O       AND TABLE_NAME = 'TAB752B' 
 --O       AND CONSTRAINT_NAME = 'TA752B_FKEY' 
 --O       AND COLUMN_NAME = 'C2';
 -- PASS:7052 If COUNT = 1?
+
 --O   COMMIT WORK;
+
    ALTER TABLE TAB752a
      ADD CONSTRAINT COL3_CHECK CHECK 
      (COL3 IN ('ATHENS','CORFU','PYLOS'));
 0 rows inserted/updated/deleted
 ij> -- PASS:7052 If table altered successfully?
+
    COMMIT WORK;
 ij> INSERT INTO TAB752a VALUES(1000,'KILLER','PAROS');
 ERROR 23513: The check constraint 'COL3_CHECK' was violated while performing an INSERT or UPDATE on table 'CTS1.TAB752A'.
 ij> -- PASS:7052 If ERROR - integrity constraint violation?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE TAB752a CASCADE;
+
 --
 --HACK: we need to drop b before a since
 -- we don't support cascade on drop table
 --
+
 -- PASS:7052 If table dropped successfully?
+
    COMMIT WORK;
 ij> --O   DROP TABLE TAB752b CASCADE;
    DROP TABLE TAB752b ;
@@ -77,9 +96,10 @@
 ij> DROP TABLE TAB752a ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7052 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 7052 <<< 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/xts753.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts753.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts753.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts753.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS753
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts753.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -13,38 +15,49 @@
 CTS1                                                                                                                            
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
 --O   ROLLBACK WORK;
+
 -- date_time print
+
 -- TEST:7053 ALTER TABLE ADD COLUMN WITH <data type>!
+
    CREATE TABLE TAB753
          (COL1 DECIMAL(4),
           COL2 CHAR(10),
           COL3 CHAR(10));
 0 rows inserted/updated/deleted
 ij> -- PASS:7053 If table created successfully?
+
    COMMIT WORK;
 ij> ALTER TABLE TAB753 ADD COLUMN COL4 NUMERIC(7);
 0 rows inserted/updated/deleted
 ij> -- PASS:7053 If table altered successfully?
+
    COMMIT WORK;
 ij> --O   SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
 --O         WHERE TABLE_SCHEMA = 'CTS1' AND TABLE_NAME = 'TAB753'
 --O         AND COLUMN_NAME = 'COL4';
 -- PASS:7053 If COUNT = 1?
+
 --O   COMMIT WORK;
+
    ALTER TABLE TAB753 ADD COLUMN COL5 CHAR(7);
 0 rows inserted/updated/deleted
 ij> -- PASS:7053 If table altered successfully?
+
    COMMIT WORK;
 ij> --O   SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
 --O         WHERE TABLE_SCHEMA = 'CTS1' AND TABLE_NAME = 'TAB753'
 --O         AND COLUMN_NAME = 'COL5';
 -- PASS:7053 If COUNT = 1?
+
    INSERT INTO TAB753 VALUES(1000,'PHONE','NICKOS',12000,'blue');
 1 row inserted/updated/deleted
 ij> -- PASS:7053 If 1 row inserted?
+
    INSERT INTO TAB753 VALUES(1001,'HULME','CHEADLE',12001,'velvet');
 1 row inserted/updated/deleted
 ij> -- PASS:7053 If 1 row inserted?
+
    COMMIT WORK;
 ij> SELECT COL1,COL2,COL3,COL4,COL5
          FROM TAB753
@@ -58,14 +71,16 @@
 --               ====   ====    ====    ====     ====
 -- PASS:7053 If  1000   PHONE   NICKOS  12000    blue?
 -- PASS:7053 If  1001   HULME   CHEADLE 12001    velvet?
+
    ROLLBACK WORK;
 ij> --O   DROP TABLE TAB753 CASCADE;
    DROP TABLE TAB753 ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7053 If table dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 7053 <<< 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/xts760.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts760.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts760.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xts760.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE   XTS760
+
 -- SQL Test Suite, V6.0, Interactive SQL, xts760.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -14,27 +16,32 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:7060 MAX of column derived from <set function specification>!
+
    CREATE VIEW V000V AS
   SELECT DEPTNO, AVG(SALARY) AS AVSAL
 --O  FROM CTS1.TABX760 GROUP BY DEPTNO;
   FROM TABX760 GROUP BY DEPTNO;
 0 rows inserted/updated/deleted
 ij> -- PASS:7060 If view created successfully?
+
    COMMIT WORK;
 ij> SELECT MAX(AVSAL) FROM V000V;
 1              
 ---------------
 78000.0000     
 ij> -- PASS:7060 If MAX(avsal) is 78000?
+
    COMMIT WORK;
 ij> --O   DROP VIEW V000V CASCADE;
    DROP VIEW V000V ;
 0 rows inserted/updated/deleted
 ij> -- PASS:7060 If view dropped successfully?
+
    COMMIT WORK;
 ij> -- END TEST >>> 7060 <<< 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/yts796.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts796.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts796.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts796.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  YTS796  
+
 -- SQL Test Suite, V6.0, Interactive SQL, yts796.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 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:7530 <scalar subquery> as first operand in <comp pred>!
+
 --O   SELECT EMPNAME FROM STAFF WHERE
 --O    (SELECT EMPNUM FROM WORKS WHERE PNUM = 'P3')
    SELECT EMPNAME FROM HU.STAFF WHERE
@@ -24,6 +28,7 @@
 --------------------
 Alice               
 ij> -- PASS:7530 If empname = 'Alice'?
+
 --O   SELECT EMPNAME FROM STAFF WHERE 
 --O     (SELECT EMPNUM FROM WORKS WHERE PNUM = 'P4')
    SELECT EMPNAME FROM HU.STAFF WHERE 
@@ -31,9 +36,10 @@
      = EMPNUM;
 ERROR 21000: Scalar subquery is only allowed to return a single row.
 ij> -- PASS:7530 If ERROR - cardinality violation?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7530 <<< 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/yts797.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts797.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts797.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts797.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  YTS797  
+
 -- SQL Test Suite, V6.0, Interactive SQL, yts797.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1              
    set schema CTS1;
 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:7558 <scalar subquery> in SET of searched update!
+
    DELETE FROM TV;
 5 rows inserted/updated/deleted
 ij> INSERT INTO TV VALUES (1,'a');
@@ -49,6 +53,7 @@
 ERROR 21000: Scalar subquery is only allowed to return a single row.
 ij> -- PASS:7558 If ERROR - cardinality violation?
 --N new error messages are temporarily valid, till we implement this kind of update properly
+
 --O   UPDATE TV AS X
    UPDATE TV  
      SET B =
@@ -58,6 +63,7 @@
               AND TV.A = Y.A);
 5 rows inserted/updated/deleted
 ij> -- PASS:7558 If UPDATE completed successfully?
+
    SELECT B 
      FROM CTS1.TV
      WHERE A = 1;
@@ -65,6 +71,7 @@
 ----
 g   
 ij> -- PASS:7558 If B = 'g'?
+
    SELECT B 
      FROM CTS1.TV
      WHERE A = 2;
@@ -72,6 +79,7 @@
 ----
 NULL
 ij> -- PASS:7558 If B = NULL?
+
    SELECT B 
      FROM CTS1.TV
      WHERE A = 3;
@@ -79,6 +87,7 @@
 ----
 NULL
 ij> -- PASS:7558 If B = NULL?
+
    SELECT B 
      FROM CTS1.TV
      WHERE A = 4;
@@ -86,6 +95,7 @@
 ----
 h   
 ij> -- PASS:7558 If B = 'h'?
+
    SELECT B 
      FROM CTS1.TV
      WHERE A = 5;
@@ -93,9 +103,10 @@
 ----
 i   
 ij> -- PASS:7558 If B = 'i'?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7558 <<< 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/yts798.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts798.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts798.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts798.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  YTS798  
+
 -- SQL Test Suite, V6.0, Interactive SQL, yts798.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1              
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -38,7 +40,9 @@
 ij> INSERT INTO TW VALUES ('i',5);
 1 row inserted/updated/deleted
 ij> -- date_time print
+
 -- TEST:7559 <scalar subquery> in <select list> of single-row select!
+
    SELECT DISTINCT A,
             (SELECT D FROM TW
              WHERE E = X.A)
@@ -52,6 +56,7 @@
                       AND A = E);
 ERROR 21000: Scalar subquery is only allowed to return a single row.
 ij> -- PASS:7559 If ERROR - cardinality violation?
+
    SELECT DISTINCT A,
               (SELECT D FROM TW
                WHERE E = X.A)
@@ -62,6 +67,7 @@
 ----------------
 1          |g   
 ij> -- PASS:7559 If A = 1 and D = 'g'?
+
    SELECT DISTINCT A,
              (SELECT D FROM TW
               WHERE E = X.A)
@@ -72,9 +78,10 @@
 ----------------
 3          |NULL
 ij> -- PASS:7559 If A = 3 and D = NULL?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7559 <<< 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/yts799.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts799.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts799.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts799.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  YTS799  
+
 -- SQL Test Suite, V6.0, Interactive SQL, yts799.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1              
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -14,7 +16,10 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:7531 <subquery> as <row val constr> in <null predicate>!
+
+
    SELECT TTA, TTB, TTC FROM CTS1.TT
      WHERE (SELECT TUD FROM TU WHERE TU.TUE = TT.TTA)
      IS NULL ORDER BY TTA DESC;
@@ -29,6 +34,7 @@
 -- PASS:7531 If     5        42       26  ?
 -- PASS:7531 If     2        98       NULL?
 -- PASS:7531 If     1        NULL     99  ?
+
    SELECT TTA, TTB, TTC FROM CTS1.TT
      WHERE (SELECT TUD FROM TU WHERE TU.TUE = TT.TTA)
      IS NOT NULL ORDER BY TTA;
@@ -41,6 +47,7 @@
 --                 ====     ====     ====
 -- PASS:7531 If    3        97       96  ? 
 -- PASS:7531 If    4        NULL     NULL?
+
 --O   SELECT COUNT (*) FROM CTS1.TT
    SELECT * FROM CTS1.TT
      WHERE TTB IS NULL OR TTC IS NULL;
@@ -50,6 +57,7 @@
 2          |98         |NULL       
 4          |NULL       |NULL       
 ij> -- PASS:7531 If COUNT = 3?
+
 --O   SELECT COUNT (*) FROM CTS1.TT
    SELECT * FROM CTS1.TT
      WHERE TTB IS NOT NULL AND TTC IS NOT NULL;
@@ -58,6 +66,7 @@
 3          |97         |96         
 5          |42         |26         
 ij> -- PASS:7531 If COUNT = 2?
+
 --O   SELECT COUNT (*) FROM CTS1.TT
    SELECT * FROM CTS1.TT
      WHERE NOT (TTB IS NULL AND TTC IS NULL);
@@ -68,9 +77,10 @@
 3          |97         |96         
 5          |42         |26         
 ij> -- PASS:7531 If COUNT = 4?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7531 <<< 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/yts811.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts811.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts811.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts811.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  YTS811  
+
 -- SQL Test Suite, V6.0, Interactive SQL, yts811.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1
    set schema CTS1;
 0 rows inserted/updated/deleted
@@ -14,39 +16,47 @@
 ij> -- RERUN if USER value does not match preceding AUTHORIZATION comment
    ROLLBACK WORK;
 ij> -- date_time print
+
 -- TEST:7568 WHERE <search condition> referencing column!
+
    CREATE VIEW V_DATA_TYPE AS
      SELECT SUM(NUM) AS VT1, ING AS VT2, SMA AS VT3
      FROM DATA_TYPE
      GROUP BY ING, SMA;
 0 rows inserted/updated/deleted
 ij> -- PASS:7568 If view created successfully?
+
    COMMIT WORK;
 ij> --O   INSERT INTO CTS1.DATA_TYPE (ING, SMA) VALUES
    INSERT INTO DATA_TYPE (ING, SMA) VALUES
      (1,1);
 1 row inserted/updated/deleted
 ij> -- PASS:7568 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.DATA_TYPE (NUM, ING, SMA)
    INSERT INTO DATA_TYPE (NUM, ING, SMA)
      VALUES (2,2,3);
 1 row inserted/updated/deleted
 ij> -- PASS:7568 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.DATA_TYPE (NUM, ING, SMA)
    INSERT INTO DATA_TYPE (NUM, ING, SMA)
      VALUES (3,4,5);
 1 row inserted/updated/deleted
 ij> -- PASS:7568 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.DATA_TYPE (NUM, ING, SMA)
    INSERT INTO DATA_TYPE (NUM, ING, SMA)
      VALUES (2,2,3);
 1 row inserted/updated/deleted
 ij> -- PASS:7568 If 1 row inserted successfully?
+
 --O   INSERT INTO CTS1.DATA_TYPE (NUM, ING, SMA)
    INSERT INTO DATA_TYPE (NUM, ING, SMA)
      VALUES (5,4,3);
 1 row inserted/updated/deleted
 ij> -- PASS:7568 If 1 row inserted successfully?
+
    SELECT VT1, VT2, VT3
      FROM V_DATA_TYPE
      WHERE NOT VT1 = 0
@@ -64,6 +74,7 @@
 -- PASS:7568 If   4       2       3  ?
 -- PASS:7568 If   5       4       3  ?
 -- PASS:7568 If   3       4       5  ?
+
    SELECT VT1, VT2, VT3
      FROM V_DATA_TYPE WHERE VT2 = 1;
 VT1        |VT2        |VT3   
@@ -72,6 +83,7 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:7568 If WARNING - null value eliminated in set function?
 -- PASS:7568 If  NULL, 1, 1?
+
    SELECT SUM(NUM) 
      FROM DATA_TYPE
      WHERE NUM IS NOT NULL;
@@ -79,6 +91,7 @@
 -----------
 12         
 ij> -- PASS:7568 If SUM = 12?
+
    SELECT SUM(VT1) AS SUNTA1 
      FROM V_DATA_TYPE AS TB3;
 SUNTA1               
@@ -88,6 +101,7 @@
 WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:7568 If WARNING - null value eliminated in set function?
 -- PASS:7568 If SUM = 12?
+
    ROLLBACK WORK;
 ij> DROP VIEW V_DATA_TYPE;
 0 rows inserted/updated/deleted
@@ -96,4 +110,4 @@
 -- *********************************************
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts812.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts812.out?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts812.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/yts812.out Fri Oct 27 13:04:21 2006
@@ -1,8 +1,10 @@
 ij> AUTOCOMMIT OFF;
 ij> -- MODULE  YTS812  
+
 -- SQL Test Suite, V6.0, Interactive SQL, yts812.sql
 -- 59-byte ID
 -- TEd Version #
+
 -- AUTHORIZATION CTS1              
    set schema CTS1;
 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:7569 <null predicate> with concatenation in <row value constructor>!
+
 --O   SELECT COUNT (*)
    SELECT *
      FROM TX
@@ -25,6 +29,7 @@
 4          |melon|Peter     
 5          |peach|Matthew   
 ij> -- PASS:7569 If COUNT = 3?
+
    SELECT TX1 FROM TX
      WHERE TX3 || TX2 IS NULL;
 TX1        
@@ -34,9 +39,10 @@
 ij> -- PASS:7569 If 2 rows returned in any order?
 -- PASS:7569 If TX1 = 1?
 -- PASS:7569 If TX1 = 2?
+
    ROLLBACK WORK;
 ij> -- END TEST >>> 7569 <<< END TEST
 -- *********************************************
 -- *************************************************////END-OF-MODULE
 ;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties Fri Oct 27 13:04:21 2006
@@ -1,3 +1,3 @@
-suites=derbylang derbynetmats storeall xa derbytools jdbc20 jdbc40 jdk14 jdbcapi derbynetclientmats encryptionAll nist demo multi unit i18nTest upgrade
+suites=derbylang derbynetmats storeall xa derbytools jdbc20 jdbc40 jdk14 jdbcapi derbynetclientmats encryptionAll demo multi unit i18nTest upgrade
 derby.debug.true=enableBtreeConsistencyCheck
 derby.stream.error.logSeverityLevel=0

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java Fri Oct 27 13:04:21 2006
@@ -21,6 +21,7 @@
 */
 package org.apache.derbyTesting.functionTests.tests.lang;
 
+import org.apache.derbyTesting.functionTests.tests.nist.NistScripts;
 import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derbyTesting.junit.JDBC;
 
@@ -62,9 +63,13 @@
         suite.addTest(GroupByExpressionTest.suite());
         suite.addTest(MathTrigFunctionsTest.suite());
         suite.addTest(TimeHandlingTest.suite());
-        suite.addTest(VTITest.suite());        
+        suite.addTest(VTITest.suite());
         suite.addTest(XMLTypeAndOpsTest.suite());
         suite.addTest(XMLMissingClassesTest.suite());
+        
+        // Add the NIST suite in from the nist package since
+        // it is a SQL language related test.
+        suite.addTest(NistScripts.suite());
         
         // This test internally sets derby.database.sqlAuthorization to true
         // This property is not resettable and hence may affect other tests 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml114.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml114.sql?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml114.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml114.sql Fri Oct 27 13:04:21 2006
@@ -183,16 +183,16 @@
 -- TEST:0641 Feature 16, PRIMARY KEY enhancement (static)!
 
    CREATE TABLE FEAT16 (
-  EMPNUM INT NOT NULL PRIMARY KEY,
-  PNUM   INT  NOT NULL UNIQUE);
+  EMPNUM INT NOT NULL CONSTRAINT FEAT16_PK PRIMARY KEY,
+  PNUM   INT  NOT NULL CONSTRAINT FEAT16_PNUM UNIQUE);
 -- PASS:0641 If view is created?
 
    COMMIT WORK;
 
    CREATE TABLE BARNO (
   P1 INT NOT NULL, P2 CHAR NOT NULL, X1 INT NOT NULL, X2 CHAR NOT NULL,
-  UNIQUE (X2, X1),
-  PRIMARY KEY (P1, P2));
+  CONSTRAINT BARNO_UNIQUE UNIQUE (X2, X1),
+  CONSTRAINT BARNO_PK PRIMARY KEY (P1, P2));
 -- PASS:0641 If view is created?
 
    COMMIT WORK;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml160.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml160.sql?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml160.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/dml160.sql Fri Oct 27 13:04:21 2006
@@ -279,6 +279,3 @@
 --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';
-values TESTROUTINE.HAS_SECURITY_MANAGER();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema1.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema1.sql?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema1.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema1.sql Fri Oct 27 13:04:21 2006
@@ -23,7 +23,7 @@
   CREATE TABLE HU.ECCO (C1 CHAR(2));
 
   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));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema5.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema5.sql?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema5.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema5.sql Fri Oct 27 13:04:21 2006
@@ -105,7 +105,8 @@
    -- 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));
+   CONSTRAINT T0512_C1C2 UNIQUE (C1,C2), UNIQUE (C3),
+   CONSTRAINT T0512_C2C1 UNIQUE (C2,C1));
    --0 PASS: if there was an error for a duplicate unique constraint
 
    -- Check for erratum which allowed recursive view definitions.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema8.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema8.sql?view=diff&rev=468514&r1=468513&r2=468514
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema8.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/schema8.sql Fri Oct 27 13:04:21 2006
@@ -57,7 +57,7 @@
     PTYPE    CHAR(6),
     BUDGET   DECIMAL(9),
     CITY     CHAR(15),
-    UNIQUE (PNUM));
+    CONSTRAINT PROJ3_UNIQUE UNIQUE (PNUM));
 
 
   CREATE TABLE WORKS3
@@ -90,20 +90,21 @@
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (GRADE > 0 AND GRADE < 20));
+                CONSTRAINT STAFF5_GRADE CHECK (GRADE > 0 AND GRADE < 20));
 
 
         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));
 
         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));
 
 
         CREATE TABLE STAFF8 (EMPNUM    CHAR(3) NOT NULL,
@@ -111,14 +112,15 @@
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (EMPNAME IS NOT NULL));
+                CONSTRAINT STAFF8_EMPNAME CHECK (EMPNAME IS NOT NULL));
 
 
-        CREATE TABLE STAFF9 (EMPNUM    CHAR(3) NOT NULL PRIMARY KEY,
+        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%'));
 
 
         CREATE TABLE STAFF10 (EMPNUM    CHAR(3) NOT NULL,
@@ -126,13 +128,14 @@
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (GRADE NOT IN (5,22)));
+                CONSTRAINT STAFF10_GRADE CHECK (GRADE NOT IN (5,22)));
 
 
         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%'));
 
@@ -142,6 +145,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%'));
 
@@ -151,7 +155,7 @@
                 GRADE DECIMAL(4),
                 CITY   CHAR(15),
                 PRIMARY KEY (EMPNUM),
-                CHECK (NOT EMPNAME IS NULL));
+                CONSTRAINT STAFF13_EMPNAME CHECK (NOT EMPNAME IS NULL));
 
         CREATE TABLE STAFF15 (EMPNUM    CHAR(3),
                 EMPNAME  CHAR(20) NOT NULL,



Mime
View raw message