db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From banda...@apache.org
Subject svn commit: r189855 - in /incubator/derby/code/trunk/java: build/org/apache/derbyBuild/ engine/org/apache/derby/catalog/ engine/org/apache/derby/catalog/types/ engine/org/apache/derby/iapi/types/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/
Date Thu, 09 Jun 2005 23:21:16 GMT
Author: bandaram
Date: Thu Jun  9 16:21:14 2005
New Revision: 189855

URL: http://svn.apache.org/viewcvs?rev=189855&view=rev
Log:
Derby-319: The Derby implementation of DatabaseMetaData.getProcedureColumns()
returns incorrect values for the "LENGTH" column of the result, primarily 
because there is no clear definition in the JDBC spec regarding what this 
method is _supposed_ to return. Discussion in the above-posted thread concluded
that the intent of the JDBC metadata is to "match the ODBC metadata", at least
regard to this particular issue. So changes reflecting this conclusion should
be submitted to Derby.

Submitted by Army Brown (qozinx@sbcglobal.net)

Modified:
    incubator/derby/code/trunk/java/build/org/apache/derbyBuild/odbcgen_fragments.properties
    incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java

Modified: incubator/derby/code/trunk/java/build/org/apache/derbyBuild/odbcgen_fragments.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/build/org/apache/derbyBuild/odbcgen_fragments.properties?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/build/org/apache/derbyBuild/odbcgen_fragments.properties (original)
+++ incubator/derby/code/trunk/java/build/org/apache/derbyBuild/odbcgen_fragments.properties Thu Jun  9 16:21:14 2005
@@ -205,7 +205,7 @@
 # data generator class for more details.
 #
 GET_COLS_HELPER_COLS=, \
-\\\n		C.COLUMNDATATYPE.getMaximumWidth() AS COL_MAX_WIDTH
+\\\n		C.COLUMNDATATYPE.getMaximumWidthInBytes() AS COL_MAX_WIDTH_IN_BYTES
 
 # ----------
 #
@@ -220,7 +220,7 @@
 # data generator class for more details.
 #
 BEST_ROW_ID_HELPER_COLS=, \
-\\\n		COLS.COLUMNDATATYPE.getMaximumWidth() AS COL_MAX_WIDTH
+\\\n		COLS.COLUMNDATATYPE.getMaximumWidthInBytes() AS COL_MAX_WIDTH_IN_BYTES
 
 # ----------
 #
@@ -230,18 +230,11 @@
 # defined by the ODBC specification.  Note that
 # any metadata statement requiring this fragment
 # must already have a column named "DATA_TYPE"
-# and a "helper" column named "COL_MAX_WIDTH"
+# and a "helper" column named "COL_MAX_WIDTH_IN_BYTES"
 # as part of the JDBC subquery's result set.
 #
 BUFFER_LEN_FOR_ODBC=\
-CASE WHEN (JDBC_SUBQUERY.DATA_TYPE IN (java.sql.Types::CHAR, \
-\\\n	java.sql.Types::VARCHAR)) \
-\\\n		THEN (CASE WHEN (JDBC_SUBQUERY.COL_MAX_WIDTH * 2.0 > 2147483647) \
-\\\n			THEN 2147483647 \
-\\\n			ELSE (JDBC_SUBQUERY.COL_MAX_WIDTH * 2) END) \
-\\\n		ELSE (CASE WHEN (JDBC_SUBQUERY.COL_MAX_WIDTH > 2147483647) \
-\\\n			THEN 2147483647 \
-\\\n			ELSE JDBC_SUBQUERY.COL_MAX_WIDTH END) END
+JDBC_SUBQUERY.COL_MAX_WIDTH_IN_BYTES
 
 # ----------
 #
@@ -251,19 +244,13 @@
 # columns per the ODBC specification.  Note that
 # any metadata statement requiring this fragment
 # must already have a column named "DATA_TYPE"
