db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r413084 [1/2] - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTe...
Date Fri, 09 Jun 2006 16:18:47 GMT
Author: rhillegas
Date: Fri Jun  9 09:18:45 2006
New Revision: 413084

URL: http://svn.apache.org/viewvc?rev=413084&view=rev
Log:
DERBY-1389: Commit Narayanan's IS_AUTOINCREMENT.v1.diff, adding a new JDBC4 column to the results of the getColumns() metadata call.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.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/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties?rev=413084&r1=413083&r2=413084&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties Fri Jun  9 09:18:45 2006
@@ -329,7 +329,9 @@
 			AS CHAR_OCTET_LENGTH,										\
 		C.COLUMNNUMBER AS ORDINAL_POSITION, \
 		CAST ((CASE WHEN C.COLUMNDATATYPE.isNullable() THEN 'YES' ELSE 'NO' END) AS VARCHAR(128)) \
-		 	AS IS_NULLABLE \
+		 	AS IS_NULLABLE, \
+                CAST ((CASE WHEN (AUTOINCREMENTINC is not NULL) THEN 'YES' ELSE 'NO' END) AS VARCHAR(128)) \
+		 	AS IS_AUTOINCREMENT \
 	FROM SYS.SYSSCHEMAS S, \
 			SYS.SYSTABLES T, \
 			SYS.SYSCOLUMNS C \

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=413084&r1=413083&r2=413084&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Fri Jun  9 09:18:45 2006
@@ -290,54 +290,54 @@
 TABLE
 VIEW
 getColumns():
-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]
+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],IS_AUTOINCREMENT[VARCHAR]
 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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 getColumns('ALLTYPES'):
-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]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES
-,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES
-,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES
-,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES,NO
 getColumns('LOUIE'):
-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]
-,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO
-,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO
-,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO,NO
+,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO,NO
+,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO,NO
+,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO,YES
 getColumns('INFLIGHT'):
-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]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
@@ -472,12 +472,12 @@
 ,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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
 Executing VALUES { fn ABS(-25.67) } --   = >25.67<  << 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=413084&r1=413083&r2=413084&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Fri Jun  9 09:18:45 2006
@@ -320,54 +320,54 @@
 TABLE
 VIEW
 getColumns():
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
 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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,NO
 getColumns('ALLTYPES'):
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES
-,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES
-,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES
-,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES,NO
 getColumns('LOUIE'):
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO
-,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO
-,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO,NO
+,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO,NO
+,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO,NO
+,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO,YES
 getColumns('INFLIGHT'):
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,12,null,null,1,,null,1,null,12,2,YES
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,12,null,null,1,,null,1,null,12,3,YES
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,40,null,null,1,,null,1,null,40,4,YES
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,44,null,null,1,,null,12,null,44,5,YES
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,6,YES
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,7,YES
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,1020,null,null,1,,null,12,null,1020,8,YES
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,28,null,null,1,,null,1,null,28,9,YES
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,65344,null,null,1,,null,12,null,65344,10,YES
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,12,null,null,1,,null,1,null,12,2,YES,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,12,null,null,1,,null,1,null,12,3,YES,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,40,null,null,1,,null,1,null,40,4,YES,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,44,null,null,1,,null,12,null,44,5,YES,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,6,YES,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,7,YES,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,1020,null,null,1,,null,12,null,1020,8,YES,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,28,null,null,1,,null,1,null,28,9,YES,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,65344,null,null,1,,null,12,null,65344,10,YES,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
@@ -502,12 +502,12 @@
 ,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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,NO
 OK -- user result set closed by intervening OBDC getColumns request; this was expected because of the way the test works.
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out?rev=413084&r1=413083&r2=413084&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out Fri Jun  9 09:18:45 2006
@@ -383,54 +383,54 @@
 TABLE
 VIEW
 getColumns():
-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]
+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],IS_AUTOINCREMENT[VARCHAR]
 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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 getColumns('ALLTYPES'):
-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]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES
-,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES
-,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES
-,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES,NO
 getColumns('LOUIE'):
-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]
-,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO
-,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO
-,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO,NO
+,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO,NO
+,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO,NO
+,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO,YES
 getColumns('INFLIGHT'):
