db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r417497 [6/6] - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ client/org/apache/derby/client/am/ engine/org/apache/derby/catalog/ engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/master/ testing/...
Date Tue, 27 Jun 2006 16:18:44 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=417497&r1=417496&r2=417497&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
Tue Jun 27 09:18:43 2006
@@ -129,7 +129,7 @@
 getFunctions("","",null):
 FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
 getFunctionParameters(null,null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],PARAMETER_NAME[VARCHAR],PARAMETER_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],PARAMETER_NAME[VARCHAR],PARAMETER_TYPE[SMALLINT],DATA_TYPE[INTEGER],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
 null,APP,DUMMY1,,4,5,SMALLINT,5,2,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
 null,APP,DUMMY1,X,1,5,SMALLINT,5,2,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 null,APP,DUMMY2,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
@@ -148,27 +148,27 @@
 null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,KEY,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,1,0
 null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,0,-1
 getFunctionParameters(null,"APP","DUMMY%","X"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],PARAMETER_NAME[VARCHAR],PARAMETER_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],PARAMETER_NAME[VARCHAR],PARAMETER_TYPE[SMALLINT],DATA_TYPE[INTEGER],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
 null,APP,DUMMY1,X,1,5,SMALLINT,5,2,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 null,APP,DUMMY2,X,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
 null,APP,DUMMY3,X,1,12,VARCHAR,16,32,null,null,1,null,32,1,YES,xxxxGENERATED-IDxxxx,2,0
 null,APP,DUMMY4,X,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
 getFunctionParameters(null,"APP","DUMMY%",""):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],PARAMETER_NAME[VARCHAR],PARAMETER_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],PARAMETER_NAME[VARCHAR],PARAMETER_TYPE[SMALLINT],DATA_TYPE[INTEGER],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
 null,APP,DUMMY1,,4,5,SMALLINT,5,2,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
 null,APP,DUMMY2,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
 null,APP,DUMMY3,,4,12,VARCHAR,16,32,null,null,1,null,32,0,YES,xxxxGENERATED-IDxxxx,2,-1
 null,APP,DUMMY4,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
 getUDTs() with user-named types null :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('STRUCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('DISTINCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT', 'STRUCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getClientInfoProperties():
 NAME[VARCHAR],MAX_LEN[INTEGER],DEFAULT_VALUE[VARCHAR],DESCRIPTION[VARCHAR]
 allProceduresAreCallable(): true
@@ -348,119 +348,119 @@
 null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
 null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,SYS,SYSALIASES,SYSTEM TABLE,
-,SYS,SYSCHECKS,SYSTEM TABLE,
-,SYS,SYSCOLPERMS,SYSTEM TABLE,
-,SYS,SYSCOLUMNS,SYSTEM TABLE,
-,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
-,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
-,SYS,SYSDEPENDS,SYSTEM TABLE,
-,SYS,SYSFILES,SYSTEM TABLE,
-,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
-,SYS,SYSKEYS,SYSTEM TABLE,
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
-,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
-,SYS,SYSSCHEMAS,SYSTEM TABLE,
-,SYS,SYSSTATEMENTS,SYSTEM TABLE,
-,SYS,SYSSTATISTICS,SYSTEM TABLE,
-,SYS,SYSTABLEPERMS,SYSTEM TABLE,
-,SYS,SYSTABLES,SYSTEM TABLE,
-,SYS,SYSTRIGGERS,SYSTEM TABLE,
-,SYS,SYSVIEWS,SYSTEM TABLE,
-,SYSIBM,SYSDUMMY1,SYSTEM TABLE,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,SYS,SYSALIASES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCHECKS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLUMNS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONGLOMERATES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONSTRAINTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSDEPENDS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATISTICS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTRIGGERS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSVIEWS,SYSTEM TABLE,,null,null,null,null,null
+,SYSIBM,SYSDUMMY1,SYSTEM TABLE,,null,null,null,null,null
 getTables() with no types:
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,SYS,SYSALIASES,SYSTEM TABLE,
-,SYS,SYSCHECKS,SYSTEM TABLE,
-,SYS,SYSCOLPERMS,SYSTEM TABLE,
-,SYS,SYSCOLUMNS,SYSTEM TABLE,
-,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
-,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
-,SYS,SYSDEPENDS,SYSTEM TABLE,
-,SYS,SYSFILES,SYSTEM TABLE,
-,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
-,SYS,SYSKEYS,SYSTEM TABLE,
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
-,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
-,SYS,SYSSCHEMAS,SYSTEM TABLE,
-,SYS,SYSSTATEMENTS,SYSTEM TABLE,
-,SYS,SYSSTATISTICS,SYSTEM TABLE,
-,SYS,SYSTABLEPERMS,SYSTEM TABLE,
-,SYS,SYSTABLES,SYSTEM TABLE,
-,SYS,SYSTRIGGERS,SYSTEM TABLE,
-,SYS,SYSVIEWS,SYSTEM TABLE,
-,SYSIBM,SYSDUMMY1,SYSTEM TABLE,
-,APP,ALLTYPES,TABLE,
-,APP,INFLIGHT,TABLE,
-,APP,LOUIE,TABLE,
-,APP,REFTAB,TABLE,
-,APP,REFTAB2,TABLE,
-,APP,T,TABLE,
-,APP,SCREWIE,VIEW,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,SYS,SYSALIASES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCHECKS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLUMNS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONGLOMERATES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONSTRAINTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSDEPENDS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATISTICS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTRIGGERS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSVIEWS,SYSTEM TABLE,,null,null,null,null,null
+,SYSIBM,SYSDUMMY1,SYSTEM TABLE,,null,null,null,null,null
+,APP,ALLTYPES,TABLE,,null,null,null,null,null
+,APP,INFLIGHT,TABLE,,null,null,null,null,null
+,APP,LOUIE,TABLE,,null,null,null,null,null
+,APP,REFTAB,TABLE,,null,null,null,null,null
+,APP,REFTAB2,TABLE,,null,null,null,null,null
+,APP,T,TABLE,,null,null,null,null,null
+,APP,SCREWIE,VIEW,,null,null,null,null,null
 getTables() with TABLE_TYPE in ('VIEW','TABLE') :
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,APP,ALLTYPES,TABLE,
-,APP,INFLIGHT,TABLE,
-,APP,LOUIE,TABLE,
-,APP,REFTAB,TABLE,
-,APP,REFTAB2,TABLE,
-,APP,T,TABLE,
-,APP,SCREWIE,VIEW,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,APP,ALLTYPES,TABLE,,null,null,null,null,null
+,APP,INFLIGHT,TABLE,,null,null,null,null,null
+,APP,LOUIE,TABLE,,null,null,null,null,null
+,APP,REFTAB,TABLE,,null,null,null,null,null
+,APP,REFTAB2,TABLE,,null,null,null,null,null
+,APP,T,TABLE,,null,null,null,null,null
+,APP,SCREWIE,VIEW,,null,null,null,null,null
 getTableTypes():
 TABLE_TYPE[VARCHAR]
 SYSTEM TABLE
 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],IS_AUTOINCREMENT[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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],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],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