-# and a "helper" column named "COL_MAX_WIDTH"
+# and a "helper" column named "COL_MAX_WIDTH_IN_BYTES"
 # as part of the JDBC subquery's result set.
 #
 CHAR_OCTET_FOR_ODBC=\
 CASE WHEN (JDBC_SUBQUERY.DATA_TYPE IN (java.sql.Types::CHAR, \
-\\\n	java.sql.Types::VARCHAR)) \
-\\\n		THEN (CASE WHEN (JDBC_SUBQUERY.COL_MAX_WIDTH * 2.0 > 2147483647) \
-\\\n			THEN 2147483647 \
-\\\n			ELSE (JDBC_SUBQUERY.COL_MAX_WIDTH * 2) END) \
-\\\n		ELSE (CASE WHEN (JDBC_SUBQUERY.DATA_TYPE IN ( \
-\\\n			java.sql.Types::BINARY, java.sql.Types::VARBINARY)) \
-\\\n				THEN (CASE WHEN (JDBC_SUBQUERY.COL_MAX_WIDTH > 2147483647) \
-\\\n					THEN 2147483647 \
-\\\n					ELSE JDBC_SUBQUERY.COL_MAX_WIDTH END) \
-\\\n				ELSE CAST(NULL AS INT) END) END
+\\\n	java.sql.Types::VARCHAR, java.sql.Types::BINARY, \
+\\\n	java.sql.Types::VARBINARY)) \
+\\\n		THEN JDBC_SUBQUERY.COL_MAX_WIDTH_IN_BYTES \
+\\\n		ELSE CAST(NULL AS INT) END
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java Thu Jun  9 16:21:14 2005
@@ -102,7 +102,7 @@
     // @exception SQLException  Thrown if there is a SQL error.
     //
     //
