db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r369956 - in /db/derby/code/trunk: java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ java...
Date Tue, 17 Jan 2006 23:19:20 GMT
Author: fuzzylogic
Date: Tue Jan 17 15:19:09 2006
New Revision: 369956

URL: http://svn.apache.org/viewcvs?rev=369956&view=rev
Log:
DERBY-499: Fix metadata.java and syscat.sql in jdk131 vms.

Committed for Rick Hillegas <richard.hillegas@sun.com>

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/syscat.sql
    db/derby/code/trunk/tools/release/build.xml

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out?rev=369956&r1=369955&r2=369956&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out Tue Jan 17 15:19:09 2006
@@ -110,29 +110,29 @@
 SYSTRIGGERS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSTRIGGERS_INDEX3 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSVIEWS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
-ij> select TABLENAME, TABLETYPE from sys.systables;
+ij> select TABLENAME, TABLETYPE from sys.systables order by tablename;
 TABLENAME |&
 -----
-SYSCONGLOMERATES |S
-SYSTABLES |S
+SYSALIASES |S
+SYSCHECKS |S
+SYSCOLPERMS |S
 SYSCOLUMNS |S
-SYSSCHEMAS |S
+SYSCONGLOMERATES |S
 SYSCONSTRAINTS |S
-SYSKEYS |S
 SYSDEPENDS |S
-SYSALIASES |S
-SYSVIEWS |S
-SYSCHECKS |S
+SYSDUMMY1 |S
+SYSFILES |S
 SYSFOREIGNKEYS |S
+SYSKEYS |S
+SYSREQUIREDPERM |S
+SYSROUTINEPERMS |S
+SYSSCHEMAS |S
 SYSSTATEMENTS |S
-SYSFILES |S
-SYSTRIGGERS |S
 SYSSTATISTICS |S
-SYSDUMMY1 |S
 SYSTABLEPERMS |S
-SYSCOLPERMS |S
-SYSROUTINEPERMS |S
-SYSREQUIREDPERM |S
+SYSTABLES |S
+SYSTRIGGERS |S
+SYSVIEWS |S
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
 	columndatatype
@@ -324,29 +324,29 @@
 SYSVIEWS |1     
 ij> create table t (i int, s smallint);
 0 rows inserted/updated/deleted
-ij> select TABLENAME, TABLETYPE from sys.systables;
+ij> select TABLENAME, TABLETYPE from sys.systables order by tablename;
 TABLENAME |&
 -----
-SYSCONGLOMERATES |S
-SYSTABLES |S
+SYSALIASES |S
+SYSCHECKS |S
+SYSCOLPERMS |S
 SYSCOLUMNS |S
-SYSSCHEMAS |S
+SYSCONGLOMERATES |S
 SYSCONSTRAINTS |S
-SYSKEYS |S
 SYSDEPENDS |S
-SYSALIASES |S
-SYSVIEWS |S
-SYSCHECKS |S
+SYSDUMMY1 |S
+SYSFILES |S
 SYSFOREIGNKEYS |S
+SYSKEYS |S
+SYSREQUIREDPERM |S
+SYSROUTINEPERMS |S
+SYSSCHEMAS |S
 SYSSTATEMENTS |S
-SYSFILES |S
-SYSTRIGGERS |S
 SYSSTATISTICS |S
-SYSDUMMY1 |S
 SYSTABLEPERMS |S
-SYSCOLPERMS |S
-SYSROUTINEPERMS |S
-SYSREQUIREDPERM |S
+SYSTABLES |S
+SYSTRIGGERS |S
+SYSVIEWS |S
 T |T
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
@@ -544,32 +544,32 @@
 create table t234567890123456789012345678901234567890
 (c23456789012345678901234567890 int);
 0 rows inserted/updated/deleted
-ij> select TABLENAME from sys.systables where length(TABLENAME) > 30;
+ij> select TABLENAME from sys.systables where length(TABLENAME) > 30 order by tablename;
 TABLENAME                                                                                                                       
 -----
 T234567890123456789012345678901234567890                                                                                        
-ij> select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30;
+ij> select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30 order by columnname;
 COLUMNNAME                                                                                                                      
 -----
 ij> -- primary key
 create table primkey1 (c1 int not null constraint prim1 primary key);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
 ij> create table unnamed_primkey2 (c1 int not null primary key);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
 ij> create table primkey3 (c1 int not null, c2 int not null, constraint prim3 primary key(c2, c1));
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -577,7 +577,7 @@
 ij> create table uniquekey1 (c1 int not null constraint uniq1 unique);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -586,7 +586,7 @@
 ij> create table unnamed_uniquekey2 (c1 int not null unique);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -595,7 +595,7 @@
 ij> create table uniquekey3 (c1 int not null, c2 int not null, constraint uniq3 unique(c2, c1));
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -606,14 +606,14 @@
 create view dummyview as select * from t, uniquekey3;
 0 rows inserted/updated/deleted
 ij> select tablename from sys.systables t, sys.sysviews v
-where t.tableid = v.tableid;
+where t.tableid = v.tableid order by tablename;
 TABLENAME                                                                                                                       
 -----
 DUMMYVIEW                                                                                                                       
 ij> -- RESOLVE - add selects from sysdepends when simplified
 ----- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 ERROR X0Y79: Statement.executeUpdate() cannot be called with a statement that returns a ResultSet.
 ij> -- drop views
 drop view dummyview;
@@ -624,7 +624,7 @@
 0 rows inserted/updated/deleted
 ij> select columnname, columnnumber, columndatatype
 from sys.syscolumns
-where columnname IN ('DCOL', 'NCOL');
+where columnname IN ('DCOL', 'NCOL') order by columnname;
 COLUMNNAME |COLUMNNUMB& |COLUMNDATATYPE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 -----
 DCOL |1 |DECIMAL(5,2)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
@@ -636,7 +636,7 @@
 ij> -- index descriptor.
 select conglomeratename, descriptor
 from sys.sysconglomerates 
-where conglomeratename = 'DECIMAL_TAB_IDX';
+where conglomeratename = 'DECIMAL_TAB_IDX' order by conglomeratename;
 CONGLOMERATENAME |DESCRIPTOR                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
 -----
 DECIMAL_TAB_IDX |BTREE (1)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
@@ -644,7 +644,7 @@
 0 rows inserted/updated/deleted
 ij> -- referenced columns.
 select triggername, referencedcolumns
