You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2006/08/11 18:16:03 UTC
svn commit: r430815 - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/ engine/org/apache/derby/catalog/
engine/org/apache/derby/impl/jdbc/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTes...
Author: rhillegas
Date: Fri Aug 11 09:16:02 2006
New Revision: 430815
URL: http://svn.apache.org/viewvc?rev=430815&view=rev
Log:
DERBY-1530: Commit derby-1530_v01.diff, aligning Derby with the last JDBC4 signature changes.
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestDbMetaData.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.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/JDBC40TranslationTest.java
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/client/org/apache/derby/client/am/DatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java Fri Aug 11 09:16:02 2006
@@ -1183,7 +1183,7 @@
* varchar(128), SchemaName varchar(128), FuncName varchar(128),
* ParamName varchar(128), Options varchar(4000))</code> on the
* server. This procedure will in turn call
- * <code>EmbedDatabaseMetaData.getFunctionParameters(String,String,
+ * <code>EmbedDatabaseMetaData.getFunctionColumns(String,String,
* String,String)</code><p> Compatibility: Only available if both
* server and client version > 10.1, and JDK version >= 1.6. Older
* clients will not have this method available. Newer clients will
@@ -1201,12 +1201,12 @@
* pattern
* @return a <code>ResultSet</code> listing the fucntions
* @exception SqlException if a database error occurs
- * @see #getFunctionParametersX(String, String, String,String)
+ * @see #getFunctionColumnsX(String, String, String,String)
* @see org.apache.derby.impl.sql.catalog.DataDictionaryImpl#create_10_2_system_procedures(TransactionController,UUID)
* @see org.apache.derby.impl.jdbc.EmbedDatabaseMetaData#getFunctions(String,String,String)
*/
public java.sql.ResultSet
- getFunctionParameters(String catalog,
+ getFunctionColumns(String catalog,
String schemaPattern,
String functionNamePattern,
String parameterNamePattern)
@@ -1217,11 +1217,11 @@
if (agent_.loggingEnabled()) {
agent_.logWriter_.
traceEntry(this,
- "getFunctionParameters",
+ "getFunctionColumns",
catalog, schemaPattern,
functionNamePattern, parameterNamePattern);
}
- return getFunctionParametersX(catalog, schemaPattern,
+ return getFunctionColumnsX(catalog, schemaPattern,
functionNamePattern,
parameterNamePattern);
}
@@ -1233,7 +1233,7 @@
}
/**
- * Untraced version of <code>getFunctionParameters(String, String,
+ * Untraced version of <code>getFunctionColumns(String, String,
* String, String)</code>.
* @param catalog limit search to this catalog
* @param schemaPattern limit search to schemas matching this pattern
@@ -1243,15 +1243,15 @@
* this pattern
* @return a <code>ResultSet</code> listing the fucntions
* @exception SqlException if a database error occurs
- * @see #getFunctionParameters(String, String, String, String)
+ * @see #getFunctionColumns(String, String, String, String)
*/
- private ResultSet getFunctionParametersX(String catalog,
+ private ResultSet getFunctionColumnsX(String catalog,
String schemaPattern,
String functionNamePattern,
String parameterNamePattern)
throws SqlException {
checkForClosedConnectionX();
- checkServerJdbcVersionX("getFunctionParameters"+
+ checkServerJdbcVersionX("getFunctionColumns"+
"(String,String,String,String)", 4, 0);
PreparedStatement cs =
Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java Fri Aug 11 09:16:02 2006
@@ -394,7 +394,7 @@
/**
* Map SQLFunctionParameters to
- * EmbedDatabaseMetaData.getFunctionParameters()
+ * EmbedDatabaseMetaData.getFunctionColumns()
*
* @param catalogName SYSIBM.SQLFunctionParameters CatalogName
* varchar(128),
@@ -407,7 +407,7 @@
* @param options SYSIBM.SQLFunctionParameters Options
* varchar(4000))
* @param rs output parameter, the resultset object containing the
- * result of getFunctionParameters().
+ * result of getFunctionColumns().
*/
public static void SQLFUNCTIONPARAMS(String catalogName,
String schemaName,
@@ -417,7 +417,7 @@
ResultSet[] rs) throws SQLException
{
rs[0] = ((EmbedDatabaseMetaData)getDMD()).
- getFunctionParameters(catalogName, schemaName, funcName,
+ getFunctionColumns(catalogName, schemaName, funcName,
paramName);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Fri Aug 11 09:16:02 2006
@@ -1595,10 +1595,10 @@
}
/**
- * Implements DatabaseMetaData.getFunctionParameters() for an embedded
+ * Implements DatabaseMetaData.getFunctionColumns() for an embedded
* database. Queries the database to get information about
* function parameters. Executes the
- * 'getFunctionParameters' query from metadata.properties to obtain the
+ * 'getFunctionColumns' query from metadata.properties to obtain the
* ResultSet.<p> Compatibility: This is a new method in
* the API which is only available with with Derby versions > 10.1 and
* JDK versions >= 1.6 <p>Upgrade: Since this is a new query it
@@ -1616,12 +1616,12 @@
* @return a ResultSet with metadata information
* @throws SQLException if a database error occurs
*/
- public ResultSet getFunctionParameters(String catalog,
+ public ResultSet getFunctionColumns(String catalog,
String schemaPattern,
String functionNamePattern,
String parameterNamePattern)
throws SQLException {
- PreparedStatement s = getPreparedQuery("getFunctionParameters");
+ PreparedStatement s = getPreparedQuery("getFunctionColumns");
// Cannot use doGetProcCols() because our query requires
// parameterNamePattern twice, because both LIKE and = is
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties Fri Aug 11 09:16:02 2006
@@ -1194,15 +1194,20 @@
AND SYS.SYSALIASES.ALIAS LIKE ? \
ORDER BY FUNCTION_SCHEM, FUNCTION_NAME, SPECIFIC_NAME
#
-# getFunctionParameters - Not yet implemented. Logged in JIRA as DERBY-925
-# Return an empty result set with the right shape.
+# getFunctionColumns - From JDBC 4.0, JDK 1.6. Returns
+# function parameters, including eventually, the shape
+# of the ResultSet if the function returns a ResultSet.
+# Param 1 catalog - dummy parameter that is not used
+# Param 2 schemaPattern - NULL=>any, "" => no schema (none)
+# Param 3 functionNamePattern - NULL=>any
+# Param 4 columnNamePattern - NULL=>any
#
-getFunctionParameters=SELECT \
+getFunctionColumns=SELECT \
CAST(NULL AS VARCHAR(128)) AS FUNCTION_CAT, \
S.SCHEMANAME AS FUNCTION_SCHEM, \
A.ALIAS AS FUNCTION_NAME, \
- V."COLUMN_NAME" AS PARAMETER_NAME, \
- V."COLUMN_TYPE" AS PARAMETER_TYPE, \
+ V."COLUMN_NAME" AS COLUMN_NAME, \
+ V."COLUMN_TYPE" AS COLUMN_TYPE, \
V."DATA_TYPE" AS DATA_TYPE, \
V."TYPE_NAME" AS TYPE_NAME, \
V."PRECISION" AS PRECISION, \
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out Fri Aug 11 09:16:02 2006
@@ -98,8 +98,8 @@
null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
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[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]
+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
@@ -117,14 +117,14 @@
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
-getFunctionParameters(null,"APP","DUMMY%","X"):
-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]
+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
-getFunctionParameters(null,"APP","DUMMY%",""):
-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]
+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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Fri Aug 11 09:16:02 2006
@@ -98,8 +98,8 @@
null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
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[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]
+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
@@ -117,14 +117,14 @@
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
-getFunctionParameters(null,"APP","DUMMY%","X"):
-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]
+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
-getFunctionParameters(null,"APP","DUMMY%",""):
-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]
+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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Fri Aug 11 09:16:02 2006
@@ -128,8 +128,8 @@
null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
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[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]
+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
@@ -147,14 +147,14 @@
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
-getFunctionParameters(null,"APP","DUMMY%","X"):
-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]
+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
-getFunctionParameters(null,"APP","DUMMY%",""):
-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]
+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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestDbMetaData.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestDbMetaData.out?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestDbMetaData.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestDbMetaData.out Fri Aug 11 09:16:02 2006
@@ -30,7 +30,7 @@
FUNCTION_CAT,FUNCTION_SCHEM,FUNCTION_NAME,REMARKS,SPECIFIC_NAME
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
-FUNCTION_CAT,FUNCTION_SCHEM,FUNCTION_NAME,PARAMETER_NAME,PARAMETER_TYPE,DATA_TYPE,TYPE_NAME,PRECISION,LENGTH,SCALE,RADIX,NULLABLE,REMARKS,CHAR_OCTET_LENGTH,ORDINAL_POSITION,IS_NULLABLE,SPECIFIC_NAME,METHOD_ID,PARAMETER_ID
+FUNCTION_CAT,FUNCTION_SCHEM,FUNCTION_NAME,COLUMN_NAME,COLUMN_TYPE,DATA_TYPE,TYPE_NAME,PRECISION,LENGTH,SCALE,RADIX,NULLABLE,REMARKS,CHAR_OCTET_LENGTH,ORDINAL_POSITION,IS_NULLABLE,SPECIFIC_NAME,METHOD_ID,PARAMETER_ID
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
@@ -42,7 +42,7 @@
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
-FUNCTION_CAT,FUNCTION_SCHEM,FUNCTION_NAME,PARAMETER_NAME,PARAMETER_TYPE,DATA_TYPE,TYPE_NAME,PRECISION,LENGTH,SCALE,RADIX,NULLABLE,REMARKS,CHAR_OCTET_LENGTH,ORDINAL_POSITION,IS_NULLABLE,SPECIFIC_NAME,METHOD_ID,PARAMETER_ID
+FUNCTION_CAT,FUNCTION_SCHEM,FUNCTION_NAME,COLUMN_NAME,COLUMN_TYPE,DATA_TYPE,TYPE_NAME,PRECISION,LENGTH,SCALE,RADIX,NULLABLE,REMARKS,CHAR_OCTET_LENGTH,ORDINAL_POSITION,IS_NULLABLE,SPECIFIC_NAME,METHOD_ID,PARAMETER_ID
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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out Fri Aug 11 09:16:02 2006
@@ -821,8 +821,8 @@
null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
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[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]
+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
@@ -840,14 +840,14 @@
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
-getFunctionParameters(null,"APP","DUMMY%","X"):
-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]
+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
-getFunctionParameters(null,"APP","DUMMY%",""):
-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]
+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
@@ -2307,8 +2307,8 @@
null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
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[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]
+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
@@ -2326,14 +2326,14 @@
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
-getFunctionParameters(null,"APP","DUMMY%","X"):
-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]
+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
-getFunctionParameters(null,"APP","DUMMY%",""):
-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]
+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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Fri Aug 11 09:16:02 2006
@@ -98,8 +98,8 @@
null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
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[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]
+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
@@ -117,14 +117,14 @@
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
-getFunctionParameters(null,"APP","DUMMY%","X"):
-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]
+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
-getFunctionParameters(null,"APP","DUMMY%",""):
-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]
+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
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=430815&r1=430814&r2=430815&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 Fri Aug 11 09:16:02 2006
@@ -128,8 +128,8 @@
null,SYSCS_UTIL,SYSCS_GET_RUNTIMESTATISTICS,org.apache.derby.catalog.SystemProcedures.SYSCS_GET_RUNTIMESTATISTICS,xxxxGENERATED-IDxxxx
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[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]
+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
@@ -147,14 +147,14 @@
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
-getFunctionParameters(null,"APP","DUMMY%","X"):
-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]
+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
-getFunctionParameters(null,"APP","DUMMY%",""):
-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]
+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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java Fri Aug 11 09:16:02 2006
@@ -36,17 +36,17 @@
}
public void testDatabaseMetaDataFUNCTION_PARAMETER_UNKNOWN() {
- assertEquals(DatabaseMetaData.functionParameterUnknown,
+ assertEquals(DatabaseMetaData.functionColumnUnknown,
JDBC40Translation.FUNCTION_PARAMETER_UNKNOWN);
}
public void testDatabaseMetaDataFUNCTION_PARAMETER_IN() {
- assertEquals(DatabaseMetaData.functionParameterIn,
+ assertEquals(DatabaseMetaData.functionColumnIn,
JDBC40Translation.FUNCTION_PARAMETER_IN);
}
public void testDatabaseMetaDataFUNCTION_PARAMETER_INOUT() {
- assertEquals(DatabaseMetaData.functionParameterInOut,
+ assertEquals(DatabaseMetaData.functionColumnInOut,
JDBC40Translation.FUNCTION_PARAMETER_INOUT);
}
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?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- 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 Aug 11 09:16:02 2006
@@ -96,13 +96,13 @@
// Make sure the constants provided in JDBC40Translation is correct
System.out.println(""+(JDBC40Translation.FUNCTION_PARAMETER_UNKNOWN ==
- DatabaseMetaData.functionParameterUnknown));
+ DatabaseMetaData.functionColumnUnknown));
System.out.println(""+(JDBC40Translation.FUNCTION_PARAMETER_IN ==
- DatabaseMetaData.functionParameterIn));
+ DatabaseMetaData.functionColumnIn));
System.out.println(""+(JDBC40Translation.FUNCTION_PARAMETER_INOUT ==
- DatabaseMetaData.functionParameterInOut));
+ DatabaseMetaData.functionColumnInOut));
System.out.println(""+(JDBC40Translation.FUNCTION_PARAMETER_OUT ==
- DatabaseMetaData.functionParameterOut));
+ DatabaseMetaData.functionColumnOut));
System.out.println(""+(JDBC40Translation.FUNCTION_RETURN ==
DatabaseMetaData.functionReturn));
@@ -122,7 +122,7 @@
DatabaseMetaData.procedureNullable));
// Create some functions in the default schema (app) to make
- // the output from getFunctions() and getFunctionParameters
+ // the output from getFunctions() and getFunctionColumns
// more interesting
s.execute("CREATE FUNCTION DUMMY1 ( X SMALLINT ) RETURNS SMALLINT "+
"PARAMETER STYLE JAVA NO SQL LANGUAGE JAVA EXTERNAL "+
@@ -152,12 +152,12 @@
// NO catalog (none)
checkEmptyRS(met.getFunctions("", "", null));
- // Test getFunctionParameters
+ // Test getFunctionColumns
// Dump parameters for all functions beigging with DUMMY
- dumpRS(met.getFunctionParameters(null,null,"DUMMY%",null));
+ dumpRS(met.getFunctionColumns(null,null,"DUMMY%",null));
// Dump return value for all DUMMY functions
- dumpRS(met.getFunctionParameters(null,null,"DUMMY%",""));
+ dumpRS(met.getFunctionColumns(null,null,"DUMMY%",""));
// Test the new getSchemas() with no schema qualifiers
dumpRS(met.getSchemas(null, null));
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?rev=430815&r1=430814&r2=430815&view=diff
==============================================================================
--- 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 Aug 11 09:16:02 2006
@@ -468,26 +468,26 @@
}
- // Test getFunctionParameters(String,String,String,String)
+ // Test getFunctionColumns(String,String,String,String)
java.lang.reflect.Method gfp =
- met.getClass().getMethod("getFunctionParameters",
+ met.getClass().getMethod("getFunctionColumns",
new Class [] { s, s, s, s });
if (!java.lang.reflect.Modifier.
isAbstract(gfp.getModifiers())){
- System.out.println("getFunctionParameters(null,"+
+ 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("getFunctionParameters(null,\"APP\","+
+ 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("getFunctionParameters(null,\"APP\","+
+ System.out.println("getFunctionColumns(null,\"APP\","+
"\"DUMMY%\",\"\"):");
dumpRS(IGNORE_PROC_ID, (ResultSet)gfp.
invoke(met,