-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]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
@@ -565,12 +565,12 @@
 ,SYS,SYSTABLES,false,,SYSTABLES_INDEX1,3,2,SCHEMAID,A,null,null,null
 ,SYS,SYSTABLES,false,,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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
 Executing VALUES { fn ABS(-25.67) } --   = >25.67<  << 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=413084&r1=413083&r2=413084&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 Fri Jun  9 09:18:45 2006
@@ -383,54 +383,54 @@
 TABLE
 VIEW
 getColumns():
-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]
+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],IS_AUTOINCREMENT[VARCHAR]
 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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 getColumns('ALLTYPES'):
-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]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES
-,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES
-,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES
-,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES,NO
 getColumns('LOUIE'):
-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]
-,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO
-,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO
-,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO,NO
+,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO,NO
+,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO,NO
+,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO,YES
 getColumns('INFLIGHT'):
-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]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
@@ -565,12 +565,12 @@
 ,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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
 Executing VALUES { fn ABS(-25.67) } --   = >25.67<  << 
@@ -727,4 +727,7 @@
 defval for col C5 type CHAR DEFAULT 'NULL' wasnull false
 defval for col C6 type CHAR DEFAULT ''NULL'' wasnull false
 defval for col C7 type INTEGER DEFAULT '88' wasnull false
+getImportedKeys('',null,null,'','APP','Derby655t1' ):
+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]
+,APP,DERBY655T2,C21_ID,,APP,DERBY655T1,C11_ID,1,3,0,F_12,xxxxGENERATED-IDxxxx,7
 Test metadata finished

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=413084&r1=413083&r2=413084&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Fri Jun  9 09:18:45 2006
@@ -413,54 +413,54 @@
 TABLE
 VIEW
 getColumns():
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
 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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,NO
 getColumns('ALLTYPES'):
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES
-,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES
-,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES
-,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES,NO
 getColumns('LOUIE'):
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO
-,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO
-,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO,NO
+,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO,NO
+,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO,NO
+,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO,YES
 getColumns('INFLIGHT'):
-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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,12,null,null,1,,null,1,null,12,2,YES
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,12,null,null,1,,null,1,null,12,3,YES
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,40,null,null,1,,null,1,null,40,4,YES
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,44,null,null,1,,null,12,null,44,5,YES
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,6,YES
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,7,YES
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,1020,null,null,1,,null,12,null,1020,8,YES
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,28,null,null,1,,null,1,null,28,9,YES
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,65344,null,null,1,,null,12,null,65344,10,YES
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,12,null,null,1,,null,1,null,12,2,YES,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,12,null,null,1,,null,1,null,12,3,YES,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,40,null,null,1,,null,1,null,40,4,YES,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,44,null,null,1,,null,12,null,44,5,YES,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,6,YES,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,7,YES,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,1020,null,null,1,,null,12,null,1020,8,YES,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,28,null,null,1,,null,1,null,28,9,YES,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,65344,null,null,1,,null,12,null,65344,10,YES,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
@@ -595,12 +595,12 @@
 ,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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO
+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[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,NO
 OK -- user result set closed by intervening OBDC getColumns request; this was expected because of the way the test works.
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=413084&r1=413083&r2=413084&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Fri Jun  9 09:18:45 2006
@@ -383,54 +383,54 @@
 TABLE
 VIEW
 getColumns():
-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]
+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],IS_AUTOINCREMENT[VARCHAR]
 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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 getColumns('ALLTYPES'):
-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]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES
-,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES
-,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES
-,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES,NO
 getColumns('LOUIE'):
-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]
-,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO
-,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO
-,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO,NO
+,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO,NO
+,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO,NO
+,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO,YES
 getColumns('INFLIGHT'):
-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]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES
+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],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
@@ -565,12 +565,12 @@
 ,SYS,SYSTABLES,false,,SYSTABLES_INDEX1,3,2,SCHEMAID,A,null,null,null
 ,SYS,SYSTABLES,false,,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
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+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],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
 Executing VALUES { fn ABS(-25.67) } --   = >25.67<  << 



Mime
View raw message