db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r417497 [1/6] - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ client/org/apache/derby/client/am/ engine/org/apache/derby/catalog/ engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/master/ testing/...
Date Tue, 27 Jun 2006 16:18:44 GMT
Author: kahatlen
Date: Tue Jun 27 09:18:43 2006
New Revision: 417497

URL: http://svn.apache.org/viewvc?rev=417497&view=rev
Log:
DERBY-137: Derby metadata always returns JDBC 2 result sets, even when
JDBC 3 result sets are required.

Summary of the changes:

  DatabaseMetaData:

    - getProcedureColumns: modified VTI to return an int instead of a
      short for the DATA_TYPE column
    - getTables: new columns: TYPE_CAT, TYPE_SCHEM, TYPE_NAME,
      SELF_REFERENCING_COL_NAME, REF_GENERATION (all null since Derby
      doesn't support typed tables)
    - getColumns: DATA_TYPE changed from SMALLINT to INTEGER. New
      columns: SCOPE_CATLOG, SCOPE_SCHEMA, SCOPE_TABLE,
      SOURCE_DATATYPE (all null since Derby doesn't support the REF or
      DISTINCT data types)
    - getVersionColumns: SCOPE, DECIMAL_DIGITS and PSEUDO_COLUMN
      changed from INTEGER to SMALLINT
    - getPrimaryKeys: KEY_SEQ changed from INTEGER to SMALLINT (the
      new query is ODBC compliant so getPrimaryKeysForODBC was removed)
    - getTypeInfo: DATA_TYPE changed from SMALLINT to INTEGER, NULLABLE, 
      SEARCHABLE, MINIMUM_SCALE and MAXIMUM_SCALE changed from INTEGER to
      SMALLINT
    - getIndexInfo: ORDINAL_POSITION changed from INTEGER to SMALLINT
    - getBestRowIdentifier: DATA_TYPE changed from SMALLINT to INTEGER
    - getUDTs: new columm: BASE_TYPE (null since Derby doesn't support
      the DISTINCT type or SELF_REFERENCING_COLUMN)

  ODBCMetadataGenerator:

    - cast DATA_TYPE columns to SMALLINT (as defined by ODBC)
    - don't cast columns that already are SMALLINT to SMALLINT

  Tests:

    - updated master files for metadata, odbc_metadata,
      bestrowidentifier, declareGlobalTempTableJava and
      Upgrade_10_1_10_2 (new columns and modified data types)
    - odbc_metadata.java: added information about nullability for some
      of the new columns to avoid ArrayIndexOutOfBoundsException

Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.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/DerbyNet/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_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/DerbyNetClient/odbc_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/bestrowidentifier.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.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/jdbcapi/odbc_metadata.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java?rev=417497&r1=417496&r2=417497&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java Tue Jun 27 09:18:43 2006
@@ -202,9 +202,6 @@
 		changeMap.put("getBestRowIdentifierAllColumns",
 			new Byte(TYPE_VALUE_CHANGE));
 
-		changeMap.put("getPrimaryKeys",
-			new Byte(TYPE_VALUE_CHANGE));
-
 		changeMap.put("getTypeInfo",
 			new Byte((byte)(COL_RENAME_CHANGE
 				| TYPE_VALUE_CHANGE
@@ -911,16 +908,13 @@
 	{
 
 		if (queryName.equals("getTypeInfo")) {
-			if (colName.equals("NULLABLE") ||
+			if (colName.equals("DATA_TYPE") ||
 				colName.equals("CASE_SENSITIVE") ||
-				colName.equals("SEARCHABLE") ||
 				colName.equals("UNSIGNED_ATTRIBUTE") ||
 				colName.equals("FIXED_PREC_SCALE") ||
 				colName.equals("AUTO_UNIQUE_VAL") ||
 				colName.equals("SQL_DATA_TYPE") ||
-				colName.equals("SQL_DATETIME_SUB") ||
-				colName.equals("MINIMUM_SCALE") ||
-				colName.equals("MAXIMUM_SCALE"))
+				colName.equals("SQL_DATETIME_SUB"))
 			{
 				return "SMALLINT";
 			}
@@ -928,6 +922,7 @@
 		else if (queryName.equals("getColumns")) {
 			if (colName.equals("DECIMAL_DIGITS") ||
 				colName.equals("NULLABLE") ||
+				colName.equals("DATA_TYPE") ||
 				colName.equals("NUM_PREC_RADIX") ||
 				colName.equals("SQL_DATA_TYPE") ||
 				colName.equals("SQL_DATETIME_SUB"))
@@ -935,23 +930,24 @@
 				return "SMALLINT";
 			}
 		}
+		else if (queryName.equals("getProcedureColumns")) {
+			if (colName.equals("DATA_TYPE")) {
+				return "SMALLINT";
+			}
+		}
 		else if (queryName.equals("getVersionColumns")) {
-			if (colName.equals("SCOPE") ||
-				colName.equals("DATA_TYPE") ||
-				colName.equals("DECIMAL_DIGITS") ||
-				colName.equals("PSEUDO_COLUMN"))
-			{
+			if (colName.equals("DATA_TYPE")) {
 				return "SMALLINT";
 			}
 		}
-		else if (queryName.equals("getPrimaryKeys")) {
-			if (colName.equals("KEY_SEQ"))
+		else if (queryName.startsWith("getBestRowIdentifier")) {
+			if (colName.equals("DATA_TYPE")) {
 				return "SMALLINT";
+			}
 		}
 		else if (queryName.equals("getIndexInfo")) {
 			if (colName.equals("NON_UNIQUE") ||
-				colName.equals("TYPE") ||
-				colName.equals("ORDINAL_POSITION"))
+				colName.equals("TYPE"))
 			{
 				return "SMALLINT";
 			}

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=417497&r1=417496&r2=417497&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 Tue Jun 27 09:18:43 2006
@@ -2193,7 +2193,7 @@
                 "CAST(NULL AS VARCHAR(128)) AS TYPE_SCHEM," +
                 "VARCHAR('', 128) AS TYPE_NAME," +
                 "VARCHAR('',128) AS ATTR_NAME," +
-                "SMALLINT(0) AS DATA_TYPE," +
+                "0 AS DATA_TYPE," +
                 "VARCHAR('',129) AS ATTR_TYPE_NAME," +
                 "0 AS ATTR_SIZE," +
                 "0 AS DECIMAL_DIGITS," +

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java?rev=417497&r1=417496&r2=417497&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java Tue Jun 27 09:18:43 2006
@@ -61,7 +61,7 @@
       <LI> procedureColumnReturn - procedure return value
       <LI> procedureColumnResult - result column in ResultSet
       </UL>
-  <LI><B>DATA_TYPE</B> short => SQL type from java.sql.Types
+  <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
         <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
   type name is fully qualified
         <LI><B>PRECISION</B> int => precision
@@ -200,6 +200,12 @@
     {
         switch (column) 
         {
+        case 3: // DATA_TYPE:
+            if (sqlType != null) {
+                return sqlType.getJDBCTypeId();
+            }
+            return java.sql.Types.JAVA_OBJECT;
+
 		case 5: // PRECISION:
                 if (sqlType != null)
                 {
@@ -241,12 +247,6 @@
 		case 2: // COLUMN_TYPE:
 			return columnType;
 
-		case 3: // DATA_TYPE:
-                if (sqlType != null)
-                    return (short)sqlType.getJDBCTypeId();
-                else
-                    return (short) java.sql.Types.JAVA_OBJECT;
-
 		case 7: // SCALE:
                 if (sqlType != null)
                     return (short)sqlType.getScale();
@@ -296,7 +296,7 @@
 
 		EmbedResultSetMetaData.getResultColumnDescriptor("COLUMN_NAME",				 Types.VARCHAR, false, 128),
 		EmbedResultSetMetaData.getResultColumnDescriptor("COLUMN_TYPE",				 Types.SMALLINT, false),
-		EmbedResultSetMetaData.getResultColumnDescriptor("DATA_TYPE",				 Types.SMALLINT, false),
+		EmbedResultSetMetaData.getResultColumnDescriptor("DATA_TYPE",				 Types.INTEGER, false),
 		EmbedResultSetMetaData.getResultColumnDescriptor("TYPE_NAME",				 Types.VARCHAR, false, 22),
 		EmbedResultSetMetaData.getResultColumnDescriptor("PRECISION",				 Types.INTEGER, false),
 		EmbedResultSetMetaData.getResultColumnDescriptor("LENGTH",					 Types.INTEGER, false),

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=417497&r1=417496&r2=417497&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 Tue Jun 27 09:18:43 2006
@@ -494,10 +494,7 @@
 	public static void SQLPRIMARYKEYS (String catalogName, String schemaName, String tableName, String options, ResultSet[] rs)
 		throws SQLException
 	{
-		rs[0] = isForODBC(options)
-			? ((EmbedDatabaseMetaData)getDMD()).getPrimaryKeysForODBC(
-				catalogName, schemaName, tableName)
-			: getDMD().getPrimaryKeys(catalogName, schemaName, tableName);
+		rs[0] = getDMD().getPrimaryKeys(catalogName, schemaName, tableName);
 	}
 
 	/**

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=417497&r1=417496&r2=417497&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 Tue Jun 27 09:18:43 2006
@@ -1527,7 +1527,7 @@
      *      <LI> procedureColumnReturn - procedure return value
      *      <LI> procedureColumnResult - result column in ResultSet
      *      </UL>
-     *  <LI><B>DATA_TYPE</B> short => SQL type from java.sql.Types
+     *  <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
      *	<LI><B>TYPE_NAME</B> String => SQL type name
      *	<LI><B>PRECISION</B> int => precision
      *	<LI><B>LENGTH</B> int => length in bytes of data
@@ -1673,6 +1673,19 @@
      *			"VIEW",	"SYSTEM TABLE", "GLOBAL TEMPORARY",
      *			"LOCAL TEMPORARY", "ALIAS", "SYNONYM".
      *	<LI><B>REMARKS</B> String => explanatory comment on the table
+     *  <LI><B>TYPE_CAT</B> String => the types catalog (may be
+     *          <code>null</code>)
+     *  <LI><B>TYPE_SCHEM</B> String => the types schema (may be
+     *          <code>null</code>)
+     *  <LI><B>TYPE_NAME</B> String => type name (may be
+     *          <code>null</code>)
+     *  <LI><B>SELF_REFERENCING_COL_NAME</B> String => name of the
+     *          designated "identifier" column of a typed table (may
+     *          be <code>null</code>)
+     *  <LI><B>REF_GENERATION</B> String => specifies how values in
+     *          SELF_REFERENCING_COL_NAME are created. Values are
+     *          "SYSTEM", "USER", "DERIVED". (may be
+     *          <code>null</code>)
      *  </OL>
      *
      * <P><B>Note:</B> Some databases may not return information for
@@ -1808,7 +1821,7 @@
      *	<LI><B>TABLE_SCHEM</B> String => table schema (may be null)
      *	<LI><B>TABLE_NAME</B> String => table name
      *	<LI><B>COLUMN_NAME</B> String => column name
-     *	<LI><B>DATA_TYPE</B> short => SQL type from java.sql.Types
+     *	<LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
      *	<LI><B>TYPE_NAME</B> String => Data source dependent type name
      *	<LI><B>COLUMN_SIZE</B> int => column size.  For char or date
      *	    types this is the maximum number of characters, for numeric or
@@ -1833,6 +1846,27 @@
      *	<LI><B>IS_NULLABLE</B> String => "NO" means column definitely
      *      does not allow NULL values; "YES" means the column might
      *      allow NULL values.  An empty string means nobody knows.
+     *  <LI><B>SCOPE_CATLOG</B> String => catalog of table that is the
+     *  scope of a reference attribute (<code>null</code> if DATA_TYPE
+     *  isn't REF)
+     *  <LI><B>SCOPE_SCHEMA</B> String => schema of table that is the
+     *  scope of a reference attribute (<code>null</code> if the
+     *  DATA_TYPE isn't REF)
+     *  <LI><B>SCOPE_TABLE</B> String => table name that this the
+     *  scope of a reference attribure (<code>null</code> if the
+     *  DATA_TYPE isn't REF)
+     *  <LI><B>SOURCE_DATA_TYPE</B> short => source type of a distinct
+     *  type or user-generated Ref type, SQL type from java.sql.Types
+     *  (<code>null</code> if DATA_TYPE isn't DISTINCT or
+     *  user-generated REF)
+     *  <LI><B>IS_AUTOINCREMENT</B> String => Indicates whether this
+     *  column is auto incremented
+     *  <UL>
+     *  <LI> YES --- if the column is auto incremented
+     *  <LI> NO --- if the column is not auto incremented
+     *  <LI> empty string --- if it cannot be determined whether the
+     *       column is auto incremented parameter is unknown
+     *  </UL>
      *  </OL>
      *
      * @param catalog a catalog name; "" retrieves those without a
@@ -1979,7 +2013,7 @@
      *      <LI> bestRowSession - valid for remainder of current session
      *      </UL>
      *	<LI><B>COLUMN_NAME</B> String => column name
-     *	<LI><B>DATA_TYPE</B> short => SQL data type from java.sql.Types
+     *	<LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
      *	<LI><B>TYPE_NAME</B> String => Data source dependent type name
      *	<LI><B>COLUMN_SIZE</B> int => precision
      *	<LI><B>BUFFER_LENGTH</B> int => not used
@@ -2174,7 +2208,7 @@
      *  <OL>
      *	<LI><B>SCOPE</B> short => is not used
      *	<LI><B>COLUMN_NAME</B> String => column name
-     *	<LI><B>DATA_TYPE</B> short => SQL data type from java.sql.Types
+     *	<LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
      *	<LI><B>TYPE_NAME</B> String => Data source dependent type name
      *	<LI><B>COLUMN_SIZE</B> int => precision
      *	<LI><B>BUFFER_LENGTH</B> int => length of column value in bytes
@@ -2283,31 +2317,7 @@
      */
 	public ResultSet getPrimaryKeys(String catalog, String schema,
 			String table) throws SQLException {
-		return doGetPrimaryKeys(catalog, schema, table, "getPrimaryKeys");
-	}
-
-	/**
-	 * Get a description of a table's primary key columns.  They
-	 * are ordered by COLUMN_NAME.  Same as getPrimaryKeys above,
-	 * except that the result set will conform to ODBC specifications.
-	 */
-	public ResultSet getPrimaryKeysForODBC(String catalog, String schema,
-				String table) throws SQLException {
-		return doGetPrimaryKeys(catalog, schema, table, "odbc_getPrimaryKeys");
-	}
-
-	/**
-	 * Does the actual work for the getPrimaryKeys metadata
-	 * calls.  See getPrimaryKeys() method above for parameter
-	 * descriptions.
-	 * @param queryName Name of the query to execute; is used
-	 *	to determine whether the result set should conform to
-	 *	JDBC or ODBC specifications.
-	 */
-	private ResultSet doGetPrimaryKeys(String catalog, String schema,
-		String table, String queryName) throws SQLException {
-
-		PreparedStatement s = getPreparedQuery(queryName);
+		PreparedStatement s = getPreparedQuery("getPrimaryKeys");
 		s.setString(1, swapNull(catalog));
 		s.setString(2, swapNull(schema));
 		s.setString(3, swapNull(table));
@@ -2570,7 +2580,7 @@
      * <P>Each type description has the following columns:
      *  <OL>
      *	<LI><B>TYPE_NAME</B> String => Type name
-     *	<LI><B>DATA_TYPE</B> short => SQL data type from java.sql.Types
+     *	<LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
      *	<LI><B>PRECISION</B> int => maximum precision
      *	<LI><B>LITERAL_PREFIX</B> String => prefix used to quote a literal
      *      (may be null)
@@ -2940,6 +2950,12 @@
      *	<LI><B>DATA_TYPE</B> String => type value defined in java.sql.Types.  
      *  One of JAVA_OBJECT, STRUCT, or DISTINCT
      *	<LI><B>REMARKS</B> String => explanatory comment on the type
+     *  <LI><B>BASE_TYPE</B> short => type code of the source type of
+     *  a DISTINCT type or the type that implements the user-generated
+     *  reference type of the SELF_REFERENCING_COLUMN of a structured
+     *  type as defined in java.sql.Types (<code>null</code> if
+     *  DATA_TYPE is not DISTINCT or not STRUCT with
+     *  REFERENCE_GENERATION = USER_DEFINED)
      *  </OL>
      *
      * <P><B>Note:</B> If the driver does not support UDTs then an empty

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=417497&r1=417496&r2=417497&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 Tue Jun 27 09:18:43 2006
@@ -106,7 +106,12 @@
 		SCHEMANAME AS TABLE_SCHEM,  \
 		TABLENAME AS TABLE_NAME, \
 		(CAST (RTRIM(TABLE_TYPE) AS VARCHAR(12))) \
-		AS TABLE_TYPE, CAST ('' AS VARCHAR(128)) AS REMARKS \
+		AS TABLE_TYPE, CAST ('' AS VARCHAR(128)) AS REMARKS, \
+                CAST (NULL AS VARCHAR(128)) AS TYPE_CAT, \
+                CAST (NULL AS VARCHAR(128)) AS TYPE_SCHEM, \
+                CAST (NULL AS VARCHAR(128)) AS TYPE_NAME, \
+                CAST (NULL AS VARCHAR(128)) AS SELF_REFERENCING_COL_NAME, \
+                CAST (NULL AS VARCHAR(128)) AS REF_GENERATION \
 	FROM \
 		 SYS.SYSTABLES, \
 	     SYS.SYSSCHEMAS, \
@@ -272,7 +277,7 @@
 		S.SCHEMANAME AS TABLE_SCHEM, \
 		T.TABLENAME AS TABLE_NAME, \
 		C.COLUMNNAME AS COLUMN_NAME, \
-		(CAST (C.COLUMNDATATYPE.getJDBCTypeId() AS SMALLINT)) AS DATA_TYPE, \
+		C.COLUMNDATATYPE.getJDBCTypeId() AS DATA_TYPE, \
 		(CAST (C.COLUMNDATATYPE.getTypeName() \
 		 AS VARCHAR(128))) AS TYPE_NAME, \
 		CASE WHEN (C.COLUMNDATATYPE.getJDBCTypeId() IN (java.sql.Types::INTEGER, \
@@ -330,6 +335,10 @@
 		C.COLUMNNUMBER AS ORDINAL_POSITION, \
 		CAST ((CASE WHEN C.COLUMNDATATYPE.isNullable() THEN 'YES' ELSE 'NO' END) AS VARCHAR(128)) \
 		 	AS IS_NULLABLE, \
+                CAST (NULL AS VARCHAR(128)) AS SCOPE_CATLOG, \
+                CAST (NULL AS VARCHAR(128)) AS SCOPE_SCHEMA, \
+                CAST (NULL AS VARCHAR(128)) AS SCOPE_TABLE, \
+                CAST (NULL AS SMALLINT) AS SOURCE_DATA_TYPE, \
                 CAST ((CASE WHEN (AUTOINCREMENTINC is not NULL) THEN 'YES' ELSE 'NO' END) AS VARCHAR(128)) \
 		 	AS IS_AUTOINCREMENT \
 	FROM SYS.SYSSCHEMAS S, \
@@ -457,7 +466,8 @@
 getVersionColumns=\
 	SELECT SCOPE, COLUMN_NAME, DATA_TYPE, TYPE_NAME, COLUMN_SIZE, \
 		BUFFER_LENGTH, DECIMAL_DIGITS, PSEUDO_COLUMN \
-	FROM ( VALUES (1, CAST ('' AS VARCHAR(128)), 1, CAST ('' AS VARCHAR(128)), 1, 1, 1, 1) ) \
+	FROM ( VALUES (SMALLINT(1), CAST ('' AS VARCHAR(128)), 1, \
+		 CAST ('' AS VARCHAR(128)), 1, 1, SMALLINT(1), SMALLINT(1)) ) \
 		AS VERSIONCOLUMNS (SCOPE, COLUMN_NAME, DATA_TYPE, \
 			TYPE_NAME, COLUMN_SIZE, BUFFER_LENGTH, \
 			DECIMAL_DIGITS, PSEUDO_COLUMN ) \
@@ -471,7 +481,7 @@
 	SELECT CAST ('' AS VARCHAR(128)) AS TABLE_CAT, \
 		   S.SCHEMANAME AS TABLE_SCHEM, T.TABLENAME AS TABLE_NAME, \
 		   COLS.COLUMNNAME AS COLUMN_NAME, \
-		   CONGLOMS.DESCRIPTOR.getKeyColumnPosition(COLS.COLUMNNUMBER) AS KEY_SEQ, \
+		   CAST (CONGLOMS.DESCRIPTOR.getKeyColumnPosition(COLS.COLUMNNUMBER) AS SMALLINT) AS KEY_SEQ, \
 		   CONS.CONSTRAINTNAME AS PK_NAME \
 	FROM --DERBY-PROPERTIES joinOrder=FIXED \n \
 			SYS.SYSTABLES T --DERBY-PROPERTIES index='SYSTABLES_INDEX1' \n\
@@ -711,20 +721,20 @@
 
 getTypeInfo=\
 	SELECT CAST (RTRIM(CAST (T1 AS CHAR(128))) AS VARCHAR(128)) AS TYPE_NAME, \
-		CAST (T2 AS SMALLINT) AS DATA_TYPE, \
+		T2 AS DATA_TYPE, \
 		T3 AS PRECISION, \
 		CAST (RTRIM(CAST(T4 AS CHAR(10))) AS VARCHAR(10)) AS LITERAL_PREFIX, \
 		CAST (RTRIM(T5) AS VARCHAR(10)) AS LITERAL_SUFFIX, \
 		CAST (RTRIM(CAST(T6 AS CHAR(20))) AS VARCHAR(20)) AS CREATE_PARAMS, \
-		T7 AS NULLABLE, \
+		CAST (T7 AS SMALLINT) AS NULLABLE, \
 		T8 AS CASE_SENSITIVE, \
-		T9 AS SEARCHABLE, \
+		CAST (T9 AS SMALLINT) AS SEARCHABLE, \
 		T10 AS UNSIGNED_ATTRIBUTE, \
 		T11 AS FIXED_PREC_SCALE, \
 		T12 AS AUTO_INCREMENT, \
 		CAST (RTRIM(CAST(T1 AS CHAR(128))) AS VARCHAR(128)) AS LOCAL_TYPE_NAME, \
-		T14 AS MINIMUM_SCALE, \
-		T15 AS MAXIMUM_SCALE, \
+		CAST (T14 AS SMALLINT) AS MINIMUM_SCALE, \
+		CAST (T15 AS SMALLINT) AS MAXIMUM_SCALE, \
 		CAST (NULL AS INT) AS SQL_DATA_TYPE, \
 		CAST (NULL AS INT) AS SQL_DATETIME_SUB, \
 		T18 AS NUM_PREC_RADIX \
@@ -798,7 +808,7 @@
 		   CAST ('' AS VARCHAR(128)) AS INDEX_QUALIFIER, \
 		   CONGLOMS.CONGLOMERATENAME AS INDEX_NAME, \
 		   java.sql.DatabaseMetaData::tableIndexOther AS TYPE, \
-		   CONGLOMS.DESCRIPTOR.getKeyColumnPosition(COLS.COLUMNNUMBER) AS ORDINAL_POSITION, \
+		   CAST (CONGLOMS.DESCRIPTOR.getKeyColumnPosition(COLS.COLUMNNUMBER) AS SMALLINT) AS ORDINAL_POSITION, \
 		   COLS.COLUMNNAME AS COLUMN_NAME, \
 		   CASE WHEN CONGLOMS.DESCRIPTOR.isAscending( \
 				CONGLOMS.DESCRIPTOR.getKeyColumnPosition(COLS.COLUMNNUMBER)) THEN 'A' ELSE 'D' END AS ASC_OR_DESC, \
@@ -837,7 +847,7 @@
 	FROM (VALUES \
 		(CAST (2  AS SMALLINT), \
 		 CAST ('' AS VARCHAR(128)), \
-		 CAST (0  AS SMALLINT), \
+		 0, \
 		 CAST ('INT' AS VARCHAR(128)), \
 		 0, \
 		 0,	\
@@ -878,7 +888,7 @@
 	SELECT \
 		CAST (java.sql.DatabaseMetaData::bestRowSession AS SMALLINT) AS SCOPE, \
 		COLS.COLUMNNAME AS COLUMN_NAME, \
-		CAST (COLS.COLUMNDATATYPE.getJDBCTypeId() AS SMALLINT) AS DATA_TYPE, \
+		COLS.COLUMNDATATYPE.getJDBCTypeId() AS DATA_TYPE, \
 		CAST (COLS.COLUMNDATATYPE.getTypeName() AS VARCHAR(128)) AS TYPE_NAME, \
 		COLS.COLUMNDATATYPE.getMaximumWidth() AS COLUMN_SIZE, \
 		CAST (NULL AS INT) AS BUFFER_LENGTH, \
@@ -940,7 +950,7 @@
 	SELECT \
 		CAST (java.sql.DatabaseMetaData::bestRowSession AS SMALLINT) AS SCOPE, \
 		COLS.COLUMNNAME AS COLUMN_NAME, \
-		CAST (COLS.COLUMNDATATYPE.getJDBCTypeId() AS SMALLINT) AS DATA_TYPE, \
+		COLS.COLUMNDATATYPE.getJDBCTypeId() AS DATA_TYPE, \
 		CAST (COLS.COLUMNDATATYPE.getTypeName() AS VARCHAR(128)) AS TYPE_NAME, \
 		COLS.COLUMNDATATYPE.getMaximumWidth() AS COLUMN_SIZE, \
 		CAST (NULL AS INT) AS BUFFER_LENGTH, \
@@ -1001,7 +1011,7 @@
 	SELECT \
 		CAST (java.sql.DatabaseMetaData::bestRowSession AS SMALLINT) AS SCOPE, \
 		COLS.COLUMNNAME AS COLUMN_NAME, \
-		CAST (COLS.COLUMNDATATYPE.getJDBCTypeId() AS SMALLINT) AS DATA_TYPE, \
+		COLS.COLUMNDATATYPE.getJDBCTypeId() AS DATA_TYPE, \
 		CAST (COLS.COLUMNDATATYPE.getTypeName() AS VARCHAR(128)) AS TYPE_NAME, \
 		COLS.COLUMNDATATYPE.getMaximumWidth() AS COLUMN_SIZE, \
 		CAST (NULL AS INT) AS BUFFER_LENGTH, \
@@ -1039,7 +1049,7 @@
 	SELECT \
 		CAST (java.sql.DatabaseMetaData::bestRowSession AS SMALLINT) AS SCOPE, \
 		COLS.COLUMNNAME AS COLUMN_NAME, \
-		CAST (COLS.COLUMNDATATYPE.getJDBCTypeId() AS SMALLINT) AS DATA_TYPE, \
+		COLS.COLUMNDATATYPE.getJDBCTypeId() AS DATA_TYPE, \
 		CAST (COLS.COLUMNDATATYPE.getTypeName() AS VARCHAR(128)) AS TYPE_NAME, \
 		COLS.COLUMNDATATYPE.getMaximumWidth() AS COLUMN_SIZE, \
 		CAST (NULL AS INT) AS BUFFER_LENGTH, \
@@ -1074,7 +1084,8 @@
 		ALIAS AS TYPE_NAME, \
 		JAVACLASSNAME AS CLASS_NAME, \
 		CAST (? AS INT) AS DATA_TYPE, \
-		'' AS REMARKS \
+		'' AS REMARKS, \
+                CAST (NULL AS SMALLINT) AS BASE_TYPE \
 	FROM SYS.SYSALIASES \
 	WHERE ((1=1) OR ? IS NOT NULL) AND ((1=1) OR ? IS NOT NULL) AND ALIAS LIKE ? \
 	AND ?<>0 AND ALIASTYPE = 'C' \

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=417497&r1=417496&r2=417497&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 Tue Jun 27 09:18:43 2006
@@ -45,15 +45,15 @@
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1,xxxxGENERATED-IDxxxx
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1,xxxxGENERATED-IDxxxx
 getUDTs() with user-named types null :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('STRUCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('DISTINCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT', 'STRUCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 allProceduresAreCallable(): true
 getUserName(): APP
 isReadOnly(): false
@@ -204,7 +204,7 @@
 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],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]
+PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_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],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
@@ -225,138 +225,138 @@
 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,
-,SYS,SYSCHECKS,SYSTEM TABLE,
-,SYS,SYSCOLPERMS,SYSTEM TABLE,
-,SYS,SYSCOLUMNS,SYSTEM TABLE,
-,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
-,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
-,SYS,SYSDEPENDS,SYSTEM TABLE,
-,SYS,SYSFILES,SYSTEM TABLE,
-,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
-,SYS,SYSKEYS,SYSTEM TABLE,
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
-,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
-,SYS,SYSSCHEMAS,SYSTEM TABLE,
-,SYS,SYSSTATEMENTS,SYSTEM TABLE,
-,SYS,SYSSTATISTICS,SYSTEM TABLE,
-,SYS,SYSTABLEPERMS,SYSTEM TABLE,
-,SYS,SYSTABLES,SYSTEM TABLE,
-,SYS,SYSTRIGGERS,SYSTEM TABLE,
-,SYS,SYSVIEWS,SYSTEM TABLE,
-,SYSIBM,SYSDUMMY1,SYSTEM TABLE,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,SYS,SYSALIASES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCHECKS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLUMNS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONGLOMERATES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONSTRAINTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSDEPENDS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATISTICS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTRIGGERS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSVIEWS,SYSTEM TABLE,,null,null,null,null,null
+,SYSIBM,SYSDUMMY1,SYSTEM TABLE,,null,null,null,null,null
 getTables() with no types:
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,SYS,SYSALIASES,SYSTEM TABLE,
-,SYS,SYSCHECKS,SYSTEM TABLE,
-,SYS,SYSCOLPERMS,SYSTEM TABLE,
-,SYS,SYSCOLUMNS,SYSTEM TABLE,
-,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
-,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
-,SYS,SYSDEPENDS,SYSTEM TABLE,
-,SYS,SYSFILES,SYSTEM TABLE,
-,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
-,SYS,SYSKEYS,SYSTEM TABLE,
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
-,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
-,SYS,SYSSCHEMAS,SYSTEM TABLE,
-,SYS,SYSSTATEMENTS,SYSTEM TABLE,
-,SYS,SYSSTATISTICS,SYSTEM TABLE,
-,SYS,SYSTABLEPERMS,SYSTEM TABLE,
-,SYS,SYSTABLES,SYSTEM TABLE,
-,SYS,SYSTRIGGERS,SYSTEM TABLE,
-,SYS,SYSVIEWS,SYSTEM TABLE,
-,SYSIBM,SYSDUMMY1,SYSTEM TABLE,
-,APP,ALLTYPES,TABLE,
-,APP,INFLIGHT,TABLE,
-,APP,LOUIE,TABLE,
-,APP,REFTAB,TABLE,
-,APP,REFTAB2,TABLE,
-,APP,T,TABLE,
-,APP,SCREWIE,VIEW,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,SYS,SYSALIASES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCHECKS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLUMNS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONGLOMERATES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONSTRAINTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSDEPENDS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATISTICS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTRIGGERS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSVIEWS,SYSTEM TABLE,,null,null,null,null,null
+,SYSIBM,SYSDUMMY1,SYSTEM TABLE,,null,null,null,null,null
+,APP,ALLTYPES,TABLE,,null,null,null,null,null
+,APP,INFLIGHT,TABLE,,null,null,null,null,null
+,APP,LOUIE,TABLE,,null,null,null,null,null
+,APP,REFTAB,TABLE,,null,null,null,null,null
+,APP,REFTAB2,TABLE,,null,null,null,null,null
+,APP,T,TABLE,,null,null,null,null,null
+,APP,SCREWIE,VIEW,,null,null,null,null,null
 getTables() with TABLE_TYPE in ('VIEW','TABLE') :
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,APP,ALLTYPES,TABLE,
-,APP,INFLIGHT,TABLE,
-,APP,LOUIE,TABLE,
-,APP,REFTAB,TABLE,
-,APP,REFTAB2,TABLE,
-,APP,T,TABLE,
-,APP,SCREWIE,VIEW,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,APP,ALLTYPES,TABLE,,null,null,null,null,null
+,APP,INFLIGHT,TABLE,,null,null,null,null,null
+,APP,LOUIE,TABLE,,null,null,null,null,null
+,APP,REFTAB,TABLE,,null,null,null,null,null
+,APP,REFTAB2,TABLE,,null,null,null,null,null
+,APP,T,TABLE,,null,null,null,null,null
+,APP,SCREWIE,VIEW,,null,null,null,null,null
 getTableTypes():
 TABLE_TYPE[VARCHAR]
 SYSTEM TABLE
 TABLE
 VIEW
 getColumns():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[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],IS_AUTOINCREMENT[VARCHAR]
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
 getColumns('SYSTABLES'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[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],IS_AUTOINCREMENT[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,null,null,null,null,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,null,null,null,null,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,null,null,null,null,NO
 getColumns('ALLTYPES'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[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],IS_AUTOINCREMENT[VARCHAR]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES,NO
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES,NO
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES,NO
-,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES,NO
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES,NO
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES,NO
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES,NO
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES,NO
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES,NO
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES,NO
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES,NO
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES,NO
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES,NO
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES,NO
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES,NO
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES,NO
-,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES,NO
-,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES,NO
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,null,0,10,1,,null,null,null,null,1,YES,null,null,null,null,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,null,0,10,1,,20,null,null,null,2,YES,null,null,null,null,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,null,0,10,1,,null,null,null,null,3,YES,null,null,null,null,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,null,null,2,1,,null,null,null,null,4,YES,null,null,null,null,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,null,null,2,1,,10,null,null,null,5,YES,null,null,null,null,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,null,null,2,1,,8.8,null,null,null,6,YES,null,null,null,null,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,null,4,10,1,,null,null,null,null,7,YES,null,null,null,null,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,null,2,10,1,,null,null,null,null,8,YES,null,null,null,null,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,null,null,null,1,,null,null,null,16,9,YES,null,null,null,null,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,null,null,null,1,,null,null,null,null,10,YES,null,null,null,null,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,null,null,null,1,,null,null,null,18,11,YES,null,null,null,null,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,null,null,null,1,,null,null,null,null,12,YES,null,null,null,null,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,null,null,null,1,,null,null,null,null,13,YES,null,null,null,null,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,null,null,null,1,,null,null,null,null,14,YES,null,null,null,null,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,null,null,null,1,,null,null,null,null,15,YES,null,null,null,null,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,null,null,null,1,,null,null,null,null,16,YES,null,null,null,null,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,null,0,10,1,,null,null,null,null,17,YES,null,null,null,null,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,null,0,10,1,,null,null,null,null,18,YES,null,null,null,null,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,null,6,10,1,,null,null,null,null,19,YES,null,null,null,null,NO
 getColumns('LOUIE'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[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],IS_AUTOINCREMENT[VARCHAR]
-,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO,NO
-,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO,NO
-,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO,NO
-,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO,YES
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,null,0,10,0,,10,null,null,null,1,NO,null,null,null,null,NO
+,APP,LOUIE,S,5,SMALLINT,5,null,0,10,0,,null,null,null,null,2,NO,null,null,null,null,NO
+,APP,LOUIE,C30,1,CHAR,30,null,null,null,0,,null,null,null,60,3,NO,null,null,null,null,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,null,null,null,0,,'asdf',null,null,20,4,NO,null,null,null,null,NO
+,APP,LOUIE,AI,-5,BIGINT,19,null,0,10,0,,AUTOINCREMENT: start -10 increment 2001,null,null,null,5,NO,null,null,null,null,YES
 getColumns('INFLIGHT'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[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],IS_AUTOINCREMENT[VARCHAR]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES,NO
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES,NO
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES,NO
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES,NO
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES,NO
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES,NO
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES,NO
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES,NO
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,null,null,null,0,,null,null,null,40,1,NO,null,null,null,null,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,null,null,null,1,,null,null,null,12,2,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,null,null,null,1,,null,null,null,12,3,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,null,null,null,1,,null,null,null,40,4,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,null,null,null,1,,null,null,null,44,5,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,6,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,null,null,null,1,,null,null,null,16,7,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,null,null,null,1,,null,null,null,1020,8,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,null,null,null,1,,null,null,null,28,9,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,null,null,null,1,,null,null,null,65344,10,YES,null,null,null,null,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getBestRowIdentifier("",null,"LOUIE"):
-SCOPE[SMALLINT],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],PSEUDO_COLUMN[SMALLINT]
+SCOPE[SMALLINT],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],PSEUDO_COLUMN[SMALLINT]
 2,I,4,INTEGER,4,null,10,1
 2,VC10,12,VARCHAR,10,null,null,1
 getBestRowIdentifier("","SYS","SYSTABLES"):
-SCOPE[SMALLINT],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],PSEUDO_COLUMN[SMALLINT]
+SCOPE[SMALLINT],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],PSEUDO_COLUMN[SMALLINT]
 2,TABLEID,1,CHAR,36,null,null,1
 getVersionColumns():
-SCOPE[INTEGER],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[INTEGER],PSEUDO_COLUMN[INTEGER]
+SCOPE[SMALLINT],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],PSEUDO_COLUMN[SMALLINT]
 getPrimaryKeys():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],KEY_SEQ[INTEGER],PK_NAME[VARCHAR]
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],PK_NAME[VARCHAR]
 ,APP,LOUIE,I,2,PRIMKEY
 ,APP,LOUIE,VC10,1,PRIMKEY
 getPrimaryKeys(null, null, tablename):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],KEY_SEQ[INTEGER],PK_NAME[VARCHAR]
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],PK_NAME[VARCHAR]
 ,APP,LOUIE,I,2,PRIMKEY
 ,APP,LOUIE,VC10,1,PRIMKEY
 getImportedKeys():
@@ -434,7 +434,7 @@
 getCrossReference('','badschema','LOUIE','','APP','REFTAB' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 getTypeInfo():
-TYPE_NAME[VARCHAR],DATA_TYPE[SMALLINT],PRECISION[INTEGER],LITERAL_PREFIX[VARCHAR],LITERAL_SUFFIX[VARCHAR],CREATE_PARAMS[VARCHAR],NULLABLE[INTEGER],CASE_SENSITIVE[SMALLINT],SEARCHABLE[INTEGER],UNSIGNED_ATTRIBUTE[SMALLINT],FIXED_PREC_SCALE[SMALLINT],AUTO_INCREMENT[SMALLINT],LOCAL_TYPE_NAME[VARCHAR],MINIMUM_SCALE[INTEGER],MAXIMUM_SCALE[INTEGER],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],NUM_PREC_RADIX[INTEGER]
+TYPE_NAME[VARCHAR],DATA_TYPE[INTEGER],PRECISION[INTEGER],LITERAL_PREFIX[VARCHAR],LITERAL_SUFFIX[VARCHAR],CREATE_PARAMS[VARCHAR],NULLABLE[SMALLINT],CASE_SENSITIVE[SMALLINT],SEARCHABLE[SMALLINT],UNSIGNED_ATTRIBUTE[SMALLINT],FIXED_PREC_SCALE[SMALLINT],AUTO_INCREMENT[SMALLINT],LOCAL_TYPE_NAME[VARCHAR],MINIMUM_SCALE[SMALLINT],MAXIMUM_SCALE[SMALLINT],SQL_DATA_TYPE[INTEGER],SQL_DATETIME_SUB[INTEGER],NUM_PREC_RADIX[INTEGER]
 BIGINT,-5,19,null,null,null,1,0,2,0,0,1,BIGINT,0,0,null,null,10
 LONG VARCHAR FOR BIT DATA,-4,32700,X',',null,1,0,2,1,0,0,LONG VARCHAR FOR BIT DATA,null,null,null,null,null
 VARCHAR () FOR BIT DATA,-3,32762,X',',length,1,0,2,1,0,0,VARCHAR () FOR BIT DATA,null,null,null,null,null
@@ -458,26 +458,26 @@
 BLOB,2004,2147483647,null,null,length,1,0,1,null,0,null,BLOB,null,null,null,null,null
 CLOB,2005,2147483647,',',length,1,1,1,null,0,null,CLOB,null,null,null,null,null
 getIndexInfo():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[SMALLINT],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
 ,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,1,REFERENCEID,A,null,null,null
 ,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,2,COLUMNNAME,A,null,null,null
 getIndexInfo():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[SMALLINT],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
 ,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,1,REFERENCEID,A,null,null,null
 ,SYS,SYSCOLUMNS,0,,SYSCOLUMNS_INDEX1,3,2,COLUMNNAME,A,null,null,null
 ,SYS,SYSCOLUMNS,1,,SYSCOLUMNS_INDEX2,3,1,COLUMNDEFAULTID,A,null,null,null
 getIndexInfo():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[INTEGER],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],NON_UNIQUE[SMALLINT],INDEX_QUALIFIER[VARCHAR],INDEX_NAME[VARCHAR],TYPE[SMALLINT],ORDINAL_POSITION[SMALLINT],COLUMN_NAME[VARCHAR],ASC_OR_DESC[CHAR],CARDINALITY[INTEGER],PAGES[INTEGER],FILTER_CONDITION[VARCHAR]
 ,SYS,SYSTABLES,0,,SYSTABLES_INDEX1,3,1,TABLENAME,A,null,null,null
 ,SYS,SYSTABLES,0,,SYSTABLES_INDEX1,3,2,SCHEMAID,A,null,null,null
 ,SYS,SYSTABLES,0,,SYSTABLES_INDEX2,3,1,TABLEID,A,null,null,null
 getColumns('SYSTABLES'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[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],IS_AUTOINCREMENT[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[INTEGER],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],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,null,null,null,0,,null,null,null,72,1,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,null,null,null,0,,null,null,null,256,2,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO,null,null,null,null,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO,null,null,null,null,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO,null,null,null,null,NO
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
 Executing VALUES { fn ABS(-25.67) } --   = >25.67<  << 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=417497&r1=417496&r2=417497&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Tue Jun 27 09:18:43 2006
@@ -75,15 +75,15 @@
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
 getUDTs() with user-named types null :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('STRUCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('DISTINCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 getUDTs() with user-named types in ('JAVA_OBJECT', 'STRUCT') :
-TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR],BASE_TYPE[SMALLINT]
 allProceduresAreCallable(): true
 getUserName(): APP
 isReadOnly(): false
@@ -255,119 +255,119 @@
 null,APP,GETPCTEST3B,STRING4,2,12,VARCHAR,5,10,null,null,1,null,null,12,null,10,2,YES,2,1
 null,APP,GETPCTEST4BX,RETPARAM,4,4,INTEGER,10,4,0,10,1,null,null,4,null,null,1,YES,1,0
 getTables() with TABLE_TYPE in ('SYSTEM TABLE') :
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,SYS,SYSALIASES,SYSTEM TABLE,
-,SYS,SYSCHECKS,SYSTEM TABLE,
-,SYS,SYSCOLPERMS,SYSTEM TABLE,
-,SYS,SYSCOLUMNS,SYSTEM TABLE,
-,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
-,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
-,SYS,SYSDEPENDS,SYSTEM TABLE,
-,SYS,SYSFILES,SYSTEM TABLE,
-,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
-,SYS,SYSKEYS,SYSTEM TABLE,
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
-,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
-,SYS,SYSSCHEMAS,SYSTEM TABLE,
-,SYS,SYSSTATEMENTS,SYSTEM TABLE,
-,SYS,SYSSTATISTICS,SYSTEM TABLE,
-,SYS,SYSTABLEPERMS,SYSTEM TABLE,
-,SYS,SYSTABLES,SYSTEM TABLE,
-,SYS,SYSTRIGGERS,SYSTEM TABLE,
-,SYS,SYSVIEWS,SYSTEM TABLE,
-,SYSIBM,SYSDUMMY1,SYSTEM TABLE,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,SYS,SYSALIASES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCHECKS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLUMNS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONGLOMERATES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONSTRAINTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSDEPENDS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATISTICS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTRIGGERS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSVIEWS,SYSTEM TABLE,,null,null,null,null,null
+,SYSIBM,SYSDUMMY1,SYSTEM TABLE,,null,null,null,null,null
 getTables() with no types:
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,SYS,SYSALIASES,SYSTEM TABLE,
-,SYS,SYSCHECKS,SYSTEM TABLE,
-,SYS,SYSCOLPERMS,SYSTEM TABLE,
-,SYS,SYSCOLUMNS,SYSTEM TABLE,
-,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
-,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
-,SYS,SYSDEPENDS,SYSTEM TABLE,
-,SYS,SYSFILES,SYSTEM TABLE,
-,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
-,SYS,SYSKEYS,SYSTEM TABLE,
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
-,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
-,SYS,SYSSCHEMAS,SYSTEM TABLE,
-,SYS,SYSSTATEMENTS,SYSTEM TABLE,
-,SYS,SYSSTATISTICS,SYSTEM TABLE,
-,SYS,SYSTABLEPERMS,SYSTEM TABLE,
-,SYS,SYSTABLES,SYSTEM TABLE,
-,SYS,SYSTRIGGERS,SYSTEM TABLE,
-,SYS,SYSVIEWS,SYSTEM TABLE,
-,SYSIBM,SYSDUMMY1,SYSTEM TABLE,
-,APP,ALLTYPES,TABLE,
-,APP,INFLIGHT,TABLE,
-,APP,LOUIE,TABLE,
-,APP,REFTAB,TABLE,
-,APP,REFTAB2,TABLE,
-,APP,T,TABLE,
-,APP,SCREWIE,VIEW,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,SYS,SYSALIASES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCHECKS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCOLUMNS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONGLOMERATES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSCONSTRAINTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSDEPENDS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSSTATISTICS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTABLES,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSTRIGGERS,SYSTEM TABLE,,null,null,null,null,null
+,SYS,SYSVIEWS,SYSTEM TABLE,,null,null,null,null,null
+,SYSIBM,SYSDUMMY1,SYSTEM TABLE,,null,null,null,null,null
+,APP,ALLTYPES,TABLE,,null,null,null,null,null
+,APP,INFLIGHT,TABLE,,null,null,null,null,null
+,APP,LOUIE,TABLE,,null,null,null,null,null
+,APP,REFTAB,TABLE,,null,null,null,null,null
+,APP,REFTAB2,TABLE,,null,null,null,null,null
+,APP,T,TABLE,,null,null,null,null,null
+,APP,SCREWIE,VIEW,,null,null,null,null,null
 getTables() with TABLE_TYPE in ('VIEW','TABLE') :
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
-,APP,ALLTYPES,TABLE,
-,APP,INFLIGHT,TABLE,
-,APP,LOUIE,TABLE,
-,APP,REFTAB,TABLE,
-,APP,REFTAB2,TABLE,
-,APP,T,TABLE,
-,APP,SCREWIE,VIEW,
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR],TYPE_CAT[VARCHAR],TYPE_SCHEM[VARCHAR],TYPE_NAME[VARCHAR],SELF_REFERENCING_COL_NAME[VARCHAR],REF_GENERATION[VARCHAR]
+,APP,ALLTYPES,TABLE,,null,null,null,null,null
+,APP,INFLIGHT,TABLE,,null,null,null,null,null
+,APP,LOUIE,TABLE,,null,null,null,null,null
+,APP,REFTAB,TABLE,,null,null,null,null,null
+,APP,REFTAB2,TABLE,,null,null,null,null,null
+,APP,T,TABLE,,null,null,null,null,null
+,APP,SCREWIE,VIEW,,null,null,null,null,null
 getTableTypes():
 TABLE_TYPE[VARCHAR]
 SYSTEM TABLE
 TABLE
 VIEW
 getColumns():
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
 getColumns('SYSTABLES'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,null,null,null,null,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,null,null,null,null,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,null,null,null,null,NO
 getColumns('ALLTYPES'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
-,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES,NO
-,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES,NO
-,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES,NO
-,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES,NO
-,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES,NO
-,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES,NO
-,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES,NO
-,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES,NO
-,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES,NO
-,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES,NO
-,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES,NO
-,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES,NO
-,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES,NO
-,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES,NO
-,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES,NO
-,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES,NO
-,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES,NO
-,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES,NO
-,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,ALLTYPES,SMALLINTCOL,5,SMALLINT,5,2,0,10,1,,null,5,null,null,1,YES,null,null,null,null,NO
+,APP,ALLTYPES,INTCOL,4,INTEGER,10,4,0,10,1,,20,4,null,null,2,YES,null,null,null,null,NO
+,APP,ALLTYPES,BIGINTCOL,-5,BIGINT,19,40,0,10,1,,null,-5,null,null,3,YES,null,null,null,null,NO
+,APP,ALLTYPES,REALCOL,7,REAL,23,4,null,2,1,,null,7,null,null,4,YES,null,null,null,null,NO
+,APP,ALLTYPES,DOUBLEPRECCOL,8,DOUBLE,52,8,null,2,1,,10,8,null,null,5,YES,null,null,null,null,NO
+,APP,ALLTYPES,FLOATCOL,8,DOUBLE,52,8,null,2,1,,8.8,8,null,null,6,YES,null,null,null,null,NO
+,APP,ALLTYPES,DECIMALCOL10P4S,3,DECIMAL,10,24,4,10,1,,null,3,null,null,7,YES,null,null,null,null,NO
+,APP,ALLTYPES,NUMERICCOL20P2S,2,NUMERIC,20,44,2,10,1,,null,2,null,null,8,YES,null,null,null,null,NO
+,APP,ALLTYPES,CHAR8COL___,1,CHAR,8,16,null,null,1,,null,1,null,16,9,YES,null,null,null,null,NO
+,APP,ALLTYPES,CHAR8FORBITCOL___,-2,CHAR () FOR BIT DATA,8,8,null,null,1,,null,-2,null,8,10,YES,null,null,null,null,NO
+,APP,ALLTYPES,VARCHAR9COL,12,VARCHAR,9,18,null,null,1,,null,12,null,18,11,YES,null,null,null,null,NO
+,APP,ALLTYPES,VARCHAR9BITCOL,-3,VARCHAR () FOR BIT DATA,9,9,null,null,1,,null,-3,null,9,12,YES,null,null,null,null,NO
+,APP,ALLTYPES,LONGVARCHARCOL,-1,LONG VARCHAR,32700,65400,null,null,1,,null,-1,null,null,13,YES,null,null,null,null,NO
+,APP,ALLTYPES,LONGVARBINARYCOL,-4,LONG VARCHAR FOR BIT DATA,32700,32700,null,null,1,,null,-4,null,null,14,YES,null,null,null,null,NO
+,APP,ALLTYPES,BLOBCOL,2004,BLOB,3072,3072,null,null,1,,null,2004,null,null,15,YES,null,null,null,null,NO
+,APP,ALLTYPES,CLOBCOL,2005,CLOB,3072,6144,null,null,1,,null,2005,null,null,16,YES,null,null,null,null,NO
+,APP,ALLTYPES,DATECOL,91,DATE,10,6,null,2,1,,null,9,1,null,17,YES,null,null,null,null,NO
+,APP,ALLTYPES,TIMECOL,92,TIME,8,6,0,2,1,,null,9,2,null,18,YES,null,null,null,null,NO
+,APP,ALLTYPES,TSCOL,93,TIMESTAMP,26,16,6,2,1,,null,9,3,null,19,YES,null,null,null,null,NO
 getColumns('LOUIE'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
-,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO,NO
-,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO,NO
-,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO,NO
-,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO,NO
-,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO,YES
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,LOUIE,I,4,INTEGER,10,4,0,10,0,,10,4,null,null,1,NO,null,null,null,null,NO
+,APP,LOUIE,S,5,SMALLINT,5,2,0,10,0,,null,5,null,null,2,NO,null,null,null,null,NO
+,APP,LOUIE,C30,1,CHAR,30,60,null,null,0,,null,1,null,60,3,NO,null,null,null,null,NO
+,APP,LOUIE,VC10,12,VARCHAR,10,20,null,null,0,,'asdf',12,null,20,4,NO,null,null,null,null,NO
+,APP,LOUIE,AI,-5,BIGINT,19,40,0,10,0,,AUTOINCREMENT: start -10 increment 2001,-5,null,null,5,NO,null,null,null,null,YES
 getColumns('INFLIGHT'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
-,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO,NO
-,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,12,null,null,1,,null,1,null,12,2,YES,NO
-,APP,INFLIGHT,FLT_DEST,1,CHAR,6,12,null,null,1,,null,1,null,12,3,YES,NO
-,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,40,null,null,1,,null,1,null,40,4,YES,NO
-,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,44,null,null,1,,null,12,null,44,5,YES,NO
-,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,6,YES,NO
-,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,7,YES,NO
-,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,1020,null,null,1,,null,12,null,1020,8,YES,NO
-,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,28,null,null,1,,null,1,null,28,9,YES,NO
-,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,65344,null,null,1,,null,12,null,65344,10,YES,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,APP,INFLIGHT,FLT_NUM,1,CHAR,20,40,null,null,0,,null,1,null,40,1,NO,null,null,null,null,NO
+,APP,INFLIGHT,FLT_ORIGIN,1,CHAR,6,12,null,null,1,,null,1,null,12,2,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DEST,1,CHAR,6,12,null,null,1,,null,1,null,12,3,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_AIRCRAFT,1,CHAR,20,40,null,null,1,,null,1,null,40,4,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_FLYING_TIME,12,VARCHAR,22,44,null,null,1,,null,12,null,44,5,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DEPT_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,6,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_ARR_TIME,1,CHAR,8,16,null,null,1,,null,1,null,16,7,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_NOTES,12,VARCHAR,510,1020,null,null,1,,null,12,null,1020,8,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_DAYS_OF_WK,1,CHAR,14,28,null,null,1,,null,1,null,28,9,YES,null,null,null,null,NO
+,APP,INFLIGHT,FLT_CRAFT_PIC,12,VARCHAR,32672,65344,null,null,1,,null,12,null,65344,10,YES,null,null,null,null,NO
 getColumnPrivileges():
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],GRANTOR[VARCHAR],GRANTEE[VARCHAR],PRIVILEGE[VARCHAR],IS_GRANTABLE[VARCHAR]
 getTablePrivileges():
@@ -502,12 +502,12 @@
 ,SYS,SYSTABLES,0,,SYSTABLES_INDEX1,3,2,SCHEMAID,A,null,null,null
 ,SYS,SYSTABLES,0,,SYSTABLES_INDEX2,3,1,TABLEID,A,null,null,null
 getColumns('SYSTABLES'):
-TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],IS_AUTOINCREMENT[VARCHAR]
-,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,NO
-,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,NO
-,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,NO
-,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,NO
-,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,NO
+TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],SCOPE_CATLOG[VARCHAR],SCOPE_SCHEMA[VARCHAR],SCOPE_TABLE[VARCHAR],SOURCE_DATA_TYPE[SMALLINT],IS_AUTOINCREMENT[VARCHAR]
+,SYS,SYSTABLES,TABLEID,1,CHAR,36,72,null,null,0,,null,1,null,72,1,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLENAME,12,VARCHAR,128,256,null,null,0,,null,12,null,256,2,NO,null,null,null,null,NO
+,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,2,null,null,0,,null,1,null,2,3,NO,null,null,null,null,NO
+,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO,null,null,null,null,NO
+,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO,null,null,null,null,NO
 OK -- user result set closed by intervening OBDC getColumns request; this was expected because of the way the test works.
 Test escaped numeric functions - JDBC 3.0 C.1
 TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST



Mime
View raw message