db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r543544 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNetClient/ tests/jdbc4/ tests/jdbcapi/
Date Fri, 01 Jun 2007 17:32:20 GMT
Author: djd
Date: Fri Jun  1 10:32:19 2007
New Revision: 543544

URL: http://svn.apache.org/viewvc?view=rev&rev=543544
Log:
DERBY-2744 DERBY-2242 Remove the testing of the new JDBC 4.0 DatabaseMetaData functions from
the harness based metadata tests that are already covered by the JUnit jdbc4.TestDbMetaData test.

Modified:
    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
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java

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?view=diff&rev=543544&r1=543543&r2=543544
==============================================================================
--- 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  1 10:32:19 2007
@@ -14,31 +14,6 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED SUBVERSION INFO))
-getSchemas(String, String):
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-NULLID,null
-SQLJ,null
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
 getProcedures():
 PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],RESERVED1[INTEGER],RESERVED2[INTEGER],RESERVED3[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT],SPECIFIC_NAME[VARCHAR]
 ,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1,xxxxGENERATED-IDxxxx
@@ -48,134 +23,6 @@
 ,APP,GETPCTEST4A,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4a,1,xxxxGENERATED-IDxxxx
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1,xxxxGENERATED-IDxxxx
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1,xxxxGENERATED-IDxxxx
-getFunctions(null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("Dummy Catalog",null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,"%SYS%",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,null,"%GET%"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("","",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-getFunctionColumns(null,null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-null,APP,DUMMY2,X,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY2,Y,1,5,SMALLINT,5,2,0,10,1,null,null,2,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,DUMMY3,X,1,12,VARCHAR,16,32,null,null,1,null,32,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY3,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,APP,DUMMY4,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,APP,DUMMY4,X,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY4,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,SCHEMANAME,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,TABLENAME,1,12,VARCHAR,128,256,null,null,1,null,256,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,1,-1
-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
-null,SYSIBM,BLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,BLOBGETBYTES,,4,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETBYTES,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,BLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,SEARCHBYTES,1,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,CLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,CLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,SEARCHSTR,1,12,VARCHAR,32672,65344,null,null,1,null,65344,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETSUBSTRING,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETSUBSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETSUBSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETSUBSTRING,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-getFunctionColumns(null,"APP","DUMMY%","X"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-getFunctionColumns(null,"APP","DUMMY%",""):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT') :

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?view=diff&rev=543544&r1=543543&r2=543544
==============================================================================
--- 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  1 10:32:19 2007
@@ -44,31 +44,6 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED SUBVERSION INFO))
-getSchemas(String, String):
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-NULLID,null
-SQLJ,null
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
 getProcedures():
 PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],NUM_INPUT_PARAMS[INTEGER],NUM_OUTPUT_PARAMS[INTEGER],NUM_RESULT_SETS[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT]
 ,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1
@@ -78,134 +53,6 @@
 ,APP,GETPCTEST4A,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4a,1
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
-getFunctions(null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("Dummy Catalog",null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,"%SYS%",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,null,"%GET%"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("","",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-getFunctionColumns(null,null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-null,APP,DUMMY2,X,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY2,Y,1,5,SMALLINT,5,2,0,10,1,null,null,2,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,DUMMY3,X,1,12,VARCHAR,16,32,null,null,1,null,32,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY3,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,APP,DUMMY4,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,APP,DUMMY4,X,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY4,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,SCHEMANAME,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,TABLENAME,1,12,VARCHAR,128,256,null,null,1,null,256,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,1,-1
-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
-null,SYSIBM,BLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,BLOBGETBYTES,,4,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETBYTES,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,BLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,SEARCHBYTES,1,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,CLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,CLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,SEARCHSTR,1,12,VARCHAR,32672,65344,null,null,1,null,65344,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETSUBSTRING,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETSUBSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETSUBSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETSUBSTRING,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-getFunctionColumns(null,"APP","DUMMY%","X"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-getFunctionColumns(null,"APP","DUMMY%",""):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT') :

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?view=diff&rev=543544&r1=543543&r2=543544
==============================================================================
--- 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  1 10:32:19 2007
@@ -14,31 +14,6 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED SUBVERSION INFO))
-getSchemas(String, String):
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-NULLID,null
-SQLJ,null
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
 getProcedures():
 PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],RESERVED1[INTEGER],RESERVED2[INTEGER],RESERVED3[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT],SPECIFIC_NAME[VARCHAR]
 ,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1,xxxxGENERATED-IDxxxx
@@ -48,134 +23,6 @@
 ,APP,GETPCTEST4A,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4a,1,xxxxGENERATED-IDxxxx
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1,xxxxGENERATED-IDxxxx
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1,xxxxGENERATED-IDxxxx
-getFunctions(null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("Dummy Catalog",null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,"%SYS%",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,null,"%GET%"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("","",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-getFunctionColumns(null,null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-null,APP,DUMMY2,X,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY2,Y,1,5,SMALLINT,5,2,0,10,1,null,null,2,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,DUMMY3,X,1,12,VARCHAR,16,32,null,null,1,null,32,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY3,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,APP,DUMMY4,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,APP,DUMMY4,X,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY4,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,SCHEMANAME,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,TABLENAME,1,12,VARCHAR,128,256,null,null,1,null,256,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,1,-1
-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
-null,SYSIBM,BLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,BLOBGETBYTES,,4,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETBYTES,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,BLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,SEARCHBYTES,1,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,CLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,CLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,SEARCHSTR,1,12,VARCHAR,32672,65344,null,null,1,null,65344,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETSUBSTRING,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETSUBSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETSUBSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETSUBSTRING,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-getFunctionColumns(null,"APP","DUMMY%","X"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-getFunctionColumns(null,"APP","DUMMY%",""):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT') :

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?view=diff&rev=543544&r1=543543&r2=543544
==============================================================================
--- 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 Fri Jun  1 10:32:19 2007
@@ -44,31 +44,6 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED SUBVERSION INFO))
-getSchemas(String, String):
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-NULLID,null
-SQLJ,null
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-SYS,null
-SYSCAT,null
-SYSCS_DIAG,null
-SYSCS_UTIL,null
-SYSFUN,null
-SYSIBM,null
-SYSPROC,null
-SYSSTAT,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
-APP,null
-TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
 getProcedures():
 PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],NUM_INPUT_PARAMS[INTEGER],NUM_OUTPUT_PARAMS[INTEGER],NUM_RESULT_SETS[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT]
 ,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1
@@ -78,134 +53,6 @@
 ,APP,GETPCTEST4A,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4a,1
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
-getFunctions(null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("Dummy Catalog",null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,APP,DUMMY1,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY2,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY3,java.some.func,xxxxGENERATED-IDxxxx
-null,APP,DUMMY4,java.some.func,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,"%SYS%",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBCREATELOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBCREATELOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions(null,null,"%GET%"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_DATABASE_PROPERTY,xxxxGENERATED-IDxxxx
-null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMBYTES,xxxxGENERATED-IDxxxx
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.BLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETLENGTH,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETLENGTH,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMLOCATOR,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETPOSITIONFROMSTRING,xxxxGENERATED-IDxxxx
-null,SYSIBM,CLOBGETSUBSTRING,org.apache.derby.impl.jdbc.LOBStoredProcedure.CLOBGETSUBSTRING,xxxxGENERATED-IDxxxx
-getFunctions("","",null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],REMARKS[VARCHAR],SPECIFIC_NAME[VARCHAR]
-getFunctionColumns(null,null,null,null):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-null,APP,DUMMY2,X,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY2,Y,1,5,SMALLINT,5,2,0,10,1,null,null,2,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,DUMMY3,X,1,12,VARCHAR,16,32,null,null,1,null,32,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY3,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,APP,DUMMY4,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,APP,DUMMY4,X,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,APP,DUMMY4,Y,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,,4,4,INTEGER,10,4,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,2,-1
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,SCHEMANAME,1,12,VARCHAR,128,256,null,null,1,null,256,1,YES,xxxxGENERATED-IDxxxx,2,0
-null,SYSCS_UTIL,SYSCS_CHECK_TABLE,TABLENAME,1,12,VARCHAR,128,256,null,null,1,null,256,2,YES,xxxxGENERATED-IDxxxx,2,1
-null,SYSCS_UTIL,SYSCS_GET_DATABASE_PROPERTY,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,1,-1
-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
-null,SYSIBM,BLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,BLOBGETBYTES,,4,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETBYTES,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,BLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,SEARCHBYTES,1,-3,VARCHAR () FOR BIT DATA,32672,32672,null,null,1,null,32672,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMBYTES,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,BLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBCREATELOCATOR,,4,4,INTEGER,0,2147483647,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,0,-1
-null,SYSIBM,CLOBGETLENGTH,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,1,-1
-null,SYSIBM,CLOBGETLENGTH,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,SEARCHLOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMLOCATOR,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,,4,-5,BIGINT,0,40,0,10,1,null,null,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,SEARCHSTR,1,12,VARCHAR,32672,65344,null,null,1,null,65344,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETPOSITIONFROMSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-null,SYSIBM,CLOBGETSUBSTRING,,4,12,VARCHAR,32672,65344,null,null,1,null,65344,0,YES,xxxxGENERATED-IDxxxx,3,-1
-null,SYSIBM,CLOBGETSUBSTRING,LOCATOR,1,4,INTEGER,10,4,0,10,1,null,null,1,YES,xxxxGENERATED-IDxxxx,3,0
-null,SYSIBM,CLOBGETSUBSTRING,POS,1,-5,BIGINT,19,40,0,10,1,null,null,2,YES,xxxxGENERATED-IDxxxx,3,1
-null,SYSIBM,CLOBGETSUBSTRING,LEN,1,4,INTEGER,10,4,0,10,1,null,null,3,YES,xxxxGENERATED-IDxxxx,3,2
-getFunctionColumns(null,"APP","DUMMY%","X"):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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
-getFunctionColumns(null,"APP","DUMMY%",""):
-FUNCTION_CAT[VARCHAR],FUNCTION_SCHEM[VARCHAR],FUNCTION_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_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],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT') :

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java?view=diff&rev=543544&r1=543543&r2=543544
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java Fri Jun  1 10:32:19 2007
@@ -106,7 +106,7 @@
         ResultSet rs = meta.getClientInfoProperties();
         JDBC.assertColumnNames(rs, new String[] {
             "NAME", "MAX_LEN", "DEFAULT_VALUE", "DESCRIPTION" });
-        JDBC.assertDrainResults(rs, 0);
+        JDBC.assertEmpty(rs);
     }
 
     /**
@@ -272,7 +272,7 @@
         // NO catalog (none)
         ResultSet rs = meta.getFunctions("", "", null);
         assertGetFunctionsRs(rs);
-        JDBC.assertDrainResults(rs, 0);
+        JDBC.assertEmpty(rs);
     }
 
     /** Check that the column names are as expected from
@@ -426,7 +426,7 @@
         // set when a schema is passed with no match
         ResultSet rs = meta.getSchemas(null, "BLAH");
         assertGetSchemasRs(rs);
-        JDBC.assertDrainResults(rs, 0);
+        JDBC.assertEmpty(rs);
     }
 
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java?view=diff&rev=543544&r1=543543&r2=543544
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java Fri Jun  1 10:32:19 2007
@@ -296,92 +296,12 @@
 							   "." + met.getDriverMinorVersion() +
 							   " (" + met.getDriverVersion() + ")");
 
-			testGetSchemasWithTwoParams(met);
-
 
 			System.out.println("getProcedures():");
 			dumpRS(GET_PROCEDURES, getMetaDataRS(met, GET_PROCEDURES,
 				new String [] {null, "%", "GETPCTEST%"},
 				null, null, null));
 
-			// Using reflection to check if we have getFunctions in the
-			// the current version of Derby
-			try {
-				Class s = "".getClass();
-				
-				// Make sure the method is actually implemented
-				java.lang.reflect.Method gf = 
-					met.getClass().getMethod("getFunctions", 
-											 new Class [] { s, s, s });
-				if (!java.lang.reflect.Modifier.isAbstract(gf.getModifiers())){
-					// Any function in any schema in any catalog
-					System.out.println("getFunctions(null,null,null):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gf.
-						   invoke(met, new String [] {null, null, null}));
-
-					// Any function in any schema in "Dummy
-					// Catalog". Same as above since the catalog
-					// argument is ignored (is always null)
-					System.out.println("getFunctions(\"Dummy Catalog\",null,"+
-									   "null):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gf.
-						   invoke(met, new String [] {"Dummy Catalog", 
-													  null, null}));
-
-					// Any function in a schema starting with "SYS"
-					System.out.println("getFunctions(null,\"%SYS%\",null):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gf.
-						   invoke(met, new String [] {null, "SYS%", null}));
-
-					// All functions containing "GET" in any schema
-					// (and any catalog)
-					System.out.println("getFunctions(null,null,\"%GET%\"):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gf.
-						   invoke(met, new String [] {null, null, "%GET%"}));
-
-					// Any function that belongs to NO schema and
-					// NO catalog (none)
-					System.out.println("getFunctions(\"\",\"\",null):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gf.
-						   invoke(met, new String [] {"", "", null}));
-
-				}
-				
-				// Test getFunctionColumns(String,String,String,String)
-				java.lang.reflect.Method gfp = 
-					met.getClass().getMethod("getFunctionColumns", 
-											 new Class [] { s, s, s, s });
-
-				if (!java.lang.reflect.Modifier.
-					isAbstract(gfp.getModifiers())){
-					System.out.println("getFunctionColumns(null,"+
-									   "null,null,null):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gfp.
-						   invoke(met, 
-								  new String [] {null, null, null, null}));
-
-					System.out.println("getFunctionColumns(null,\"APP\","+
-									   "\"DUMMY%\",\"X\"):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gfp.
-						   invoke(met, 
-								  new String [] {null, "APP", "DUMMY%", "X"}));
-
-					System.out.println("getFunctionColumns(null,\"APP\","+
-									   "\"DUMMY%\",\"\"):");
-					dumpRS(IGNORE_PROC_ID, (ResultSet)gfp.
-						   invoke(met, 
-								  new String [] {null, "APP", "DUMMY%", ""}));
-
-				}
-			} 
-			catch (NoSuchMethodException e) {
-				if (org.apache.derby.iapi.services.info.JVMInfo.JDK_ID >= 
-					org.apache.derby.iapi.services.info.JVMInfo.J2SE_16) {
-					e.printStackTrace();
-				}
-			}
-			catch (Exception e) { e.printStackTrace(); }
-
 			System.out.println("getUDTs() with user-named types null :");
  			dumpRS(met.getUDTs(null, null, null, null));
 
@@ -924,55 +844,6 @@
 		}
 
 		System.out.println("Test metadata finished");
-    }
-
-
-
-    /**
-     * Run tests for <code>getSchemas()</code> with two
-     * parameters. (New method introduced by JDBC 4.0.)
-     *
-     * @param dmd a <code>DatabaseMetaData</code> object
-     */
-    private void testGetSchemasWithTwoParams(DatabaseMetaData dmd) {
-        // not implemented in JCC
-        if (TestUtil.isJCCFramework()) return;
-
-        Class[] paramTypes = { String.class, String.class };
-
-        Method method = null;
-        try {
-            method = dmd.getClass().getMethod("getSchemas", paramTypes);
-        } catch (NoSuchMethodException nsme) { }
-
-        if (method == null || Modifier.isAbstract(method.getModifiers())) {
-            System.out.println("DatabaseMetaData.getSchemas(String, String) " +
-                               "is not available.");
-            return;
-        }
-
-        System.out.println();
-        System.out.println("getSchemas(String, String):");
-
-        // array of argument lists
-        String[][] args = {
-            // no qualifiers
-            { null, null },
-            // wildcard
-            { null, "SYS%" },
-            // exact match
-            { null, "APP" },
-            // no match
-            { null, "BLAH" },
-        };
-
-        for (int i = 0; i < args.length; ++i) {
-            try {
-                dumpRS((ResultSet) method.invoke(dmd, args[i]));
-            } catch (Exception e) {
-                dumpAllExceptions(e);
-            }
-        }
     }
 
     /**



Mime
View raw message