-from sys.systriggers;
+from sys.systriggers order by triggername;
 TRIGGERNAME |REFERENCEDCOLUMNS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 -----
 T1 |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
@@ -676,26 +676,26 @@
 0 rows inserted/updated/deleted
 ij> -- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 TABLENAME |2          
 -----
-SYSCONGLOMERATES |1          
-SYSTABLES |1          
+SYSALIASES |1          
+SYSCHECKS |1          
+SYSCOLPERMS |1          
 SYSCOLUMNS |1          
-SYSSCHEMAS |1          
+SYSCONGLOMERATES |1          
 SYSCONSTRAINTS |1          
-SYSKEYS |1          
 SYSDEPENDS |1          
-SYSALIASES |1          
-SYSVIEWS |1          
-SYSCHECKS |1          
+SYSFILES |1          
 SYSFOREIGNKEYS |1          
+SYSKEYS |1          
+SYSREQUIREDPERM |1          
+SYSROUTINEPERMS |1          
+SYSSCHEMAS |1          
 SYSSTATEMENTS |1          
-SYSFILES |1          
-SYSTRIGGERS |1          
 SYSSTATISTICS |1          
 SYSTABLEPERMS |1          
-SYSCOLPERMS |1          
-SYSROUTINEPERMS |1          
-SYSREQUIREDPERM |1          
+SYSTABLES |1          
+SYSTRIGGERS |1          
+SYSVIEWS |1          
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=369956&r1=369955&r2=369956&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Tue Jan 17 15:19:09 2006
@@ -407,43 +407,43 @@
 getCrossReference('','badschema','LOUIE','','APP','REFTAB' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 getTypeInfo():
-TYPE_NAME[VARCHAR],DATA_TYPE[SMALLINT],PRECISION[INTEGER],LITERAL_PREFIX[VARCHAR],LITERAL_SUFFIX[VARCHAR],CREATE_PARAMS[VARCHAR],NULLABLE[INTEGER],CASE_SENSITIVE[BOOLEAN],SEARCHABLE[INTEGER],UNSIGNED_ATTRIBUTE[BOOLEAN],FIXED_PREC_SCALE[BOOLEAN],AUTO_INCREMENT[BOOLEAN],LOCAL_TYPE_NAME[VARCHAR],MINIMUM_SCALE[INTEGER],MAXIMUM_SCALE[INTEGER],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],NUM_PREC_RADIX[INTEGER]
-BIGINT,-5,19,null,null,null,1,false,2,false,false,true,BIGINT,0,0,null,null,10
-LONG VARCHAR FOR BIT DATA,-4,32700,X',',null,1,false,2,true,false,false,LONG VARCHAR FOR BIT DATA,null,null,null,null,null
-VARCHAR () FOR BIT DATA,-3,32762,X',',length,1,false,2,true,false,false,VARCHAR () FOR BIT DATA,null,null,null,null,null
-CHAR () FOR BIT DATA,-2,254,X',',length,1,false,2,true,false,false,CHAR () FOR BIT DATA,null,null,null,null,null
-LONG VARCHAR,-1,32700,',',null,1,true,3,true,false,false,LONG VARCHAR,null,null,null,null,null
-LONG NVARCHAR,-1,32700,',',null,1,true,3,true,false,false,LONG NVARCHAR,null,null,null,null,null
-CHAR,1,254,',',length,1,true,3,true,false,false,CHAR,null,null,null,null,null
-NATIONAL CHAR,1,2147483647,',',length,1,true,3,true,false,false,NATIONAL CHAR,null,null,null,null,null
-NUMERIC,2,31,null,null,precision,scale,1,false,2,false,true,false,NUMERIC,0,32767,null,null,10
-DECIMAL,3,31,null,null,precision,scale,1,false,2,false,true,false,DECIMAL,0,32767,null,null,10
-INTEGER,4,10,null,null,null,1,false,2,false,false,true,INTEGER,0,0,null,null,10
-SMALLINT,5,5,null,null,null,1,false,2,false,false,true,SMALLINT,0,0,null,null,10
-FLOAT,6,52,null,null,precision,1,false,2,false,false,false,FLOAT,null,null,null,null,2
-REAL,7,23,null,null,null,1,false,2,false,false,false,REAL,null,null,null,null,2
-DOUBLE,8,52,null,null,null,1,false,2,false,false,false,DOUBLE,null,null,null,null,2
-VARCHAR,12,32672,',',length,1,true,3,true,false,false,VARCHAR,null,null,null,null,null
-NATIONAL CHAR VARYING,12,2147483647,',',length,1,true,3,true,false,false,NATIONAL CHAR VARYING,null,null,null,null,null
-DATE,91,10,DATE',',null,1,false,2,true,false,false,DATE,0,0,null,null,10
-TIME,92,8,TIME',',null,1,false,2,true,false,false,TIME,0,0,null,null,10
-TIMESTAMP,93,26,TIMESTAMP',',null,1,false,2,true,false,false,TIMESTAMP,0,6,null,null,10
-BLOB,2004,2147483647,null,null,length,1,false,1,null,false,null,BLOB,null,null,null,null,null
-CLOB,2005,2147483647,',',length,1,true,1,null,false,null,CLOB,null,null,null,null,null
+TYPE_NAME[VARCHAR],DATA_TYPE[SMALLINT],PRECISION[INTEGER],LITERAL_PREFIX[VARCHAR],LITERAL_SUFFIX[VARCHAR],CREATE_PARAMS[VARCHAR],NULLABLE[INTEGER],CASE_SENSITIVE[SMALLINT],SEARCHABLE[INTEGER],UNSIGNED_ATTRIBUTE[SMALLINT],FIXED_PREC_SCALE[SMALLINT],AUTO_INCREMENT[SMALLINT],LOCAL_TYPE_NAME[VARCHAR],MINIMUM_SCALE[INTEGER],MAXIMUM_SCALE[INTEGER],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],NUM_PREC_RADIX[INTEGER]
+BIGINT,-5,19,null,null,null,1,0,2,0,0,1,BIGINT,0,0,null,null,10
+LONG VARCHAR FOR BIT DATA,-4,32700,X',',null,1,0,2,1,0,0,LONG VARCHAR FOR BIT DATA,null,null,null,null,null
+VARCHAR () FOR BIT DATA,-3,32762,X',',length,1,0,2,1,0,0,VARCHAR () FOR BIT DATA,null,null,null,null,null
+CHAR () FOR BIT DATA,-2,254,X',',length,1,0,2,1,0,0,CHAR () FOR BIT DATA,null,null,null,null,null
+LONG VARCHAR,-1,32700,',',null,1,1,3,1,0,0,LONG VARCHAR,null,null,null,null,null
+LONG NVARCHAR,-1,32700,',',null,1,1,3,1,0,0,LONG NVARCHAR,null,null,null,null,null
+CHAR,1,254,',',length,1,1,3,1,0,0,CHAR,null,null,null,null,null
+NATIONAL CHAR,1,2147483647,',',length,1,1,3,1,0,0,NATIONAL CHAR,null,null,null,null,null
+NUMERIC,2,31,null,null,precision,scale,1,0,2,0,1,0,NUMERIC,0,32767,null,null,10
+DECIMAL,3,31,null,null,precision,scale,1,0,2,0,1,0,DECIMAL,0,32767,null,null,10
+INTEGER,4,10,null,null,null,1,0,2,0,0,1,INTEGER,0,0,null,null,10
+SMALLINT,5,5,null,null,null,1,0,2,0,0,1,SMALLINT,0,0,null,null,10
+FLOAT,6,52,null,null,precision,1,0,2,0,0,0,FLOAT,null,null,null,null,2
+REAL,7,23,null,null,null,1,0,2,0,0,0,REAL,null,null,null,null,2
+DOUBLE,8,52,null,null,null,1,0,2,0,0,0,DOUBLE,null,null,null,null,2
+VARCHAR,12,32672,',',length,1,1,3,1,0,0,VARCHAR,null,null,null,null,null
+NATIONAL CHAR VARYING,12,2147483647,',',length,1,1,3,1,0,0,NATIONAL CHAR VARYING,null,null,null,null,null
+DATE,91,10,DATE',',null,1,0,2,1,0,0,DATE,0,0,null,null,10
+TIME,92,8,TIME',',null,1,0,2,1,0,0,TIME,0,0,null,null,10
+TIMESTAMP,93,26,TIMESTAMP',',null,1,0,2,1,0,0,TIMESTAMP,0,6,null,null,10
+BLOB,2004,2147483647,null,null,length,1,0,1,null,0,null,BLOB,null,null,null,null,null
+CLOB,2005,2147483647,',',length,1,1,1,null,0,null,CLOB,null,null,null,null,null
 getIndexInfo():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[BOOLEAN],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