+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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,null,null,null,null,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,null,null,null,null,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,null,null,null,null,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],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
+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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES,null,null,null,null,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES,null,null,null,null,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES,null,null,null,null,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES,null,null,null,null,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES,null,null,null,null,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES,null,null,null,null,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES,null,null,null,null,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES,null,null,null,null,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES,null,null,null,null,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES,null,null,null,null,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES,null,null,null,null,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES,null,null,null,null,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES,null,null,null,null,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES,null,null,null,null,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES,null,null,null,null,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES,null,null,null,null,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES,null,null,null,null,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES,null,null,null,null,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES,null,null,null,null,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],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
+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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO,null,null,null,null,NO
+,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO,null,null,null,null,NO
+,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO,null,null,null,null,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO,null,null,null,null,NO
+,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO,null,null,null,null,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],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
+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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO,null,null,null,null,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,12,null,null,1,,null,1,null,12,2,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,12,null,null,1,,null,1,null,12,3,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,40,null,null,1,,null,1,null,40,4,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,44,null,null,1,,null,12,null,44,5,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,6,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,7,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,1020,null,null,1,,null,12,null,1020,8,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,28,null,null,1,,null,1,null,28,9,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,65344,null,null,1,,null,12,null,65344,10,YES,null,null,null,null,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],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
+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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,null,null,null,null,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,null,null,null,null,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,null,null,null,null,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/tests/jdbcapi/odbc_metadata.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata.java?rev=417497&r1=417496&r2=417497&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata.java
Tue Jun 27 09:18:43 2006
@@ -509,7 +509,13 @@
 			"TABLE_SCHEM", "VARCHAR", null,
 			"TABLE_NAME", "VARCHAR", null,
 			"TABLE_TYPE", "VARCHAR", null,
-			"REMARKS", "VARCHAR", null
+			"REMARKS", "VARCHAR", null,
+			// the next columns are not defined in ODBC
+			"TYPE_CAT", "VARCHAR", null,
+			"TYPE_SCHEM", "VARCHAR", null,
+			"TYPE_NAME", "VARCHAR", null,
+			"SELF_REFERENCING_COL_NAME", "VARCHAR", null,
+			"REF_GENERATION", "VARCHAR", null,
 
 		};
 
@@ -532,7 +538,13 @@
 			"SQL_DATETIME_SUB", "SMALLINT", null,
 			"CHAR_OCTET_LENGTH", "INTEGER", null,
 			"ORDINAL_POSITION", "INTEGER", "NOT NULL",
-			"IS_NULLABLE", "VARCHAR", null
+			"IS_NULLABLE", "VARCHAR", null,
+			// the next columns are not defined in ODBC
+			"SCOPE_CATLOG", "VARCHAR", null,
+			"SCOPE_SCHEMA", "VARCHAR", null,
+			"SCOPE_TABLE", "VARCHAR", null,
+			"SOURCE_DATA_TYPE", "SMALLINT", null,
+			"IS_AUTOINCREMENT", "VARCHAR", "NOT NULL",
 
 		};
 



Mime
View raw message