db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r396525 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/ma...
Date Mon, 24 Apr 2006 11:55:03 GMT
Author: kahatlen
Date: Mon Apr 24 04:55:02 2006
New Revision: 396525

URL: http://svn.apache.org/viewcvs?rev=396525&view=rev
Log:
DERBY-1094: Make DatabaseMetaData.getProcedureColumns() JDBC4
compliant

The result set returned by getProcedureColumns() is extended with 7
columns: COLUMN_DEF, SQL_DATA_TYPE, SQL_DATETIME_SUB,
CHAR_OCTET_LENGTH, ORDINAL_POSITION, IS_NULLABLE and SPECIFIC_NAME.

Patch contributed by Dyre Tjeldvoll <Dyre.Tjeldvoll@Sun.COM>.

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

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=396525&r1=396524&r2=396525&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
Mon Apr 24 04:55:02 2006
@@ -1540,11 +1540,18 @@
      *      <LI> procedureNullableUnknown - nullability unknown
      *      </UL>
      *	<LI><B>REMARKS</B> String => comment describing parameter/column
+     *	<LI><B>COLUMN_DEF</B> String
+     *	<LI><B>SQL_DATA_TYPE</B> int
+     *	<LI><B>SQL_DATETIME_SUB</B> int
+     *	<LI><B>CHAR_OCTET_LENGTH</B> int
+     *	<LI><B>ORDINAL_POSITION</B> int
+     *	<LI><B>IS_NULLABLE</B> String
+     *	<LI><B>SPECIFIC_NAME</B> String
      *  </OL>
      *
      * <P><B>Note:</B> Some databases may not return the column
      * descriptions for a procedure. Additional columns beyond
-     * REMARKS can be defined by the database.
+     * SPECIFIC_NAME can be defined by the database.
      *
      * @param catalog a catalog name; "" retrieves those without a
      * catalog; null means drop catalog name from the selection criteria