-    public GetProcedureColumns(AliasInfo aliasInfo, String aliasType) throws SQLException 
+    public GetProcedureColumns(AliasInfo aliasInfo, String aliasType) throws SQLException
     {
 		// compile time aliasInfo will be null.
 		if (aliasInfo != null) {
@@ -175,9 +175,9 @@
                 // No corresponding SQL type
                 return 0;
 
-		case 6: // LENGTH:
+		case 6: // LENGTH (in bytes):
                 if (sqlType != null)
-                    return sqlType.getMaximumWidth();
+                    return sqlType.getMaximumWidthInBytes();
 
                 // No corresponding SQL type
                 return 0;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java Thu Jun  9 16:21:14 2005
@@ -74,6 +74,19 @@
 
 
 	/**
+	  Returns the maximum width of the type IN BYTES.  This is the
+	  maximum number of bytes that could be returned for this type
+	  if the corresponding getXXX() method is used.  For example,
+	  if we have a CHAR type, then we want the number of bytes
+	  that would be returned by a ResultSet.getString() call.
+
+	  @return	the maximum length of this Type IN BYTES;
+				-1 means "unknown/no max length"
+	  */
+	public	int			getMaximumWidthInBytes();
+
+
+	/**
 	  Returns the number of decimal digits for the type, if applicable.
 	 
 	  @return	The number of decimal digits for the type.  Returns

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java Thu Jun  9 16:21:14 2005
@@ -155,6 +155,108 @@
 	}
 
 	/**
+	 * Return the length of this type in bytes.  Note that
+	 * while the JDBC API _does_ define a need for
+	 * returning length in bytes of a type, it doesn't
+	 * state clearly what that means for the various
+	 * types.  We assume therefore that the values here
+	 * are meant to match those specified by the ODBC
+	 * specification (esp. since ODBC clients are more
+	 * likely to need this value than a Java client).
+	 * The ODBC spec that defines the values we use here
+	 * can be found at the following link:
+	 * 
+	 * http://msdn.microsoft.com/library/default.asp?url=/library/
+	 * en-us/odbc/htm/odbctransfer_octet_length.asp
+	 *
+	 * @see TypeDescriptor#getMaximumWidthInBytes
+	 */
+	public int	getMaximumWidthInBytes()
+	{
+		switch (typeId.getJDBCTypeId()) {
+
+			case Types.BIT:
+			case Types.TINYINT:
+			case Types.SMALLINT:
+			case Types.INTEGER:
+			case Types.REAL:
+			case Types.DOUBLE:
+			case Types.FLOAT:
+			case Types.BINARY:
+			case Types.VARBINARY:
+			case Types.LONGVARBINARY:
+			case Types.BLOB:
+
+				// For all of these, just take the maximumWidth,
+				// since that already holds the length in bytes.
+				return maximumWidth;
+
+			// For BIGINT values, ODBC spec says to return
+			// 40 because max length of a C/C++ BIGINT in
+			// string form is 20 and we assume the client
+			// character set is Unicode (spec says to
+			// multiply by 2 for unicode).
+			case Types.BIGINT:
+				return 40;
+
+			// ODBC spec explicitly declares what the lengths
+			// should be for datetime values, based on the
+			// declared fields of SQL_DATE_STRUCT, SQL_TIME_STRUCT,
+			// and SQL_TIMESTAMP_STRUCT.  So we just use those
+			// values.
+			case Types.DATE:
+			case Types.TIME:
+				return 6;
+
+			case Types.TIMESTAMP:
+				return 16;
+
+			// ODBC spec says that for numeric/decimal values,
+			// we should use max number of digits plus 2
+			// (for sign and decimal point), since that's
+			// the length of a decimal value in string form.
+			// And since we assume client character set
+			// is unicode, we have to multiply by 2 to
+			// get the number of bytes.
+			case Types.NUMERIC:
+			case Types.DECIMAL:
+				return 2 * (precision + 2);
+
+			// ODBC spec says to use length in chars
+			// for character types, times two if we
+			// assume client character set is unicode.
+			// If 2 * character length is greater than
+			// variable type (in this case, integer),
+			// then we return the max value for an
+			// integer.
+			case Types.CHAR:
+			case Types.VARCHAR:
+			case Types.LONGVARCHAR:
+			case Types.CLOB:
+				if ((maximumWidth > 0) && (2 * maximumWidth < 0))
+				// integer overflow; return max integer possible.
+					return Integer.MAX_VALUE;
+				else
+					return 2 * maximumWidth;
+
+			case Types.ARRAY:
+			case Types.DISTINCT:
+			case Types.NULL:
+			case Types.OTHER:
+			case Types.REF:
+			case Types.STRUCT:
+			case Types.JAVA_OBJECT:
+			default:
+
+				// For these we don't know, so return the "don't-know"
+				// indicator.
+				return -1;
+
+		}
+
+	}
+
+	/**
 	 * Get the jdbc type id for this type.  JDBC type can be
 	 * found in java.sql.Types. 
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java Thu Jun  9 16:21:14 2005
@@ -706,6 +706,14 @@
 	}
 
 	/**
+	 * @see TypeDescriptor#getMaximumWidthInBytes
+	 */
+	public int	getMaximumWidthInBytes()
+	{
+		return typeDescriptor.getMaximumWidthInBytes();
+	}
+
+	/**
 	 * Gets the TypeId for the datatype.
 	 *
 	 * @return	The TypeId for the datatype.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Thu Jun  9 16:21:14 2005
@@ -154,24 +154,24 @@
 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,3,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,3,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,6,0,10,1,null,12,2
+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,8,0,10,1,null,12,6
+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,10,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,8,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,26,6,10,1,null,12,11
+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,8,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,5,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,5,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,5,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,5,null,null,1,null,2,1
+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
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
@@ -246,12 +246,20 @@
 ,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES
 ,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES
 ,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,6,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,7,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,8,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,9,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,10,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,11,YES
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES
 getColumns('LOUIE'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[INTEGER],NUM_PREC_RADIX[INTEGER],NULLABLE[INTEGER],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Thu Jun  9 16:21:14 2005
@@ -184,24 +184,24 @@
 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],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,3,null,null,1,null,null,12,null,3,1,YES,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,3,null,null,1,null,null,12,null,3,2,YES,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,6,0,10,1,null,null,2,null,null,3,YES,12,2
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,12,null,6,1,YES,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,12,null,6,2,YES,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,2,null,null,3,YES,12,2
 null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,5,null,null,4,YES,12,3
 null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,5,null,null,5,YES,12,4
 null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,4,null,null,6,YES,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,8,0,10,1,null,null,-5,null,null,7,YES,12,6
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,-5,null,null,7,YES,12,6
 null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,8,null,null,8,YES,12,7
 null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,8,null,null,9,YES,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,10,null,2,1,null,null,9,1,null,10,YES,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,8,0,2,1,null,null,9,2,null,11,YES,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,26,6,2,1,null,null,9,3,null,12,YES,12,11
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,null,2,1,null,null,9,1,null,10,YES,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,2,1,null,null,9,2,null,11,YES,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,2,1,null,null,9,3,null,12,YES,12,11
 null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,8,0,10,1,null,null,-5,null,null,2,YES,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,1,YES,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,2,YES,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,1,YES,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,2,YES,2,1
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,-5,null,null,2,YES,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,1,YES,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,1,YES,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
 null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
@@ -273,22 +273,30 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES
 ,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,8,0,10,1,,null,-5,null,null,3,YES
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES
 ,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES
 ,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,13,4,10,1,,null,3,null,null,6,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,23,2,10,1,,null,2,null,null,7,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,8,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,9,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,32700,null,null,1,,null,-1,null,null,10,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,11,YES
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES
+,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES
+,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES
 getColumns('LOUIE'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO
 ,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO
 ,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO
 ,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,8,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
+,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
 getColumns('INFLIGHT'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Thu Jun  9 16:21:14 2005
@@ -154,24 +154,24 @@
 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,3,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,3,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,6,0,10,1,null,12,2
+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,8,0,10,1,null,12,6
+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,10,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,8,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,26,6,10,1,null,12,11
+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,8,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,5,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,5,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,5,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,5,null,null,1,null,2,1
+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
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
@@ -246,12 +246,20 @@
 ,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES
 ,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES
 ,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,6,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,7,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,8,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,9,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,10,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,11,YES
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES
 getColumns('LOUIE'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[INTEGER],NUM_PREC_RADIX[INTEGER],NULLABLE[INTEGER],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Thu Jun  9 16:21:14 2005
@@ -184,24 +184,24 @@
 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],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,3,null,null,1,null,null,12,null,3,1,YES,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,3,null,null,1,null,null,12,null,3,2,YES,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,6,0,10,1,null,null,2,null,null,3,YES,12,2
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,12,null,6,1,YES,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,12,null,6,2,YES,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,2,null,null,3,YES,12,2
 null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,5,null,null,4,YES,12,3
 null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,5,null,null,5,YES,12,4
 null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,4,null,null,6,YES,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,8,0,10,1,null,null,-5,null,null,7,YES,12,6
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,-5,null,null,7,YES,12,6
 null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,8,null,null,8,YES,12,7
 null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,8,null,null,9,YES,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,10,null,2,1,null,null,9,1,null,10,YES,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,8,0,2,1,null,null,9,2,null,11,YES,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,26,6,2,1,null,null,9,3,null,12,YES,12,11
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,null,2,1,null,null,9,1,null,10,YES,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,2,1,null,null,9,2,null,11,YES,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,2,1,null,null,9,3,null,12,YES,12,11
 null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,8,0,10,1,null,null,-5,null,null,2,YES,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,1,YES,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,2,YES,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,1,YES,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,2,YES,2,1
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,-5,null,null,2,YES,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,1,YES,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,1,YES,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
 null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
@@ -273,22 +273,30 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES
 ,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,8,0,10,1,,null,-5,null,null,3,YES
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES
 ,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES
 ,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,13,4,10,1,,null,3,null,null,6,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,23,2,10,1,,null,2,null,null,7,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,8,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,9,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,32700,null,null,1,,null,-1,null,null,10,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,11,YES
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES
+,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES
+,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES
 getColumns('LOUIE'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO
 ,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO
 ,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO
 ,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,8,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
+,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
 getColumns('INFLIGHT'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Thu Jun  9 16:21:14 2005
@@ -154,24 +154,24 @@
 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,3,null,null,1,null,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,3,null,null,1,null,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,6,0,10,1,null,12,2
+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,8,0,10,1,null,12,6
+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,10,0,10,1,null,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,8,0,10,1,null,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,26,6,10,1,null,12,11
+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,8,0,10,1,null,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,5,null,null,1,null,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,5,null,null,1,null,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,5,null,null,1,null,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,5,null,null,1,null,2,1
+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
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
@@ -246,12 +246,20 @@
 ,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES
 ,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES
 ,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,6,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,7,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,8,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,9,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,10,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,11,YES
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES
 getColumns('LOUIE'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[INTEGER],NUM_PREC_RADIX[INTEGER],NULLABLE[INTEGER],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Thu Jun  9 16:21:14 2005
@@ -184,24 +184,24 @@
 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],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
-null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,3,null,null,1,null,null,12,null,3,1,YES,12,0
-null,APP,GETPCTEST1,A,1,12,VARCHAR,3,3,null,null,1,null,null,12,null,3,2,YES,12,1
-null,APP,GETPCTEST1,B,1,2,NUMERIC,5,6,0,10,1,null,null,2,null,null,3,YES,12,2
+null,APP,GETPCTEST1,OUTB,4,12,VARCHAR,3,6,null,null,1,null,null,12,null,6,1,YES,12,0
+null,APP,GETPCTEST1,A,1,12,VARCHAR,3,6,null,null,1,null,null,12,null,6,2,YES,12,1
+null,APP,GETPCTEST1,B,1,2,NUMERIC,5,14,0,10,1,null,null,2,null,null,3,YES,12,2
 null,APP,GETPCTEST1,C,1,5,SMALLINT,5,2,0,10,1,null,null,5,null,null,4,YES,12,3
 null,APP,GETPCTEST1,E,1,5,SMALLINT,5,2,0,10,1,null,null,5,null,null,5,YES,12,4
 null,APP,GETPCTEST1,F,1,4,INTEGER,10,4,0,10,1,null,null,4,null,null,6,YES,12,5
-null,APP,GETPCTEST1,G,1,-5,BIGINT,19,8,0,10,1,null,null,-5,null,null,7,YES,12,6
+null,APP,GETPCTEST1,G,1,-5,BIGINT,19,40,0,10,1,null,null,-5,null,null,7,YES,12,6
 null,APP,GETPCTEST1,H,1,8,DOUBLE,52,8,null,2,1,null,null,8,null,null,8,YES,12,7
 null,APP,GETPCTEST1,I,1,8,DOUBLE,52,8,null,2,1,null,null,8,null,null,9,YES,12,8
-null,APP,GETPCTEST1,K,1,91,DATE,10,10,null,2,1,null,null,9,1,null,10,YES,12,9
-null,APP,GETPCTEST1,L,1,92,TIME,8,8,0,2,1,null,null,9,2,null,11,YES,12,10
-null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,26,6,2,1,null,null,9,3,null,12,YES,12,11
+null,APP,GETPCTEST1,K,1,91,DATE,10,6,null,2,1,null,null,9,1,null,10,YES,12,9
+null,APP,GETPCTEST1,L,1,92,TIME,8,6,0,2,1,null,null,9,2,null,11,YES,12,10
+null,APP,GETPCTEST1,T,1,93,TIMESTAMP,26,16,6,2,1,null,null,9,3,null,12,YES,12,11
 null,APP,GETPCTEST2,PA,1,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,2,0
-null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,8,0,10,1,null,null,-5,null,null,2,YES,2,1
-null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,1,YES,2,0
-null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,2,YES,2,1
-null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,1,YES,2,0
-null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,5,null,null,1,null,null,12,null,5,2,YES,2,1
+null,APP,GETPCTEST2,PB,1,-5,BIGINT,19,40,0,10,1,null,null,-5,null,null,2,YES,2,1
+null,APP,GETPCTEST3A,STRING1,1,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,1,YES,2,0
+null,APP,GETPCTEST3A,STRING2,4,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
+null,APP,GETPCTEST3B,STRING3,1,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,1,YES,2,0
+null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
 null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
@@ -273,22 +273,30 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES
 ,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,8,0,10,1,,null,-5,null,null,3,YES
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES
 ,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES
 ,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,13,4,10,1,,null,3,null,null,6,YES
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,23,2,10,1,,null,2,null,null,7,YES
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,8,YES
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,9,YES
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,32700,null,null,1,,null,-1,null,null,10,YES
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,11,YES
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES
+,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES
+,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES
 getColumns('LOUIE'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO
 ,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO
 ,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO
 ,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO
-,APP,LOUIE,AI,-5,BIGINT,19,8,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
+,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO
 getColumns('INFLIGHT'):
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR]
 ,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java?rev=189855&r1=189854&r2=189855&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java Thu Jun  9 16:21:14 2005
@@ -165,17 +165,24 @@
 							"bigintcol bigint, "+
 							"realcol real, "+
 							"doublepreccol double precision default 10, "+
+							"floatcol float default 8.8, "+
 							"decimalcol10p4s decimal(10,4), "+
 							"numericcol20p2s numeric(20,2), "+
 							"char8col___ char(8), "+
+							"char8forbitcol___ char(8) for bit data, "+
 							"varchar9col varchar(9), "+
+							"varchar9bitcol varchar(9) for bit data, "+
 							"longvarcharcol long varchar,"+
-							//"longvarbinarycol long bit varying,"+
+							"longvarbinarycol long varchar for bit data, "+
 							//"nchar10col nchar(10)"
 					  //+ ", nvarchar8col nvarchar(8)"
 					  //+ ", longnvarchar long nvarchar"
 					  //+ ", 
-						"blobcol blob(3K)"
+							"blobcol blob(3K), "+
+							"clobcol clob(3K), "+
+							"datecol date, "+
+							"timecol time, "+
+							"tscol timestamp"
 					  + ")" );
 			// test for beetle 4620
 			s.execute("CREATE TABLE INFLIGHT(FLT_NUM CHAR(20) NOT NULL," + 



Mime
View raw message