-,SYS,SYSCOLUMNS,false,,SYSCOLUMNS_INDEX1,3,1,REFERENCEID,A,null,null,null
-,SYS,SYSCOLUMNS,false,,SYSCOLUMNS_INDEX1,3,2,COLUMNNAME,A,null,null,null
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
+,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,1,REFERENCEID,A,null,null,null
+,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,2,COLUMNNAME,A,null,null,null
 getIndexInfo():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[BOOLEAN],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
-,SYS,SYSCOLUMNS,false,,SYSCOLUMNS_INDEX1,3,1,REFERENCEID,A,null,null,null
-,SYS,SYSCOLUMNS,false,,SYSCOLUMNS_INDEX1,3,2,COLUMNNAME,A,null,null,null
-,SYS,SYSCOLUMNS,true,,SYSCOLUMNS_INDEX2,3,1,COLUMNDEFAULTID,A,null,null,null
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
+,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,1,REFERENCEID,A,null,null,null
+,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,2,COLUMNNAME,A,null,null,null
+,SYS,SYSCOLUMNS,1,,SYSCOLUMNS_INDEX2,3,1,COLUMNDEFAULTID,A,null,null,null
 getIndexInfo():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[BOOLEAN],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
-,SYS,SYSTABLES,false,,SYSTABLES_INDEX1,3,1,TABLENAME,A,null,null,null
-,SYS,SYSTABLES,false,,SYSTABLES_INDEX1,3,2,SCHEMAID,A,null,null,null
-,SYS,SYSTABLES,false,,SYSTABLES_INDEX2,3,1,TABLEID,A,null,null,null
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
+,SYS,SYSTABLES,0,,SYSTABLES_INDEX1,3,1,TABLENAME,A,null,null,null
+,SYS,SYSTABLES,0,,SYSTABLES_INDEX1,3,2,SCHEMAID,A,null,null,null
+,SYS,SYSTABLES,0,,SYSTABLES_INDEX2,3,1,TABLEID,A,null,null,null
 getColumns('SYSTABLES'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[INTEGER],NUM_PREC_RADIX[INTEGER],NULLABLE[INTEGER],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out?rev=369956&r1=369955&r2=369956&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out Tue Jan 17 15:19:09 2006
@@ -110,29 +110,29 @@
 SYSTRIGGERS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSTRIGGERS_INDEX3 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSVIEWS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
-ij> select TABLENAME, TABLETYPE from sys.systables;
+ij> select TABLENAME, TABLETYPE from sys.systables order by tablename;
 TABLENAME |&
 -----
-SYSCONGLOMERATES |S
-SYSTABLES |S
+SYSALIASES |S
+SYSCHECKS |S
+SYSCOLPERMS |S
 SYSCOLUMNS |S
-SYSSCHEMAS |S
+SYSCONGLOMERATES |S
 SYSCONSTRAINTS |S
-SYSKEYS |S
 SYSDEPENDS |S
-SYSALIASES |S
-SYSVIEWS |S
-SYSCHECKS |S
+SYSDUMMY1 |S
+SYSFILES |S
 SYSFOREIGNKEYS |S
+SYSKEYS |S
+SYSREQUIREDPERM |S
+SYSROUTINEPERMS |S
+SYSSCHEMAS |S
 SYSSTATEMENTS |S
-SYSFILES |S
-SYSTRIGGERS |S
 SYSSTATISTICS |S
-SYSDUMMY1 |S
 SYSTABLEPERMS |S
-SYSCOLPERMS |S
-SYSROUTINEPERMS |S
-SYSREQUIREDPERM |S
+SYSTABLES |S
+SYSTRIGGERS |S
+SYSVIEWS |S
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
 	columndatatype
@@ -266,87 +266,87 @@
 from sys.systables t, sys.sysconglomerates c
 where t.TABLEID=c.TABLEID
 order by TABLENAME, ISINDEX;
-TABLENAME |ISIN&
+TABLENAME |ISIND&
 -----
-SYSALIASES |false
-SYSALIASES |true 
-SYSALIASES |true 
-SYSALIASES |true 
-SYSCHECKS |false
-SYSCHECKS |true 
-SYSCOLPERMS |false
-SYSCOLPERMS |true 
-SYSCOLUMNS |false
-SYSCOLUMNS |true 
-SYSCOLUMNS |true 
-SYSCONGLOMERATES |false
-SYSCONGLOMERATES |true 
-SYSCONGLOMERATES |true 
-SYSCONGLOMERATES |true 
-SYSCONSTRAINTS |false
-SYSCONSTRAINTS |true 
-SYSCONSTRAINTS |true 
-SYSCONSTRAINTS |true 
-SYSDEPENDS |false
-SYSDEPENDS |true 
-SYSDEPENDS |true 
-SYSDUMMY1 |false
-SYSFILES |false
-SYSFILES |true 
-SYSFILES |true 
-SYSFOREIGNKEYS |false
-SYSFOREIGNKEYS |true 
-SYSFOREIGNKEYS |true 
-SYSKEYS |false
-SYSKEYS |true 
-SYSREQUIREDPERM |false
-SYSREQUIREDPERM |true 
-SYSROUTINEPERMS |false
-SYSROUTINEPERMS |true 
-SYSSCHEMAS |false
-SYSSCHEMAS |true 
-SYSSCHEMAS |true 
-SYSSTATEMENTS |false
-SYSSTATEMENTS |true 
-SYSSTATEMENTS |true 
-SYSSTATISTICS |false
-SYSSTATISTICS |true 
-SYSTABLEPERMS |false
-SYSTABLEPERMS |true 
-SYSTABLES |false
-SYSTABLES |true 
-SYSTABLES |true 
-SYSTRIGGERS |false
-SYSTRIGGERS |true 
-SYSTRIGGERS |true 
-SYSTRIGGERS |true 
-SYSVIEWS |false
-SYSVIEWS |true 
+SYSALIASES |0     
+SYSALIASES |1     
+SYSALIASES |1     
+SYSALIASES |1     
+SYSCHECKS |0     
+SYSCHECKS |1     
+SYSCOLPERMS |0     
+SYSCOLPERMS |1     
+SYSCOLUMNS |0     
+SYSCOLUMNS |1     
+SYSCOLUMNS |1     
+SYSCONGLOMERATES |0     
+SYSCONGLOMERATES |1     
+SYSCONGLOMERATES |1     
+SYSCONGLOMERATES |1     
+SYSCONSTRAINTS |0     
+SYSCONSTRAINTS |1     
+SYSCONSTRAINTS |1     
+SYSCONSTRAINTS |1     
+SYSDEPENDS |0     
+SYSDEPENDS |1     
+SYSDEPENDS |1     
+SYSDUMMY1 |0     
+SYSFILES |0     
+SYSFILES |1     
+SYSFILES |1     
+SYSFOREIGNKEYS |0     
+SYSFOREIGNKEYS |1     
+SYSFOREIGNKEYS |1     
+SYSKEYS |0     
+SYSKEYS |1     
+SYSREQUIREDPERM |0     
+SYSREQUIREDPERM |1     
+SYSROUTINEPERMS |0     
+SYSROUTINEPERMS |1     
+SYSSCHEMAS |0     
+SYSSCHEMAS |1     
+SYSSCHEMAS |1     
+SYSSTATEMENTS |0     
+SYSSTATEMENTS |1     
+SYSSTATEMENTS |1     
+SYSSTATISTICS |0     
+SYSSTATISTICS |1     
+SYSTABLEPERMS |0     
+SYSTABLEPERMS |1     
+SYSTABLES |0     
+SYSTABLES |1     
+SYSTABLES |1     
+SYSTRIGGERS |0     
+SYSTRIGGERS |1     
+SYSTRIGGERS |1     
+SYSTRIGGERS |1     
+SYSVIEWS |0     
+SYSVIEWS |1     
 ij> create table t (i int, s smallint);
 0 rows inserted/updated/deleted
-ij> select TABLENAME, TABLETYPE from sys.systables;
+ij> select TABLENAME, TABLETYPE from sys.systables order by tablename;
 TABLENAME |&
 -----
-SYSCONGLOMERATES |S
-SYSTABLES |S
+SYSALIASES |S
+SYSCHECKS |S
+SYSCOLPERMS |S
 SYSCOLUMNS |S
-SYSSCHEMAS |S
+SYSCONGLOMERATES |S
 SYSCONSTRAINTS |S
-SYSKEYS |S
 SYSDEPENDS |S
-SYSALIASES |S
-SYSVIEWS |S
-SYSCHECKS |S
+SYSDUMMY1 |S
+SYSFILES |S
 SYSFOREIGNKEYS |S
+SYSKEYS |S
+SYSREQUIREDPERM |S
+SYSROUTINEPERMS |S
+SYSSCHEMAS |S
 SYSSTATEMENTS |S
-SYSFILES |S
-SYSTRIGGERS |S
 SYSSTATISTICS |S
-SYSDUMMY1 |S
 SYSTABLEPERMS |S
-SYSCOLPERMS |S
-SYSROUTINEPERMS |S
-SYSREQUIREDPERM |S
+SYSTABLES |S
+SYSTRIGGERS |S
+SYSVIEWS |S
 T |T
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
@@ -483,93 +483,93 @@
 from sys.systables t, sys.sysconglomerates c
 where t.TABLEID=c.TABLEID
 order by TABLENAME, ISINDEX;
-TABLENAME |ISIN&
+TABLENAME |ISIND&
 -----
-SYSALIASES |false
-SYSALIASES |true 
-SYSALIASES |true 
-SYSALIASES |true 
-SYSCHECKS |false
-SYSCHECKS |true 
-SYSCOLPERMS |false
-SYSCOLPERMS |true 
-SYSCOLUMNS |false
-SYSCOLUMNS |true 
-SYSCOLUMNS |true 
-SYSCONGLOMERATES |false
-SYSCONGLOMERATES |true 
-SYSCONGLOMERATES |true 
-SYSCONGLOMERATES |true 
-SYSCONSTRAINTS |false
-SYSCONSTRAINTS |true 
-SYSCONSTRAINTS |true 
-SYSCONSTRAINTS |true 
-SYSDEPENDS |false
-SYSDEPENDS |true 
-SYSDEPENDS |true 
-SYSDUMMY1 |false
-SYSFILES |false
-SYSFILES |true 
-SYSFILES |true 
-SYSFOREIGNKEYS |false
-SYSFOREIGNKEYS |true 
-SYSFOREIGNKEYS |true 
-SYSKEYS |false
-SYSKEYS |true 
-SYSREQUIREDPERM |false
-SYSREQUIREDPERM |true 
-SYSROUTINEPERMS |false
-SYSROUTINEPERMS |true 
-SYSSCHEMAS |false
-SYSSCHEMAS |true 
-SYSSCHEMAS |true 
-SYSSTATEMENTS |false
-SYSSTATEMENTS |true 
-SYSSTATEMENTS |true 
-SYSSTATISTICS |false
-SYSSTATISTICS |true 
-SYSTABLEPERMS |false
-SYSTABLEPERMS |true 
-SYSTABLES |false
-SYSTABLES |true 
-SYSTABLES |true 
-SYSTRIGGERS |false
-SYSTRIGGERS |true 
-SYSTRIGGERS |true 
-SYSTRIGGERS |true 
-SYSVIEWS |false
-SYSVIEWS |true 
-T |false
+SYSALIASES |0     
+SYSALIASES |1     
+SYSALIASES |1     
+SYSALIASES |1     
+SYSCHECKS |0     
+SYSCHECKS |1     
+SYSCOLPERMS |0     
+SYSCOLPERMS |1     
+SYSCOLUMNS |0     
+SYSCOLUMNS |1     
+SYSCOLUMNS |1     
+SYSCONGLOMERATES |0     
+SYSCONGLOMERATES |1     
+SYSCONGLOMERATES |1     
+SYSCONGLOMERATES |1     
+SYSCONSTRAINTS |0     
+SYSCONSTRAINTS |1     
+SYSCONSTRAINTS |1     
+SYSCONSTRAINTS |1     
+SYSDEPENDS |0     
+SYSDEPENDS |1     
+SYSDEPENDS |1     
+SYSDUMMY1 |0     
+SYSFILES |0     
+SYSFILES |1     
+SYSFILES |1     
+SYSFOREIGNKEYS |0     
+SYSFOREIGNKEYS |1     
+SYSFOREIGNKEYS |1     
+SYSKEYS |0     
+SYSKEYS |1     
+SYSREQUIREDPERM |0     
+SYSREQUIREDPERM |1     
+SYSROUTINEPERMS |0     
+SYSROUTINEPERMS |1     
+SYSSCHEMAS |0     
+SYSSCHEMAS |1     
+SYSSCHEMAS |1     
+SYSSTATEMENTS |0     
+SYSSTATEMENTS |1     
+SYSSTATEMENTS |1     
+SYSSTATISTICS |0     
+SYSSTATISTICS |1     
+SYSTABLEPERMS |0     
+SYSTABLEPERMS |1     
+SYSTABLES |0     
+SYSTABLES |1     
+SYSTABLES |1     
+SYSTRIGGERS |0     
+SYSTRIGGERS |1     
+SYSTRIGGERS |1     
+SYSTRIGGERS |1     
+SYSVIEWS |0     
+SYSVIEWS |1     
+T |0     
 ij> -- > 30 char table and column names
 create table t234567890123456789012345678901234567890
 (c23456789012345678901234567890 int);
 0 rows inserted/updated/deleted
-ij> select TABLENAME from sys.systables where length(TABLENAME) > 30;
+ij> select TABLENAME from sys.systables where length(TABLENAME) > 30 order by tablename;
 TABLENAME                                                                                                                       
 -----
 T234567890123456789012345678901234567890                                                                                        
-ij> select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30;
+ij> select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30 order by columnname;
 COLUMNNAME                                                                                                                      
 -----
 ij> -- primary key
 create table primkey1 (c1 int not null constraint prim1 primary key);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
 ij> create table unnamed_primkey2 (c1 int not null primary key);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
 ij> create table primkey3 (c1 int not null, c2 int not null, constraint prim3 primary key(c2, c1));
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -577,7 +577,7 @@
 ij> create table uniquekey1 (c1 int not null constraint uniq1 unique);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -586,7 +586,7 @@
 ij> create table unnamed_uniquekey2 (c1 int not null unique);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -595,7 +595,7 @@
 ij> create table uniquekey3 (c1 int not null, c2 int not null, constraint uniq3 unique(c2, c1));
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME |&
 -----
 PRIM1 |P
@@ -606,35 +606,35 @@
 create view dummyview as select * from t, uniquekey3;
 0 rows inserted/updated/deleted
 ij> select tablename from sys.systables t, sys.sysviews v
-where t.tableid = v.tableid;
+where t.tableid = v.tableid order by tablename;
 TABLENAME                                                                                                                       
 -----
 DUMMYVIEW                                                                                                                       
 ij> -- RESOLVE - add selects from sysdepends when simplified
 ----- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 TABLENAME |2          
 -----
-SYSCONGLOMERATES |1          
-SYSTABLES |1          
+SYSALIASES |1          
+SYSCHECKS |1          
+SYSCOLPERMS |1          
 SYSCOLUMNS |1          
-SYSSCHEMAS |1          
+SYSCONGLOMERATES |1          
 SYSCONSTRAINTS |1          
-SYSKEYS |1          
 SYSDEPENDS |1          
-SYSALIASES |1          
-SYSVIEWS |1          
-SYSCHECKS |1          
+SYSFILES |1          
 SYSFOREIGNKEYS |1          
+SYSKEYS |1          
+SYSREQUIREDPERM |1          
+SYSROUTINEPERMS |1          
+SYSSCHEMAS |1          
 SYSSTATEMENTS |1          
-SYSFILES |1          
-SYSTRIGGERS |1          
 SYSSTATISTICS |1          
 SYSTABLEPERMS |1          
-SYSCOLPERMS |1          
-SYSROUTINEPERMS |1          
-SYSREQUIREDPERM |1          
+SYSTABLES |1          
+SYSTRIGGERS |1          
+SYSVIEWS |1          
 ij> -- drop views
 drop view dummyview;
 0 rows inserted/updated/deleted
@@ -644,7 +644,7 @@
 0 rows inserted/updated/deleted
 ij> select columnname, columnnumber, columndatatype
 from sys.syscolumns
-where columnname IN ('DCOL', 'NCOL');
+where columnname IN ('DCOL', 'NCOL') order by columnname;
 COLUMNNAME |COLUMNNUMB& |COLUMNDATATYPE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 -----
 DCOL |1 |DECIMAL(5,2)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
@@ -656,7 +656,7 @@
 ij> -- index descriptor.
 select conglomeratename, descriptor
 from sys.sysconglomerates 
-where conglomeratename = 'DECIMAL_TAB_IDX';
+where conglomeratename = 'DECIMAL_TAB_IDX' order by conglomeratename;
 CONGLOMERATENAME |DESCRIPTOR                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
 -----
 DECIMAL_TAB_IDX |BTREE (1)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
@@ -664,7 +664,7 @@
 0 rows inserted/updated/deleted
 ij> -- referenced columns.
 select triggername, referencedcolumns
-from sys.systriggers;
+from sys.systriggers order by triggername;
 TRIGGERNAME |REFERENCEDCOLUMNS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 -----
 T1 |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
@@ -696,26 +696,26 @@
 0 rows inserted/updated/deleted
 ij> -- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 TABLENAME |2          
 -----
-SYSCONGLOMERATES |1          
-SYSTABLES |1          
+SYSALIASES |1          
+SYSCHECKS |1          
+SYSCOLPERMS |1          
 SYSCOLUMNS |1          
-SYSSCHEMAS |1          
+SYSCONGLOMERATES |1          
 SYSCONSTRAINTS |1          
-SYSKEYS |1          
 SYSDEPENDS |1          
-SYSALIASES |1          
-SYSVIEWS |1          
-SYSCHECKS |1          
+SYSFILES |1          
 SYSFOREIGNKEYS |1          
+SYSKEYS |1          
+SYSREQUIREDPERM |1          
+SYSROUTINEPERMS |1          
+SYSSCHEMAS |1          
 SYSSTATEMENTS |1          
-SYSFILES |1          
-SYSTRIGGERS |1          
 SYSSTATISTICS |1          
 SYSTABLEPERMS |1          
-SYSCOLPERMS |1          
-SYSROUTINEPERMS |1          
-SYSREQUIREDPERM |1          
+SYSTABLES |1          
+SYSTRIGGERS |1          
+SYSVIEWS |1          
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out?rev=369956&r1=369955&r2=369956&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out Tue Jan 17 15:19:09 2006
@@ -110,29 +110,29 @@
 SYSTRIGGERS_INDEX2                                                                                                              |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSTRIGGERS_INDEX3                                                                                                              |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSVIEWS_INDEX1                                                                                                                 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
-ij> select TABLENAME, TABLETYPE from sys.systables;
+ij> select TABLENAME, TABLETYPE from sys.systables order by tablename;
 TABLENAME                                                                                                                       |&
 ----------------------------------------------------------------------------------------------------------------------------------
-SYSCONGLOMERATES                                                                                                                |S
-SYSTABLES                                                                                                                       |S
+SYSALIASES                                                                                                                      |S
+SYSCHECKS                                                                                                                       |S
+SYSCOLPERMS                                                                                                                     |S
 SYSCOLUMNS                                                                                                                      |S
-SYSSCHEMAS                                                                                                                      |S
+SYSCONGLOMERATES                                                                                                                |S
 SYSCONSTRAINTS                                                                                                                  |S
-SYSKEYS                                                                                                                         |S
 SYSDEPENDS                                                                                                                      |S
-SYSALIASES                                                                                                                      |S
-SYSVIEWS                                                                                                                        |S
-SYSCHECKS                                                                                                                       |S
+SYSDUMMY1                                                                                                                       |S
+SYSFILES                                                                                                                        |S
 SYSFOREIGNKEYS                                                                                                                  |S
+SYSKEYS                                                                                                                         |S
+SYSREQUIREDPERM                                                                                                                 |S
+SYSROUTINEPERMS                                                                                                                 |S
+SYSSCHEMAS                                                                                                                      |S
 SYSSTATEMENTS                                                                                                                   |S
-SYSFILES                                                                                                                        |S
-SYSTRIGGERS                                                                                                                     |S
 SYSSTATISTICS                                                                                                                   |S
-SYSDUMMY1                                                                                                                       |S
 SYSTABLEPERMS                                                                                                                   |S
-SYSCOLPERMS                                                                                                                     |S
-SYSROUTINEPERMS                                                                                                                 |S
-SYSREQUIREDPERM                                                                                                                 |S
+SYSTABLES                                                                                                                       |S
+SYSTRIGGERS                                                                                                                     |S
+SYSVIEWS                                                                                                                        |S
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
 	columndatatype
@@ -324,29 +324,29 @@
 SYSVIEWS                                                                                                                        |true 
 ij> create table t (i int, s smallint);
 0 rows inserted/updated/deleted
-ij> select TABLENAME, TABLETYPE from sys.systables;
+ij> select TABLENAME, TABLETYPE from sys.systables order by tablename;
 TABLENAME                                                                                                                       |&
 ----------------------------------------------------------------------------------------------------------------------------------
-SYSCONGLOMERATES                                                                                                                |S
-SYSTABLES                                                                                                                       |S
+SYSALIASES                                                                                                                      |S
+SYSCHECKS                                                                                                                       |S
+SYSCOLPERMS                                                                                                                     |S
 SYSCOLUMNS                                                                                                                      |S
-SYSSCHEMAS                                                                                                                      |S
+SYSCONGLOMERATES                                                                                                                |S
 SYSCONSTRAINTS                                                                                                                  |S
-SYSKEYS                                                                                                                         |S
 SYSDEPENDS                                                                                                                      |S
-SYSALIASES                                                                                                                      |S
-SYSVIEWS                                                                                                                        |S
-SYSCHECKS                                                                                                                       |S
+SYSDUMMY1                                                                                                                       |S
+SYSFILES                                                                                                                        |S
 SYSFOREIGNKEYS                                                                                                                  |S
+SYSKEYS                                                                                                                         |S
+SYSREQUIREDPERM                                                                                                                 |S
+SYSROUTINEPERMS                                                                                                                 |S
+SYSSCHEMAS                                                                                                                      |S
 SYSSTATEMENTS                                                                                                                   |S
-SYSFILES                                                                                                                        |S
-SYSTRIGGERS                                                                                                                     |S
 SYSSTATISTICS                                                                                                                   |S
-SYSDUMMY1                                                                                                                       |S
 SYSTABLEPERMS                                                                                                                   |S
-SYSCOLPERMS                                                                                                                     |S
-SYSROUTINEPERMS                                                                                                                 |S
-SYSREQUIREDPERM                                                                                                                 |S
+SYSTABLES                                                                                                                       |S
+SYSTRIGGERS                                                                                                                     |S
+SYSVIEWS                                                                                                                        |S
 T                                                                                                                               |T
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
@@ -544,32 +544,32 @@
 create table t234567890123456789012345678901234567890
 (c23456789012345678901234567890 int);
 0 rows inserted/updated/deleted
-ij> select TABLENAME from sys.systables where length(TABLENAME) > 30;
+ij> select TABLENAME from sys.systables where length(TABLENAME) > 30 order by tablename;
 TABLENAME                                                                                                                       
 --------------------------------------------------------------------------------------------------------------------------------
 T234567890123456789012345678901234567890                                                                                        
-ij> select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30;
+ij> select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30 order by columnname;
 COLUMNNAME                                                                                                                      
 --------------------------------------------------------------------------------------------------------------------------------
 ij> -- primary key
 create table primkey1 (c1 int not null constraint prim1 primary key);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME                                                                                                                  |&
 ----------------------------------------------------------------------------------------------------------------------------------
 PRIM1                                                                                                                           |P
 ij> create table unnamed_primkey2 (c1 int not null primary key);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME                                                                                                                  |&
 ----------------------------------------------------------------------------------------------------------------------------------
 PRIM1                                                                                                                           |P
 ij> create table primkey3 (c1 int not null, c2 int not null, constraint prim3 primary key(c2, c1));
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME                                                                                                                  |&
 ----------------------------------------------------------------------------------------------------------------------------------
 PRIM1                                                                                                                           |P
@@ -577,7 +577,7 @@
 ij> create table uniquekey1 (c1 int not null constraint uniq1 unique);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME                                                                                                                  |&
 ----------------------------------------------------------------------------------------------------------------------------------
 PRIM1                                                                                                                           |P
@@ -586,7 +586,7 @@
 ij> create table unnamed_uniquekey2 (c1 int not null unique);
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME                                                                                                                  |&
 ----------------------------------------------------------------------------------------------------------------------------------
 PRIM1                                                                                                                           |P
@@ -595,7 +595,7 @@
 ij> create table uniquekey3 (c1 int not null, c2 int not null, constraint uniq3 unique(c2, c1));
 0 rows inserted/updated/deleted
 ij> select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 CONSTRAINTNAME                                                                                                                  |&
 ----------------------------------------------------------------------------------------------------------------------------------
 PRIM1                                                                                                                           |P
@@ -606,35 +606,35 @@
 create view dummyview as select * from t, uniquekey3;
 0 rows inserted/updated/deleted
 ij> select tablename from sys.systables t, sys.sysviews v
-where t.tableid = v.tableid;
+where t.tableid = v.tableid order by tablename;
 TABLENAME                                                                                                                       
 --------------------------------------------------------------------------------------------------------------------------------
 DUMMYVIEW                                                                                                                       
 ij> -- RESOLVE - add selects from sysdepends when simplified
 -- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 TABLENAME                                                                                                                       |2          
 --------------------------------------------------------------------------------------------------------------------------------------------
-SYSCONGLOMERATES                                                                                                                |1          
-SYSTABLES                                                                                                                       |1          
+SYSALIASES                                                                                                                      |1          
+SYSCHECKS                                                                                                                       |1          
+SYSCOLPERMS                                                                                                                     |1          
 SYSCOLUMNS                                                                                                                      |1          
-SYSSCHEMAS                                                                                                                      |1          
+SYSCONGLOMERATES                                                                                                                |1          
 SYSCONSTRAINTS                                                                                                                  |1          
-SYSKEYS                                                                                                                         |1          
 SYSDEPENDS                                                                                                                      |1          
-SYSALIASES                                                                                                                      |1          
-SYSVIEWS                                                                                                                        |1          
-SYSCHECKS                                                                                                                       |1          
+SYSFILES                                                                                                                        |1          
 SYSFOREIGNKEYS                                                                                                                  |1          
+SYSKEYS                                                                                                                         |1          
+SYSREQUIREDPERM                                                                                                                 |1          
+SYSROUTINEPERMS                                                                                                                 |1          
+SYSSCHEMAS                                                                                                                      |1          
 SYSSTATEMENTS                                                                                                                   |1          
-SYSFILES                                                                                                                        |1          
-SYSTRIGGERS                                                                                                                     |1          
 SYSSTATISTICS                                                                                                                   |1          
 SYSTABLEPERMS                                                                                                                   |1          
-SYSCOLPERMS                                                                                                                     |1          
-SYSROUTINEPERMS                                                                                                                 |1          
-SYSREQUIREDPERM                                                                                                                 |1          
+SYSTABLES                                                                                                                       |1          
+SYSTRIGGERS                                                                                                                     |1          
+SYSVIEWS                                                                                                                        |1          
 ij> -- drop views
 drop view dummyview;
 0 rows inserted/updated/deleted
@@ -644,7 +644,7 @@
 0 rows inserted/updated/deleted
 ij> select columnname, columnnumber, columndatatype
 from sys.syscolumns
-where columnname IN ('DCOL', 'NCOL');
+where columnname IN ('DCOL', 'NCOL') order by columnname;
 COLUMNNAME                                                                                                                      |COLUMNNUMB&|COLUMNDATATYPE 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------
 DCOL                                                                                                                            |1          |DECIMAL(5,2)   
@@ -656,7 +656,7 @@
 ij> -- index descriptor.
 select conglomeratename, descriptor
 from sys.sysconglomerates 
-where conglomeratename = 'DECIMAL_TAB_IDX';
+where conglomeratename = 'DECIMAL_TAB_IDX' order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |DESCRIPTOR     
 ------------------------------------------------------------------------------------------------------------------------------------------------
 DECIMAL_TAB_IDX                                                                                                                 |BTREE (1)      
@@ -664,7 +664,7 @@
 0 rows inserted/updated/deleted
 ij> -- referenced columns.
 select triggername, referencedcolumns
-from sys.systriggers;
+from sys.systriggers order by triggername;
 TRIGGERNAME                                                                                                                     |REFERENCEDCOLU&
 ------------------------------------------------------------------------------------------------------------------------------------------------
 T1                                                                                                                              |NULL           
@@ -696,26 +696,26 @@
 0 rows inserted/updated/deleted
 ij> -- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 TABLENAME                                                                                                                       |2          
 --------------------------------------------------------------------------------------------------------------------------------------------
-SYSCONGLOMERATES                                                                                                                |1          
-SYSTABLES                                                                                                                       |1          
+SYSALIASES                                                                                                                      |1          
+SYSCHECKS                                                                                                                       |1          
+SYSCOLPERMS                                                                                                                     |1          
 SYSCOLUMNS                                                                                                                      |1          
-SYSSCHEMAS                                                                                                                      |1          
+SYSCONGLOMERATES                                                                                                                |1          
 SYSCONSTRAINTS                                                                                                                  |1          
-SYSKEYS                                                                                                                         |1          
 SYSDEPENDS                                                                                                                      |1          
-SYSALIASES                                                                                                                      |1          
-SYSVIEWS                                                                                                                        |1          
-SYSCHECKS                                                                                                                       |1          
+SYSFILES                                                                                                                        |1          
 SYSFOREIGNKEYS                                                                                                                  |1          
+SYSKEYS                                                                                                                         |1          
+SYSREQUIREDPERM                                                                                                                 |1          
+SYSROUTINEPERMS                                                                                                                 |1          
+SYSSCHEMAS                                                                                                                      |1          
 SYSSTATEMENTS                                                                                                                   |1          
-SYSFILES                                                                                                                        |1          
-SYSTRIGGERS                                                                                                                     |1          
 SYSSTATISTICS                                                                                                                   |1          
 SYSTABLEPERMS                                                                                                                   |1          
-SYSCOLPERMS                                                                                                                     |1          
-SYSROUTINEPERMS                                                                                                                 |1          
-SYSREQUIREDPERM                                                                                                                 |1          
+SYSTABLES                                                                                                                       |1          
+SYSTRIGGERS                                                                                                                     |1          
+SYSVIEWS                                                                                                                        |1          
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/syscat.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/syscat.sql?rev=369956&r1=369955&r2=369956&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/syscat.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/syscat.sql Tue Jan 17 15:19:09 2006
@@ -53,7 +53,7 @@
 where isindex
 order by conglomeratename;
 
-select TABLENAME, TABLETYPE from sys.systables;
+select TABLENAME, TABLETYPE from sys.systables order by tablename;
 
 select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
@@ -69,7 +69,7 @@
 
 create table t (i int, s smallint);
 
-select TABLENAME, TABLETYPE from sys.systables;
+select TABLENAME, TABLETYPE from sys.systables order by tablename;
 
 select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
@@ -87,45 +87,45 @@
 create table t234567890123456789012345678901234567890
 (c23456789012345678901234567890 int);
 
-select TABLENAME from sys.systables where length(TABLENAME) > 30;
-select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30;
+select TABLENAME from sys.systables where length(TABLENAME) > 30 order by tablename;
+select COLUMNNAME from sys.syscolumns where {fn length(COLUMNNAME)} > 30 order by columnname;
 
 -- primary key
 create table primkey1 (c1 int not null constraint prim1 primary key);
 select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 
 create table unnamed_primkey2 (c1 int not null primary key);
 select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 
 create table primkey3 (c1 int not null, c2 int not null, constraint prim3 primary key(c2, c1));
 select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 
 create table uniquekey1 (c1 int not null constraint uniq1 unique);
 select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 
 create table unnamed_uniquekey2 (c1 int not null unique);
 select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 
 create table uniquekey3 (c1 int not null, c2 int not null, constraint uniq3 unique(c2, c1));
 select c.constraintname, c.type from sys.sysconstraints c, sys.systables t
-where c.tableid = t.tableid and not t.tablename like 'UNNAMED%';
+where c.tableid = t.tableid and not t.tablename like 'UNNAMED%' order by c.constraintname;
 
 -- views
 create view dummyview as select * from t, uniquekey3;
 
 select tablename from sys.systables t, sys.sysviews v
-where t.tableid = v.tableid;
+where t.tableid = v.tableid order by tablename;
 
 -- RESOLVE - add selects from sysdepends when simplified
 
 -- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 
 -- drop views
 drop view dummyview;
@@ -137,7 +137,7 @@
 
 select columnname, columnnumber, columndatatype
 from sys.syscolumns
-where columnname IN ('DCOL', 'NCOL');
+where columnname IN ('DCOL', 'NCOL') order by columnname;
 
 -- now just for fun lets select some other stuff from the system catalogs
 -- which is used by Cloudview and make sure we can ship it over the wire.
@@ -147,13 +147,13 @@
 -- index descriptor.
 select conglomeratename, descriptor
 from sys.sysconglomerates 
-where conglomeratename = 'DECIMAL_TAB_IDX';
+where conglomeratename = 'DECIMAL_TAB_IDX' order by conglomeratename;
 
 create trigger t1 after update on decimal_tab for each row mode db2sql values 1;
 
 -- referenced columns.
 select triggername, referencedcolumns
-from sys.systriggers;
+from sys.systriggers order by triggername;
 
 --confirm for DERBY-318
 create table defaultAutoinc(autoinccol int generated by default as identity);
@@ -172,5 +172,5 @@
 
 -- verify the consistency of the indexes on the system catalogs
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
-from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1';
+from sys.systables where tabletype = 'S' and tablename != 'SYSDUMMY1' order by tablename;
 

Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/release/build.xml?rev=369956&r1=369955&r2=369956&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Tue Jan 17 15:19:09 2006
@@ -252,6 +252,12 @@
       <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out"/>
     </antcall>
     <antcall target="regex.version"> 
+      <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out"/>
+    </antcall>
+    <antcall target="regex.version"> 
+      <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out"/>
+    </antcall>
+    <antcall target="regex.version"> 
       <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/metadata.out"/>
     </antcall>
     <antcall target="regex.version"> 



Mime
View raw message