@@ -1562,9 +1569,12 @@
 			String procedureNamePattern,
 			String columnNamePattern) throws SQLException {
 
+		// Using the new JDBC 4.0 version of the query here. The query
+		// was given a new name to allow the old query to
+		// be used by ODBCMetaDataGenerator.
 		return doGetProcCols(catalog, schemaPattern,
 			procedureNamePattern, columnNamePattern,
-			"getProcedureColumns");
+			"getProcedureColumns40");
 	}
 
 	/**
@@ -1576,6 +1586,8 @@
 			String schemaPattern, String procedureNamePattern,
 			String columnNamePattern) throws SQLException {
 
+		// For ODBC we still use the transformed version of the JDBC
+		// 3.0 query, (may change in the future).
 		return doGetProcCols(catalog, schemaPattern,
 			procedureNamePattern, columnNamePattern,
 			"odbc_getProcedureColumns");

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/metadata.properties?rev=396525&r1=396524&r2=396525&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 Mon Apr
24 04:55:02 2006
@@ -185,6 +185,66 @@
             V."COLUMN_NAME" LIKE ? \
 	ORDER BY PROCEDURE_SCHEM, PROCEDURE_NAME, METHOD_ID, PARAMETER_ID
 
+# This is the JDBC 4.0 version of getProcedureColumns, with a new name. The
+# old query is kept to ensure that ODBCMetaDataGenerator will work as
+# before. The old query may be removed when ODBCMetaDataGenerator is
+# modified to correctly transform the new query.
+getProcedureColumns40=\
+SELECT \
+	   CAST (NULL AS VARCHAR(128)) AS PROCEDURE_CAT, \
+	   S.SCHEMANAME                AS PROCEDURE_SCHEM, \
+	   A.ALIAS                     AS PROCEDURE_NAME, \
+	   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, \
+	   V."LENGTH"                  AS LENGTH, \
+ 	   CASE WHEN (V."DATA_TYPE" IN (java.sql.Types::DECIMAL, \
+	   			 java.sql.Types::NUMERIC, java.sql.Types::INTEGER, \
+				 java.sql.Types::SMALLINT, java.sql.Types::TINYINT, \
+				 java.sql.Types::BIGINT, java.sql.Types::DATE, \
+				 java.sql.Types::TIME, java.sql.Types::TIMESTAMP)) \
+			THEN V."SCALE" \
+			ELSE CAST (NULL AS SMALLINT) END AS SCALE, \
+ 	   CASE WHEN (V."DATA_TYPE" IN (java.sql.Types::DECIMAL, \
+	   			 java.sql.Types::NUMERIC, java.sql.Types::INTEGER, \
+				 java.sql.Types::SMALLINT, java.sql.Types::TINYINT, \
+				 java.sql.Types::BIGINT, java.sql.Types::DOUBLE, \
+				 java.sql.Types::FLOAT, java.sql.Types::REAL, \
+				 java.sql.Types::DATE, java.sql.Types::TIME, \
+				 java.sql.Types::TIMESTAMP)) \
+			THEN V."RADIX" \
+			ELSE CAST (NULL AS SMALLINT) END AS RADIX, \
+ 	    V."NULLABLE"                AS NULLABLE, \
+ 	    V."REMARKS"                 AS REMARKS, \
+ 	    CAST (NULL AS VARCHAR(254)) AS COLUMN_DEF, \
+ 	    CAST (NULL AS INTEGER)      AS SQL_DATA_TYPE, \
+ 	    CAST (NULL AS INTEGER)      AS SQL_DATETIME_SUB, \
+ 	    CASE WHEN (V."DATA_TYPE" IN (java.sql.Types::CHAR, \
+			 	  java.sql.Types::VARCHAR, java.sql.Types::BINARY, \
+				  java.sql.Types::VARBINARY)) \
+ 		THEN V."LENGTH" \
+ 		ELSE CAST (NULL AS INTEGER) END AS CHAR_OCTET_LENGTH, \
+ 		CAST ((V."PARAMETER_ID" + 1) AS INT) AS ORDINAL_POSITION, \
+ 		CAST ((CASE WHEN (V."NULLABLE" IN \
+			 			 (java.sql.DatabaseMetaData::procedureNullable)) \
+					THEN 'YES' \
+					ELSE 'NO' END) AS VARCHAR(128)) AS IS_NULLABLE, \
+ 	    A.SPECIFICNAME   AS SPECIFIC_NAME, \
+ 	    V."METHOD_ID"    AS METHOD_ID, \
+ 	    V."PARAMETER_ID" AS PARAMETER_ID \
+FROM \
+	 SYS.SYSALIASES A, SYS.SYSSCHEMAS S, \
+	 NEW org.apache.derby.catalog.GetProcedureColumns(A.ALIASINFO, A.ALIASTYPE) V \
+WHERE \
+	  A.ALIASTYPE = 'P' \
+	  AND S.SCHEMANAME LIKE ? \
+	  AND A.SCHEMAID = S.SCHEMAID \
+	  AND A.ALIAS LIKE ? \
+	  AND V."COLUMN_NAME" LIKE ? \
+ORDER BY PROCEDURE_SCHEM, PROCEDURE_NAME, SPECIFIC_NAME, METHOD_ID, PARAMETER_ID
+
 # This wants a result set with a specific column name,
 # so we wrap the values in a select to name it.
 getTableTypes=\

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=396525&r1=396524&r2=396525&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
Mon Apr 24 04:55:02 2006
@@ -204,26 +204,26 @@
 insertsAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 getConnection(): same connection
 getProcedureColumns():
-PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,12,2
-null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,12,3
-null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,12,4
-null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,12,6
-null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,12,7
-null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,12,11
-null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,1,0
+PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,1,YES,xxxxGENERATED-IDxxxx,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,2,YES,xxxxGENERATED-IDxxxx,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,null,null,null,3,YES,xxxxGENERATED-IDxxxx,12,2
+null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,4,YES,xxxxGENERATED-IDxxxx,12,3
+null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,5,YES,xxxxGENERATED-IDxxxx,12,4
+null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,6,YES,xxxxGENERATED-IDxxxx,12,5
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,7,YES,xxxxGENERATED-IDxxxx,12,6
+null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,8,YES,xxxxGENERATED-IDxxxx,12,7
+null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,9,YES,xxxxGENERATED-IDxxxx,12,8
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,null,null,null,null,10,YES,xxxxGENERATED-IDxxxx,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,null,null,null,null,11,YES,xxxxGENERATED-IDxxxx,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,null,null,null,null,12,YES,xxxxGENERATED-IDxxxx,12,11
+null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out?rev=396525&r1=396524&r2=396525&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
Mon Apr 24 04:55:02 2006
@@ -297,26 +297,26 @@
 SupportsResultSetConcurrency: TYPE_SCROLL_SENSITIVE,CONCUR_UPDATABLE: false
 getConnection(): same connection
 getProcedureColumns():
-PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,12,2
-null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,12,3
-null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,12,4
-null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,12,6
-null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,12,7
-null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,12,11
-null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,1,0
+PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,1,YES,xxxxGENERATED-IDxxxx,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,2,YES,xxxxGENERATED-IDxxxx,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,null,null,null,3,YES,xxxxGENERATED-IDxxxx,12,2
+null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,4,YES,xxxxGENERATED-IDxxxx,12,3
+null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,5,YES,xxxxGENERATED-IDxxxx,12,4
+null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,6,YES,xxxxGENERATED-IDxxxx,12,5
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,7,YES,xxxxGENERATED-IDxxxx,12,6
+null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,8,YES,xxxxGENERATED-IDxxxx,12,7
+null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,9,YES,xxxxGENERATED-IDxxxx,12,8
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,null,null,null,null,10,YES,xxxxGENERATED-IDxxxx,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,null,null,null,null,11,YES,xxxxGENERATED-IDxxxx,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,null,null,null,null,12,YES,xxxxGENERATED-IDxxxx,12,11
+null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=396525&r1=396524&r2=396525&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
Mon Apr 24 04:55:02 2006
@@ -297,26 +297,26 @@
 SupportsResultSetConcurrency: TYPE_SCROLL_SENSITIVE,CONCUR_UPDATABLE: false
 getConnection(): same connection
 getProcedureColumns():
-PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,12,2
-null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,12,3
-null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,12,4
-null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,12,6
-null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,12,7
-null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,12,11
-null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,1,0
+PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,1,YES,xxxxGENERATED-IDxxxx,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,2,YES,xxxxGENERATED-IDxxxx,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,null,null,null,3,YES,xxxxGENERATED-IDxxxx,12,2
+null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,4,YES,xxxxGENERATED-IDxxxx,12,3
+null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,5,YES,xxxxGENERATED-IDxxxx,12,4
+null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,6,YES,xxxxGENERATED-IDxxxx,12,5
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,7,YES,xxxxGENERATED-IDxxxx,12,6
+null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,8,YES,xxxxGENERATED-IDxxxx,12,7
+null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,9,YES,xxxxGENERATED-IDxxxx,12,8
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,null,null,null,null,10,YES,xxxxGENERATED-IDxxxx,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,null,null,null,null,11,YES,xxxxGENERATED-IDxxxx,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,null,null,null,null,12,YES,xxxxGENERATED-IDxxxx,12,11
+null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out?rev=396525&r1=396524&r2=396525&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
Mon Apr 24 04:55:02 2006
@@ -985,26 +985,26 @@
 SupportsResultSetConcurrency: TYPE_SCROLL_SENSITIVE,CONCUR_UPDATABLE: false
 getConnection(): same connection
 getProcedureColumns():
-PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,12,2
-null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,12,3
-null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,12,4
-null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,12,6
-null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,12,7
-null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,12,11
-null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,1,0
+PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,1,YES,xxxxGENERATED-IDxxxx,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,2,YES,xxxxGENERATED-IDxxxx,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,null,null,null,3,YES,xxxxGENERATED-IDxxxx,12,2
+null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,4,YES,xxxxGENERATED-IDxxxx,12,3
+null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,5,YES,xxxxGENERATED-IDxxxx,12,4
+null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,6,YES,xxxxGENERATED-IDxxxx,12,5
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,7,YES,xxxxGENERATED-IDxxxx,12,6
+null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,8,YES,xxxxGENERATED-IDxxxx,12,7
+null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,9,YES,xxxxGENERATED-IDxxxx,12,8
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,null,null,null,null,10,YES,xxxxGENERATED-IDxxxx,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,null,null,null,null,11,YES,xxxxGENERATED-IDxxxx,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,null,null,null,null,12,YES,xxxxGENERATED-IDxxxx,12,11
+null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
@@ -2402,26 +2402,26 @@
 SupportsResultSetConcurrency: TYPE_SCROLL_SENSITIVE,CONCUR_UPDATABLE: false
 getConnection(): same connection
 getProcedureColumns():
-PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,12,2
-null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,12,3
-null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,12,4
-null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,12,6
-null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,12,7
-null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,12,11
-null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,1,0
+PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,1,YES,xxxxGENERATED-IDxxxx,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,2,YES,xxxxGENERATED-IDxxxx,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,null,null,null,3,YES,xxxxGENERATED-IDxxxx,12,2
+null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,4,YES,xxxxGENERATED-IDxxxx,12,3
+null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,5,YES,xxxxGENERATED-IDxxxx,12,4
+null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,6,YES,xxxxGENERATED-IDxxxx,12,5
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,7,YES,xxxxGENERATED-IDxxxx,12,6
+null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,8,YES,xxxxGENERATED-IDxxxx,12,7
+null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,9,YES,xxxxGENERATED-IDxxxx,12,8
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,null,null,null,null,10,YES,xxxxGENERATED-IDxxxx,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,null,null,null,null,11,YES,xxxxGENERATED-IDxxxx,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,null,null,null,null,12,YES,xxxxGENERATED-IDxxxx,12,11
+null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=396525&r1=396524&r2=396525&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
Mon Apr 24 04:55:02 2006
@@ -297,26 +297,26 @@
 SupportsResultSetConcurrency: TYPE_SCROLL_SENSITIVE,CONCUR_UPDATABLE: false
 getConnection(): same connection
 getProcedureColumns():
-PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,12,2
-null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,12,3
-null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,12,4
-null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,12,6
-null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,12,7
-null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,12,11
-null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,2,1
-null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,1,0
+PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SPECIFIC_NAME[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,1,YES,xxxxGENERATED-IDxxxx,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,null,null,6,2,YES,xxxxGENERATED-IDxxxx,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,null,null,null,3,YES,xxxxGENERATED-IDxxxx,12,2
+null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,4,YES,xxxxGENERATED-IDxxxx,12,3
+null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,null,null,null,5,YES,xxxxGENERATED-IDxxxx,12,4
+null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,6,YES,xxxxGENERATED-IDxxxx,12,5
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,7,YES,xxxxGENERATED-IDxxxx,12,6
+null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,8,YES,xxxxGENERATED-IDxxxx,12,7
+null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,null,null,null,9,YES,xxxxGENERATED-IDxxxx,12,8
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,0,10,1,null,null,null,null,null,10,YES,xxxxGENERATED-IDxxxx,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,10,1,null,null,null,null,null,11,YES,xxxxGENERATED-IDxxxx,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,10,1,null,null,null,null,null,12,YES,xxxxGENERATED-IDxxxx,12,11
+null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,null,null,null,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,1,YES,xxxxGENERATED-IDxxxx,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,null,null,10,2,YES,xxxxGENERATED-IDxxxx,2,1
+null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,null,null,null,1,YES,xxxxGENERATED-IDxxxx,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,



Mime
View raw message