[teiid-commits] teiid SVN: r1991 - in trunk: client/src/main/java/org/teiid/net and 31 other directories.

Author: shawkins Date: 2010-03-23 15:22:07 -0400 (Tue, 23 Mar 2010) New Revision: 1991 Added: trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestCase3473.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/ trunk/test-integration/common/src/test/resources/PartsSupplier.vdb trunk/test-integration/common/src/test/resources/TestCase3473/ trunk/test-integration/common/src/test/resources/TestCase3473/test.vdb trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSuperTables.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCatalogs.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testSchemas.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testUDTs.expected trunk/test-integration/common/src/test/resources/bqt/bqt.vdb trunk/test-integration/common/src/test/resources/xml-vp/xmlvp_1.vdb Removed: trunk/test-integration/common/src/test/resources/3473/ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatchQuery.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testSuperTables.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/PartsSupplier.vdb trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/expected/ trunk/test-integration/common/src/test/resources/partssupplier/ trunk/test-integration/db/src/main/java/org/teiid/jdbc/api/ trunk/test-integration/db/src/test/java/com/metamatrix/ trunk/test-integration/db/src/test/java/org/teiid/connector/ trunk/test-integration/db/src/test/java/org/teiid/jdbc/ trunk/test-integration/db/src/test/java/org/teiid/systemmodel/ trunk/test-integration/db/src/test/resources/3473/ trunk/test-integration/db/src/test/resources/bqt/ trunk/test-integration/db/src/test/resources/metadata/ trunk/test-integration/db/src/test/resources/partsupplier/ trunk/test-integration/db/src/test/resources/xml-vp/ Modified: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java trunk/client/src/main/java/org/teiid/net/ServerConnection.java trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java trunk/client/src/test/java/org/teiid/jdbc/TestMMStatement.java trunk/connector-api/src/main/java/org/teiid/connector/language/SQLReservedWords.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java trunk/engine/src/test/java/com/metamatrix/common/buffer/BufferManagerFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeBufferService.java trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestPartsDatabaseMetadata.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestResultSetMetadata.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnPrivileges.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSchemas.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTable.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected trunk/test-integration/common/src/test/resources/system/expected/Columns.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/Columns.txt trunk/test-integration/common/src/test/resources/system/expected/DataTypes.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/KeyColumns.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/Keys.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.txt trunk/test-integration/common/src/test/resources/system/expected/Procedures.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/Procedures.txt trunk/test-integration/common/src/test/resources/system/expected/ReferenceKeyColumns.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/Schemas.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/Schemas.txt trunk/test-integration/common/src/test/resources/system/expected/TableIsSystem.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/Tables.metadata.txt trunk/test-integration/common/src/test/resources/system/expected/Tables.txt trunk/test-integration/db/pom.xml trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionQueryTestCase.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/QueryExecution.java trunk/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java trunk/test-integration/pom.xml Log: reestablishing metadata tests to not require a container Modified: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -73,6 +73,8 @@ public class ConnectionImpl extends WrapperImpl implements Connection { private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$ + public static final int DEFAULT_ISOLATION = Connection.TRANSACTION_READ_COMMITTED; + // constant value giving product name private final static String SERVER_NAME = "Teiid Server"; //$NON-NLS-1$ private final static String EMBEDDED_NAME = "Teiid Embedded"; //$NON-NLS-1$ @@ -105,7 +107,7 @@ private boolean disableLocalTransactions = false; private DQP dqp; protected ServerConnection serverConn; - private int transactionIsolation = Connection.TRANSACTION_READ_COMMITTED; + private int transactionIsolation = DEFAULT_ISOLATION; public ConnectionImpl(ServerConnection serverConn, Properties info, String url) { this.serverConn = serverConn; Modified: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -69,7 +69,10 @@ // constant value giving extra name characters used in Identifiers private final static String EXTRA_CHARS = ".@"; //$NON-NLS-1$ // constant value giving the key words not in SQL-92 - private final static String KEY_WORDS = "OPTION, SHOWPLAN, DEBUG"; //$NON-NLS-1$ + final static String KEY_WORDS = "OPTION, SHOWPLAN, DEBUG, BIGDECIMAL"+ //$NON-NLS-1$ + ", BIGDECIMAL, BIGINTEGER, BREAK, BYTE, CRITERIA, ERROR, FN, LONG, LOOP, MAKEDEP, MAKENOTDEP"+ //$NON-NLS-1$ + ", NOCACHE, OJ, PLANONLY, SQL_TSI_FRAC_SECOND, SQL_TSI_SECOND, SQL_TSI_MINUTE, SQL_TSI_HOUR, SQL_TSI_DAY, SQL_TSI_WEEK, SQL_TSI_MONTH"+ //$NON-NLS-1$ + ", SQL_TSI_QUARTER, SQL_TSI_YEAR, STRING, VIRTUAL, WHILE"; //$NON-NLS-1$ // constant value giving preferred name for a procedure private final static String PROCEDURE_TERM = "StoredProcedure"; //$NON-NLS-1$ // constant value giving the names of numeric functions supported @@ -196,9 +199,9 @@ .append(", convert(decodeString(DataType, '").append(TYPE_MAPPING).append("', ','), short) AS DATA_TYPE") //$NON-NLS-1$ //$NON-NLS-2$ .append(", DataType AS TYPE_NAME") //$NON-NLS-1$ .append(", CASE WHEN (DataType IN (").append(DATATYPES_WITH_NO_PRECISION) //$NON-NLS-1$ - .append(")) THEN CASE WHEN ElementLength <= 0 THEN convert(decodeString(DataType,'").append(PRECISION_MAPPING) //$NON-NLS-1$ - .append("',','), integer) ELSE ElementLength END ELSE CASE WHEN Precision <= 0 THEN convert(decodeString(DataType,'") //$NON-NLS-1$ - .append(PRECISION_MAPPING).append("',','), integer) ELSE Precision END END AS COLUMN_SIZE") //$NON-NLS-1$ + .append(")) THEN CASE WHEN Length <= 0 THEN convert(decodeString(DataType,'").append(PRECISION_MAPPING) //$NON-NLS-1$ + .append("',','), integer) ELSE Length END ELSE CASE WHEN e.Precision <= 0 THEN convert(decodeString(DataType,'") //$NON-NLS-1$ + .append(PRECISION_MAPPING).append("',','), integer) ELSE e.Precision END END AS COLUMN_SIZE") //$NON-NLS-1$ .append(", NULL AS BUFFER_LENGTH, Scale AS DECIMAL_DIGITS, Radix AS NUM_PREC_RADIX") //$NON-NLS-1$ .append(", convert(decodeString(NullType, '").append(NULLABILITY_MAPPING).append("', ','), integer) AS NULLABLE") //$NON-NLS-1$ //$NON-NLS-2$ .append(", Description AS REMARKS, DefaultValue AS COLUMN_DEF, NULL AS SQL_DATA_TYPE, NULL AS SQL_DATETIME_SUB") //$NON-NLS-1$ @@ -252,8 +255,8 @@ .append(", ProcedureName AS PROCEDURE_NAME, p.Name AS COLUMN_NAME") //$NON-NLS-1$ .append(", convert(decodeString(TYPE, '").append(PARAM_DIRECTION_MAPPING).append("', ','), short) AS COLUMN_TYPE") //$NON-NLS-1$ //$NON-NLS-2$ .append(", convert(decodeString(DataType, '").append(TYPE_MAPPING).append("', ','), integer) AS DATA_TYPE") //$NON-NLS-1$ //$NON-NLS-2$ - .append(", DataType AS TYPE_NAME, CASE WHEN Precision <= 0 THEN convert(decodeString(DataType,'").append(PRECISION_MAPPING) //$NON-NLS-1$ - .append("',','), integer) ELSE Precision END AS PRECISION, CASE WHEN TypeLength <= 0 THEN convert(decodeString(DataType,'") //$NON-NLS-1$ + .append(", DataType AS TYPE_NAME, CASE WHEN p.Precision <= 0 THEN convert(decodeString(DataType,'").append(PRECISION_MAPPING) //$NON-NLS-1$ + .append("',','), integer) ELSE p.Precision END AS \"PRECISION\", CASE WHEN TypeLength <= 0 THEN convert(decodeString(DataType,'") //$NON-NLS-1$ .append(PRECISION_MAPPING).append("',','), integer) ELSE TypeLength END AS LENGTH, convert(Scale, short) AS SCALE") //$NON-NLS-1$ .append(", Radix AS RADIX, convert(decodeString(NullType, '") //$NON-NLS-1$ .append(PROC_COLUMN_NULLABILITY_MAPPING).append("', ','), integer) AS NULLABLE") //$NON-NLS-1$ @@ -320,13 +323,6 @@ return true; } - /** - * <p>Checks whether the current user can use SELECT statement with all of the - * tables returned by the method getTables. Selectability is column level in - * metamatrix, hence return true</p> - * @return true if tables are selectable else return false - * @throws SQLException. Should never occur. - */ public boolean allTablesAreSelectable() throws SQLException { return true; } @@ -436,13 +432,6 @@ return createResultSet(records, metadataList); } - /** - * <p>Gets the catalog names available to metamatrix. The results are ordered by - * catalog name. There is no concept of catalogs in a metamatrix driver and this - * returns an empty resultSet. - * @return ResultSet object containing metadata info of the catalog on this connection. - * @throws SQLException if there is an error obtaining server results - */ public ResultSet getCatalogs() throws SQLException { // list containing records/rows in the ResultSet List records = new ArrayList (0); @@ -512,13 +501,8 @@ return EMPTY_STRING; } - /** - * <p>Get the metamatrix term for catalog - * @return String representing catalog name - * @throws SQLException, should never occur. - */ public String getCatalogTerm() throws SQLException { - return EMPTY_STRING; + return "VirtualDatabase"; //$NON-NLS-1$ } /** @@ -759,22 +743,12 @@ return this.driverConnection.getDatabaseName(); } - /** - * <p>Gets the version of metamatrix server to which this driver connects - * @return String representing the product version - * @throws SQLException if there is an error accessing product release info. - */ public String getDatabaseProductVersion() throws SQLException { return TeiidDriver.getInstance().getMajorVersion() + "." + TeiidDriver.getInstance().getMinorVersion(); //$NON-NLS-1$ } - /** - * <p>Gets metamatrix default transaction isolation level. - * @return intvalue giving the transaction isolation level - * @throws SQLException never - */ public int getDefaultTransactionIsolation() throws SQLException { - return Connection.TRANSACTION_NONE; + return ConnectionImpl.DEFAULT_ISOLATION; } /** @@ -1065,39 +1039,18 @@ return NO_LIMIT; } - /** - * <p>Gets the maximum number of columns allowed in a table - * @return int gives maximum columns in a table. - * @throws SQLException, should never occur - */ public int getMaxColumnsInTable() throws SQLException { return NO_LIMIT; } - /** - * <p>Gets the maximum number of active connections to metamatrix that can be - * maintained through this driver instance - * @return int gives maximum connections. - * @throws SQLException, should never occur - */ public int getMaxConnections() throws SQLException { return NO_LIMIT; } - /** - * <p>Gets the maximum number of characters allowed in a cursor name - * @return int gives maximum max charachters allowed in a cursor name. - * @throws SQLException, should never occur - */ public int getMaxCursorNameLength() throws SQLException { return NO_LIMIT; } - /** - * <p>Gets the maximum number of bytes allowed in an index - * @return int gives maximum bytes. - * @throws SQLException, should never occur - */ public int getMaxIndexLength() throws SQLException { return NO_LIMIT; } @@ -1175,26 +1128,10 @@ return MAX_USER_NAME_LENGTH; } - /** - * <p>Gets the OPEN GROUP CLI names of metamatrix math functions - * @return string giving numeric functions supported. - * @throws SQLException, should never occur - */ public String getNumericFunctions() throws SQLException { return NUMERIC_FUNCTIONS; } - /** - * <p>Get's a description of the primary key columns in a table. The descriptions - * are ordered by column name. Catalog and schema names are not used to narrow - * down the search, but they should match the virtualdatabasename and version - * used to obtain this driver connection. - * @param name of the catalog which contains the given table. - * @param schema name which contains the given table. - * @param table name which contains the primary keys. - * @return ResultSet object containing primary keys of the given table. - * @throws SQLException if there is an error obtaining metamatrix results. - */ public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException { if (catalog == null) { catalog = PERCENT; @@ -1251,18 +1188,6 @@ return createResultSet(records, rmetadata); } - /** - * <p>Gets a description of the input, output and results associated with certain - * stored procedures matching the given procedureNamePattern. Catalog and - * schema names are not used to narrow down the search, but they should match - * the virtualdatabasename and version used to obtain this driver connection.</p> - * @param name of the catalog the procedure is present in. - * @param pattern of schama name the procedure is present in. - * @param pattern which is to be matched by the procedureNames. - * @param pattern to be matched by the column names. - * @return ResultSet containing the metadata info for procedure parameters. - * @throws SQLException if there is an error obtaining metamatrix results. - */ public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) throws SQLException { if (catalog == null) { catalog = PERCENT; @@ -1321,17 +1246,6 @@ return createResultSet(records, rmetadata); } - /** - * <p>Gets description of all the available stored procedures whose names match - * the given pattern. Catalog and schemaPattern are not used to narrow down - * the search, but they should match the virtualdatabasename and version used - * to obtain this driver connection. - * @param name of the catalog. - * @param name of the schema. - * @param pattern which is to be matched by the procedureNames. - * @return ResultSet object which gives the metadata information about procedures. - * @throws SQLException if there is an error obtaining metamatrix results. - */ public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) throws SQLException { if (catalog == null) { catalog = PERCENT; @@ -1390,31 +1304,14 @@ return createResultSet(records, rmetadata); } - /** - * <p>Gets MetaMatrix's preferred term for procedures - * @return String representing metamatrix procedure term. - * @throws SQLException, should never occur - */ public String getProcedureTerm() throws SQLException { return PROCEDURE_TERM; } - /** - * <p>Gets the schema names available for this connection. The results are ordered - * by schema name. Schema information retreived only for the schema to which - * used in obtaining this driver connection. - * @return ResultsSet object containing schema and catalog names. - * @throws SQLException if there is an error obtaining metamatrix results. - */ public ResultSet getSchemas() throws SQLException { return getSchemas(null, null); } - /** - * <p>Gets MetaMatrix's preferred term for schema - * @return String object giving schema term - * @throws SQLException, should never occur - */ public String getSchemaTerm() throws SQLException { return SCHEMA_TERM; } @@ -1429,11 +1326,6 @@ return ESCAPE_SEARCH_STRING; } - /** - * <p>Get metamatrix keywords that are not SQL-92 keyword - * @return String object giving non SQL-92 keywords - * @throws SQLException, should never occur - */ public String getSQLKeywords() throws SQLException { return KEY_WORDS; } @@ -1448,11 +1340,6 @@ return 2; } - /** - * <p>Gets the Open Group CLI names for metamatrix string functions - * @return String containing string function names - * @throws SQLException, should never occur - */ public String getStringFunctions() throws SQLException { return STRING_FUNCTIONS; } @@ -1541,26 +1428,10 @@ return createResultSet(records, metadataList); } - /** - * <p>Gets the Open Group CLI names for metamatrix system functions - * @return String containing system function names - * @throws SQLException, should never occur - */ public String getSystemFunctions() throws SQLException { - return SYSTEM_FUNCTIONS; // there are no system functions + return SYSTEM_FUNCTIONS; } - /** - * <p>Gets a description of access rights for the table of the given name. - * <p>Catalog and schemaPattern are not used to narrow down the search, but they - * should match the virtualdatabasename and version used to obtain this driver - * connection. - * @param name of the catalog the table is present in. - * @param pattern of schama name the table is present in. - * @param pattern of table names whose privilage info is needed. - * @return ResultSet containing table privilages info. - * @throws SQLException if there is an error obtaining metamatrix results. - */ public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableName) throws SQLException { List records = new ArrayList (0); /*********************************************************************** @@ -1587,20 +1458,6 @@ } - /** - * <p>Gets a description of tables whose table name matches tableNamePattern. - * <p>Catalog, schemaPattern and types[] are not used to narrow down the search, - * but catalog and schemaPattern should match the virtualdatabasename and - * version respectively used to obtain this driver connection. - * Note: - * supports 1.4 API - * @param name of the catalog in which tables are present. - * @param pattern of schema names which in which the tables are present. - * @param pattern of tables names. - * @param list of possible table types. - * @return ResultSet containing Table metadata information. - * @throws SQLException if there is an error obtaining metamatrix results. - */ public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String types[]) throws SQLException { if (catalog == null) { catalog = PERCENT; @@ -1698,12 +1555,6 @@ return createResultSet(records, rmetadata); } - /** - * <p>Gets the table types available to metamatrix. The results are ordered by - * table type - * @return ResultSet object containing hardcoded table type info. - * @throws SQLException, should never occur. - */ public ResultSet getTableTypes() throws SQLException { // list which represent records containing Table Type info @@ -1733,20 +1584,10 @@ return createResultSet(records, metadataList); } - /** - * <p>Gets the Open Group CLI names for metamatrix time and date functions - * @return String representing time and date functions in MetaMatrix - * @throws SQLException, should never occur - */ public String getTimeDateFunctions() throws SQLException { return DATE_FUNCTIONS; } - /** - * <p>Gets the description of all datatypes supported by metamatrix. - * @return ResultSet object containing info about the datatypes supported by MetaMatrix. - * @throws SQLException if there is an error obtaining metamatrix results. - */ public ResultSet getTypeInfo() throws SQLException { // list which represent records containing data type info @@ -1847,19 +1688,10 @@ return createEmptyResultSet(columnNames, dataTypes); } - /** - * <p>Gets the URL used to connect to metamatrix - * @return URL used to connect. - * @throws SQLException - */ public String getURL() throws SQLException { return driverConnection.getUrl(); } - /** - * <p>Gets the user name as known to metamatrix - * @return name if the user. - */ public String getUserName() throws SQLException { return driverConnection.getUserName(); } @@ -1906,11 +1738,6 @@ return false; } - /** - * <p>Checks whether the databases used by metamatrix are in read-only mode</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean isReadOnly() throws SQLException { return false; } @@ -2038,113 +1865,46 @@ return false; } - /** - * <p>This method checks whether metamatrix treats mixed-case unquoted SQL identifiers - * used in SQL statements as case-insensitive and stores them as all lowercase - * in its metadata tables.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean storesLowerCaseIdentifiers() throws SQLException { return false; } - /** - * <p>This method checks whether metamatrix treats mixed-case quoted SQL identifiers - * used in SQL statements as case-insensitive and stores them as all lowercase - * in its metadata tables.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean storesLowerCaseQuotedIdentifiers() throws SQLException { return false; } - /** - * <p>This method checks whether metamatrix treats mixed-case unquoted SQL identifiers - * used in SQL statements as case-insensitive and stores them as all mixedcase - * in its metadata tables.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean storesMixedCaseIdentifiers() throws SQLException { return true; } - /** - * <p>This method checks whether metamatrix treats mixed-case quoted SQL identifiers - * used in SQL statements as case-insensitive and stores them in mixedcase - * in its metadata tables.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean storesMixedCaseQuotedIdentifiers() throws SQLException { return true; } - /** - * <p>This method checks whether metamatrix treats mixed-case unquoted SQL identifiers - * used in SQL statements as case-insensitive and stores them as all uppercase - * in its metadata tables.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean storesUpperCaseIdentifiers() throws SQLException { return false; } - /** - * <p>This method checks whether metamatrix treats mixed-case quoted SQL identifiers - * used in SQL statements as case-insensitive and stores them as all uppercase - * in its metadata tables.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean storesUpperCaseQuotedIdentifiers() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports ALTER TABLE with add column.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsAlterTableWithAddColumn() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports ALTER TABLE with drop column.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsAlterTableWithDropColumn() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports ANSI-92 entry level SQL grammer.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsANSI92EntryLevelSQL() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports ANSI-92 full SQL grammer.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsANSI92FullSQL() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports ANSI-92 intermediate SQL grammer.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsANSI92IntermediateSQL() throws SQLException { return false; } @@ -2158,84 +1918,34 @@ return true; } - /** - * <p>Checks whether metamatrix supports using a catalog name in a data manipulation - * statement.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsCatalogsInDataManipulation() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports using a catalog name in an index definition - * statement.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsCatalogsInIndexDefinitions() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports using a catalog name in a privilage - * definition statement.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports using a catalog name in a procedure call - * statement.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsCatalogsInProcedureCalls() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports using a catalog name in a table definition - * statement.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsCatalogsInTableDefinitions() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports column aliasing. If true the SQL AS clause - * can be used to provide names for alias names for columns.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsColumnAliasing() throws SQLException { return true; - } + } - /** - * <p>Checks whether metamatrix supports scalar function CONVERT for the conversion - * of one JDBC type to another.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsConvert() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports scalar function CONVERT for the conversion - * of fromType to toType.</p> - * @param fromType SQL type from which to convert - * @param toType SQL type to convert to - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsConvert(int fromType, int toType) throws SQLException { String fromName = MMJDBCSQLTypeInfo.getTypeName(fromType); String toName = MMJDBCSQLTypeInfo.getTypeName(toType); @@ -2249,77 +1959,34 @@ return DataTypeManager.isTransformable(fromName, toName); } - /** - * <p>Checks whether metamatrix supports correlated subqueries.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsCorrelatedSubqueries() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports ODBC Core SQL grammer.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsCoreSQLGrammar() throws SQLException { return false; } - /** - * <p>Checks whether metamatric supports both data definition and data manipulation - * statements within a transaction.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException { return false; } - /** - * <p>Are only data manipulation statements within a transaction - * supported?</p> - * @return <code>true</code> if so; <code>false</code> otherwise - * @throws SQLException, should never occur - */ public boolean supportsDataManipulationTransactionsOnly() throws SQLException { return false; } - /** - * <p>Checks whether metamatric supports only data manipulation statements within - * a transaction.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsDifferentTableCorrelationNames() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports expressions in ORDER BY lists.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsExpressionsInOrderBy() throws SQLException { - return false; + return true; } - /** - * <p>Checks whether metamatrix supports ODBC Extended SQL grammer.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsExtendedSQLGrammar() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports full outer joins</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsFullOuterJoins() throws SQLException { return true; } @@ -2335,67 +2002,30 @@ return false; } - /** - * <p>Checks whether metamatrix supports GROUP BY</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsGroupBy() throws SQLException { return true; } - /** - * <p>Checks whether a GROUP BY clause can use columns that are not in the SELECT - * clause, provided that it specifies all the columns in the SELECT clause.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsGroupByBeyondSelect() throws SQLException { return true; } - /** - * <p>Checks whether a GROUP BY clause can use columns that are not in the SELECT - * clause.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsGroupByUnrelated() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports the SQL Integrity Enhancement Facility.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsIntegrityEnhancementFacility() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports specifying a LIKE escape clause.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsLikeEscapeClause() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix provides limited support for outer joins.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsLimitedOuterJoins() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports the ODBC minimum SQL grammer.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsMinimumSQLGrammar() throws SQLException { return true; } @@ -2420,11 +2050,6 @@ return false; } - /** - * <p>Checks whether metamatrix supports having cursors open across commits. - * @return if so return true, else false.</p> - * @throws SQLException, should never occur. - */ public boolean supportsOpenCursorsAcrossCommit() throws SQLException { return false; } @@ -2457,47 +2082,22 @@ return true; } - /** - * Retrieves whether metamatrix supports named parameters to callable statements. - * @return boolean true if named parameters are supported; false otherwise. - * @throws SQLException, should never occur - */ public boolean supportsNamedParameters() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports defining columns as nonnullable.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsNonNullableColumns() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports having cursors open across rollbacks.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsOpenCursorsAcrossRollback() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports having cursors open across commits.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsOpenStatementsAcrossCommit() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports having cursors open across rollbacks.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsOpenStatementsAcrossRollback() throws SQLException { return true; } @@ -2511,42 +2111,18 @@ return true; } - /** - * <p>Checks whether metamatrix supports some form of outer joins.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsOuterJoins() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports positioned DELETEs on resultsets</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsPositionedDelete() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports positioned UPDATEs on result sets.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsPositionedUpdate() throws SQLException { return false; } - /** - * <p>Does the database support the concurrency type in combination - * with the given result set type?</p> - * @param type defined in <code>java.sql.ResultSet</code> - * @param concurrency type defined in <code>java.sql.ResultSet</code> - * @return <code>true</code> if so; <code>false</code> otherwise - * @throws SQLException, should never occur - * @see Connection - */ public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException { if(type == java.sql.ResultSet.TYPE_FORWARD_ONLY || type == java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE) { @@ -2586,200 +2162,86 @@ return false; } - /** - * Retrieves whether metamatrix supports savepoints. - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSavepoints() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports using a schema name in a data manipulation - * statement</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSchemasInDataManipulation() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports using a schema name in an index definition - * statement</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSchemasInIndexDefinitions() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports using a schema name in a privilage - * definition statement</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports using a schema name in an procedure - * call statement</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSchemasInProcedureCalls() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports using a schema name in an table - * definition statement</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSchemasInTableDefinitions() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports SELECT FOR UPDATE statements</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSelectForUpdate() throws SQLException { return false; } - /** - * Retrieves whether this metamatrix supports statement pooling. - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsStatementPooling() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports stored procedure calls using the stored - * procedure escape syntax</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsStoredProcedures() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports subqueries in comparision expressions.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSubqueriesInComparisons() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports subqueries in EXISTS expressions.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSubqueriesInExists() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports subqueries in IN statements.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSubqueriesInIns() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports subqueries in qualified expressions.</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsSubqueriesInQuantifieds() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports table correlation names</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsTableCorrelationNames() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports the given transaction isolation level</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsTransactionIsolationLevel(int level) throws SQLException { return false; } - /** - * <p>Checks whether metamatrix supports transactions</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsTransactions() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports SQL UNION</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsUnion() throws SQLException { return true; } - /** - * <p>Checks whether metamatrix supports SQL UNION ALL</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean supportsUnionAll() throws SQLException { return true; } - /** - * <p>Indicates whether or not a visible row update can be detected by - * calling the method <code>ResultSet.rowUpdated</code>.</p> - * @param result set type, i.e. ResultSet.TYPE_XXX - * @return <code>true</code> if changes are detected by the result set type; - * <code>false</code> otherwise - * @throws SQLException, should never occur - */ public boolean updatesAreDetected(int type) throws SQLException { return false; } - /** - * <p>Checks whether metamatrix uses a separate local file to store each table</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean usesLocalFilePerTable() throws SQLException { return false; } - /** - * <p>Checks whether metamatrix stores tables in a local file</p> - * @return if so return true, else false. - * @throws SQLException, should never occur. - */ public boolean usesLocalFiles() throws SQLException { return false; } @@ -2829,17 +2291,6 @@ return createResultSet(records, rmetadata); } - /** - * <p>This method is used to hardcode metadata details for a given column into - * a map object. While some of the details are obtained as parameters, most - * are hardcoded. - * @param tableName The group/table name in which the column is present - * @param columnName The name of the column/element - * @param dataType The MetaMatrix datatype of the column - * @param nullable An int value indicating nallability of the column - * @return a map containing metadata details for any given column - * @throws SQLException, should never occur - */ private Map getColumnMetadata(String tableName, String columnName, String dataType, Integer nullable) throws SQLException { return getColumnMetadata(tableName, columnName, dataType, nullable, ResultsMetadataConstants.SEARCH_TYPES.UNSEARCHABLE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE); } Modified: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -47,7 +47,7 @@ * - jdbc:teiid:BQT * - jdbc:teiid:BQT;verson=1 */ - static final String BASE_PATTERN = "jdbc:teiid:((\\w+)[;]?)(;([^@])+)*"; //$NON-NLS-1$ + static final String BASE_PATTERN = "jdbc:teiid:(\\w+)(;.*)?"; //$NON-NLS-1$ private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$ Modified: trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -61,7 +61,7 @@ // This host/port pattern allows just a . or a - to be in the host part. static final String HOST_PORT_PATTERN = "[\\p{Alnum}\\.\\-]+:\\d+"; //$NON-NLS-1$ - static final String URL_PATTERN = "jdbc:(metamatrix|teiid):(\\w+)@((mm[s]?://"+HOST_PORT_PATTERN+"(,"+HOST_PORT_PATTERN+")*)[;]?){1}((.*)*)"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + static final String URL_PATTERN = "jdbc:(metamatrix|teiid):(\\w+)@mm[s]?://"+HOST_PORT_PATTERN+"(,"+HOST_PORT_PATTERN+")*(;.*)?"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ static Pattern urlPattern = Pattern.compile(URL_PATTERN); /** Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -74,7 +74,7 @@ //######## Configuration state ############# private ConnectionImpl driverConnection; - private Properties execProps = null; + private Properties execProps; // the string which is the XSLT style sheet private String styleSheet; @@ -797,11 +797,11 @@ } public void setExecutionProperty(String name, String value) { - this.execProps.put(name, value); + this.execProps.setProperty(name, value); } public String getExecutionProperty(String name) { - return (String) this.execProps.get(name); + return this.execProps.getProperty(name); } /** Modified: trunk/client/src/main/java/org/teiid/net/ServerConnection.java =================================================================== --- trunk/client/src/main/java/org/teiid/net/ServerConnection.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/main/java/org/teiid/net/ServerConnection.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -27,7 +27,6 @@ public interface ServerConnection { public static final int PING_INTERVAL = 120000; - public static final String LOCAL_CONNECTION = "localConnection"; //$NON-NLS-1$ <T> T getService(Class<T> iface); Modified: trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java =================================================================== --- trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -914,7 +914,7 @@ assertEquals(TimestampUtil.createTime(0, 0, 0), rs.getTime(2)); assertEquals(TimestampUtil.createDate(1, 1, 1), rs.getDate(3)); assertEquals(TimestampUtil.createTimestamp(1, 1, 1, 1, 1, 1, 1), rs.getTimestamp(4)); - assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><root/>", rs.getSQLXML(5).getString()); //$NON-NLS-1$ + assertEquals("<root/>", rs.getSQLXML(5).getString()); //$NON-NLS-1$ try { rs.getSQLXML(1); } catch (SQLException e) { Modified: trunk/client/src/test/java/org/teiid/jdbc/TestMMStatement.java =================================================================== --- trunk/client/src/test/java/org/teiid/jdbc/TestMMStatement.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/client/src/test/java/org/teiid/jdbc/TestMMStatement.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -72,4 +72,17 @@ assertEquals("bar", p.get("foo")); //$NON-NLS-1$ //$NON-NLS-2$ } + @Test public void testPropertiesOverride() throws Exception { + ConnectionImpl conn = Mockito.mock(ConnectionImpl.class); + Properties p = new Properties(); + p.setProperty(ExecutionProperties.ANSI_QUOTED_IDENTIFIERS, Boolean.TRUE.toString()); + Mockito.stub(conn.getConnectionProperties()).toReturn(p); + StatementImpl statement = new StatementImpl(conn, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); + assertEquals(Boolean.TRUE.toString(), statement.getExecutionProperty(ExecutionProperties.ANSI_QUOTED_IDENTIFIERS)); + statement.setExecutionProperty(ExecutionProperties.ANSI_QUOTED_IDENTIFIERS, Boolean.FALSE.toString()); + assertEquals(Boolean.FALSE.toString(), statement.getExecutionProperty(ExecutionProperties.ANSI_QUOTED_IDENTIFIERS)); + assertEquals(Boolean.TRUE.toString(), p.getProperty(ExecutionProperties.ANSI_QUOTED_IDENTIFIERS)); + } + + } Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/SQLReservedWords.java =================================================================== --- trunk/connector-api/src/main/java/org/teiid/connector/language/SQLReservedWords.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/SQLReservedWords.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -47,6 +47,35 @@ public static final String RPAREN = ")"; //$NON-NLS-1$ } + //Teiid specific + public static final String BIGDECIMAL = "BIGDECIMAL"; //$NON-NLS-1$ + public static final String BIGINTEGER = "BIGINTEGER"; //$NON-NLS-1$ + public static final String BREAK = "BREAK"; //$NON-NLS-1$ + public static final String BYTE = "BYTE"; //$NON-NLS-1$ + public static final String CRITERIA = "CRITERIA"; //$NON-NLS-1$ + public static final String ERROR = "ERROR"; //$NON-NLS-1$ + public static final String FN = "FN"; //$NON-NLS-1$ + public static final String LONG = "LONG"; //$NON-NLS-1$ + public static final String LOOP = "LOOP"; //$NON-NLS-1$ + public static final String MAKEDEP = "MAKEDEP"; //$NON-NLS-1$ + public static final String MAKENOTDEP = "MAKENOTDEP"; //$NON-NLS-1$ + public static final String NOCACHE = "NOCACHE"; //$NON-NLS-1$ + public static final String OJ = "OJ"; //$NON-NLS-1$ + public static final String PLANONLY = "PLANONLY"; //$NON-NLS-1$ + public static final String SQL_TSI_FRAC_SECOND = "SQL_TSI_FRAC_SECOND"; //$NON-NLS-1$ + public static final String SQL_TSI_SECOND = "SQL_TSI_SECOND"; //$NON-NLS-1$ + public static final String SQL_TSI_MINUTE = "SQL_TSI_MINUTE"; //$NON-NLS-1$ + public static final String SQL_TSI_HOUR = "SQL_TSI_HOUR"; //$NON-NLS-1$ + public static final String SQL_TSI_DAY = "SQL_TSI_DAY"; //$NON-NLS-1$ + public static final String SQL_TSI_WEEK = "SQL_TSI_WEEK"; //$NON-NLS-1$ + public static final String SQL_TSI_MONTH = "SQL_TSI_MONTH"; //$NON-NLS-1$ + public static final String SQL_TSI_QUARTER = "SQL_TSI_QUARTER"; //$NON-NLS-1$ + public static final String SQL_TSI_YEAR = "SQL_TSI_YEAR"; //$NON-NLS-1$ + public static final String STRING = "STRING"; //$NON-NLS-1$ + public static final String VIRTUAL = "VIRTUAL"; //$NON-NLS-1$ + public static final String WHILE = "WHILE"; //$NON-NLS-1$ + + //SQL2003 keywords public static final String ADD = "ADD"; //$NON-NLS-1$ public static final String ANY = "ANY"; //$NON-NLS-1$ public static final String ALL = "ALL"; //$NON-NLS-1$ @@ -56,19 +85,15 @@ public static final String AS = "AS"; //$NON-NLS-1$ public static final String ASC = "ASC"; //$NON-NLS-1$ public static final String ATOMIC = "ATOMIC"; //$NON-NLS-1$ - public static final String AUTHORIZATION = "autorization"; //$NON-NLS-1$ + public static final String AUTHORIZATION = "AUTHORIZATION"; //$NON-NLS-1$ public static final String AVG = "AVG"; //$NON-NLS-1$ public static final String BEGIN = "BEGIN"; //$NON-NLS-1$ public static final String BETWEEN = "BETWEEN"; //$NON-NLS-1$ - public static final String BIGDECIMAL = "BIGDECIMAL"; //$NON-NLS-1$ public static final String BIGINT = "BIGINT"; //$NON-NLS-1$ - public static final String BIGINTEGER = "BIGINTEGER"; //$NON-NLS-1$ public static final String BINARY = "BINARY"; //$NON-NLS-1$ public static final String BLOB = "BLOB"; //$NON-NLS-1$ public static final String BOTH = "BOTH"; //$NON-NLS-1$ - public static final String BREAK = "BREAK"; //$NON-NLS-1$ public static final String BY = "BY"; //$NON-NLS-1$ - public static final String BYTE = "BYTE"; //$NON-NLS-1$ public static final String CALL = "CALL"; //$NON-NLS-1$ public static final String CALLED = "CALLED"; //$NON-NLS-1$ public static final String CASE = "CASE"; //$NON-NLS-1$ @@ -88,7 +113,6 @@ public static final String CONTINUE = "CONTINUE"; //$NON-NLS-1$ public static final String COUNT = "COUNT"; //$NON-NLS-1$ public static final String CORRESPONDING = "CORRESPONDING"; //$NON-NLS-1$ - public static final String CRITERIA = "CRITERIA"; //$NON-NLS-1$ public static final String CREATE = "CREATE"; //$NON-NLS-1$ public static final String CROSS = "CROSS"; //$NON-NLS-1$ public static final String CURRENT_DATE = "CURRENT_DATE"; //$NON-NLS-1$ @@ -114,7 +138,6 @@ public static final String EACH = "EACH"; //$NON-NLS-1$ public static final String ELSE = "ELSE"; //$NON-NLS-1$ public static final String END = "END"; //$NON-NLS-1$ - public static final String ERROR = "ERROR"; //$NON-NLS-1$ public static final String ESCAPE = "ESCAPE"; //$NON-NLS-1$ public static final String EXCEPT = "EXCEPT"; //$NON-NLS-1$ public static final String EXEC = "EXEC"; //$NON-NLS-1$ @@ -125,7 +148,6 @@ public static final String FETCH = "FETCH"; //$NON-NLS-1$ public static final String FILTER = "FILTER"; //$NON-NLS-1$ public static final String FLOAT = "FLOAT"; //$NON-NLS-1$ - public static final String FN = "FN"; //$NON-NLS-1$ public static final String FOR = "FOR"; //$NON-NLS-1$ public static final String FOREIGN = "FOREIGN"; //$NON-NLS-1$ public static final String FROM = "FROM"; //$NON-NLS-1$ @@ -164,10 +186,6 @@ public static final String LIKE = "LIKE"; //$NON-NLS-1$ public static final String LIMIT = "LIMIT"; //$NON-NLS-1$ public static final String LOCAL = "LOCAL"; //$NON-NLS-1$ - public static final String LONG = "LONG"; //$NON-NLS-1$ - public static final String LOOP = "LOOP"; //$NON-NLS-1$ - public static final String MAKEDEP = "MAKEDEP"; //$NON-NLS-1$ - public static final String MAKENOTDEP = "MAKENOTDEP"; //$NON-NLS-1$ public static final String MATCH = "MATCH"; //$NON-NLS-1$ public static final String MAX = "MAX"; //$NON-NLS-1$ public static final String MIN = "MIN"; //$NON-NLS-1$ @@ -180,13 +198,11 @@ public static final String NATURAL = "NATURAL"; //$NON-NLS-1$ public static final String NEW = "NEW"; //$NON-NLS-1$ public static final String NO = "NO"; //$NON-NLS-1$ - public static final String NOCACHE = "NOCACHE"; //$NON-NLS-1$ public static final String NONE = "NONE"; //$NON-NLS-1$ public static final String NOT = "NOT"; //$NON-NLS-1$ public static final String NULL = "NULL"; //$NON-NLS-1$ public static final String OBJECT = "OBJECT"; //$NON-NLS-1$ public static final String OF = "OF"; //$NON-NLS-1$ - public static final String OJ = "OJ"; //$NON-NLS-1$ public static final String OLD = "OLD"; //$NON-NLS-1$ public static final String ON = "ON"; //$NON-NLS-1$ public static final String ONLY = "ONLY"; //$NON-NLS-1$ @@ -205,7 +221,6 @@ public static final String PREPARE = "PREPARE"; //$NON-NLS-1$ public static final String PRIMARY = "PRIMARY"; //$NON-NLS-1$ public static final String PROCEDURE = "PROCEDURE"; //$NON-NLS-1$ - public static final String PLANONLY = "PLANONLY"; //$NON-NLS-1$ public static final String RANGE = "RANGE"; //$NON-NLS-1$ public static final String READS = "READS"; //$NON-NLS-1$ public static final String REAL = "REAL"; //$NON-NLS-1$ @@ -238,18 +253,8 @@ public static final String SQLEXCEPTION = "SQLEXCEPTION"; //$NON-NLS-1$ public static final String SQLSTATE = "SQLSTATE"; //$NON-NLS-1$ public static final String SQLWARNING = "SQLWARNING"; //$NON-NLS-1$ - public static final String SQL_TSI_FRAC_SECOND = "SQL_TSI_FRAC_SECOND"; //$NON-NLS-1$ - public static final String SQL_TSI_SECOND = "SQL_TSI_SECOND"; //$NON-NLS-1$ - public static final String SQL_TSI_MINUTE = "SQL_TSI_MINUTE"; //$NON-NLS-1$ - public static final String SQL_TSI_HOUR = "SQL_TSI_HOUR"; //$NON-NLS-1$ - public static final String SQL_TSI_DAY = "SQL_TSI_DAY"; //$NON-NLS-1$ - public static final String SQL_TSI_WEEK = "SQL_TSI_WEEK"; //$NON-NLS-1$ - public static final String SQL_TSI_MONTH = "SQL_TSI_MONTH"; //$NON-NLS-1$ - public static final String SQL_TSI_QUARTER = "SQL_TSI_QUARTER"; //$NON-NLS-1$ - public static final String SQL_TSI_YEAR = "SQL_TSI_YEAR"; //$NON-NLS-1$ public static final String START = "START"; //$NON-NLS-1$ public static final String STATIC = "STATIC"; //$NON-NLS-1$ - public static final String STRING = "STRING"; //$NON-NLS-1$ public static final String SYSTEM = "SYSTEM"; //$NON-NLS-1$ public static final String SYSTEM_USER = "SYSTEM_USER"; //$NON-NLS-1$ public static final String SUM = "SUM"; //$NON-NLS-1$ @@ -276,11 +281,9 @@ public static final String VALUE = "VALUE"; //$NON-NLS-1$ public static final String VALUES = "VALUES"; //$NON-NLS-1$ public static final String VARCHAR = "VARCHAR"; //$NON-NLS-1$ - public static final String VIRTUAL = "VIRTUAL"; //$NON-NLS-1$ public static final String WHEN = "WHEN"; //$NON-NLS-1$ public static final String WHENEVER = "WHENEVER"; //$NON-NLS-1$ public static final String WHERE = "WHERE"; //$NON-NLS-1$ - public static final String WHILE = "WHILE"; //$NON-NLS-1$ public static final String WINDOW = "WINDOW"; //$NON-NLS-1$ public static final String WITH = "WITH"; //$NON-NLS-1$ public static final String WITHIN = "WITHIN"; //$NON-NLS-1$ Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -146,7 +146,7 @@ String vdbName = workContext.getVdbName(); int vdbVersion = workContext.getVdbVersion(); VDBMetaData vdb = workContext.getVDB(); - CompositeMetadataStore metadata = vdb.getAttachment(CompositeMetadataStore.class); + CompositeMetadataStore metadata = vdb.getAttachment(TransformationMetadata.class).getMetadataStore(); Collection rows = new ArrayList(); if (command instanceof Query) { Query query = (Query)command; Modified: trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java =================================================================== --- trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -1080,7 +1080,12 @@ * @since 4.3 */ public String[] getVDBResourcePaths() throws MetaMatrixComponentException, QueryMetadataException { - ArrayList<String> paths = new ArrayList<String>(this.vdbEntries.keySet()); + LinkedList<String> paths = new LinkedList<String>(); + for (Map.Entry<String, Resource> entry : this.vdbEntries.entrySet()) { + if (entry.getValue().visible) { + paths.add(entry.getKey()); + } + } return paths.toArray(new String[paths.size()]); } Modified: trunk/engine/src/test/java/com/metamatrix/common/buffer/BufferManagerFactory.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/common/buffer/BufferManagerFactory.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/engine/src/test/java/com/metamatrix/common/buffer/BufferManagerFactory.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -46,10 +46,14 @@ * typically used for testing or when memory is not an issue. * @return BufferManager ready for use */ - public static BufferManager getStandaloneBufferManager() throws MetaMatrixComponentException { + public static BufferManager getStandaloneBufferManager() { if (INSTANCE == null) { BufferManagerImpl bufferMgr = new BufferManagerImpl(); - bufferMgr.initialize(); + try { + bufferMgr.initialize(); + } catch (MetaMatrixComponentException e) { + throw new RuntimeException(e); + } // Add unmanaged memory storage manager bufferMgr.setStorageManager(new MemoryStorageManager()); Modified: trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeBufferService.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeBufferService.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeBufferService.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -24,7 +24,6 @@ import org.teiid.dqp.internal.cache.DQPContextCache; -import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.cache.CacheFactory; import com.metamatrix.cache.FakeCache.FakeCacheFactory; import com.metamatrix.common.buffer.BufferManager; @@ -42,11 +41,7 @@ public FakeBufferService() { super(); - try { - bufferMgr = BufferManagerFactory.getStandaloneBufferManager(); - } catch(MetaMatrixComponentException e) { - e.printStackTrace(); - } + bufferMgr = BufferManagerFactory.getStandaloneBufferManager(); } /* Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -138,7 +138,9 @@ public void addEntriesPlusVisibilities(VirtualFile root, VDBMetaData vdb) throws IOException { LinkedHashMap<String, Resource> visibilityMap = new LinkedHashMap<String, Resource>(); for(VirtualFile f: root.getChildrenRecursively()) { - visibilityMap.put("/" + f.getPathName(), new Resource(f, isFileVisible(f.getPathName(), vdb))); //$NON-NLS-1$ + if (f.isLeaf()) { + visibilityMap.put("/" + f.getPathName(), new Resource(f, isFileVisible(f.getPathName(), vdb))); //$NON-NLS-1$ + } } this.vdbEntries = visibilityMap; } @@ -149,19 +151,25 @@ private boolean isFileVisible(String pathInVDB, VDBMetaData vdb) { - String modelName = StringUtil.getFirstToken(StringUtil.getLastToken(pathInVDB, "/"), "."); //$NON-NLS-1$ //$NON-NLS-2$ - - // If this is any of the Public System Models, like JDBC,ODBC system - // models - if (isSystemModelWithSystemTableType(modelName)) { - return true; + if (pathInVDB.endsWith(".xmi")) { //$NON-NLS-1$ + String modelName = StringUtil.getFirstToken(StringUtil.getLastToken(pathInVDB, "/"), "."); //$NON-NLS-1$ //$NON-NLS-2$ + + // If this is any of the Public System Models, like JDBC,ODBC system + // models + if (isSystemModelWithSystemTableType(modelName)) { + return true; + } + + ModelMetaData model = vdb.getModel(modelName); + if (model != null) { + return model.isVisible(); + } } - - ModelMetaData model = vdb.getModel(modelName); - if (model != null) { - return model.isVisible(); + + if (pathInVDB.startsWith("META-INF/")) {//$NON-NLS-1$ + return false; } - + String entry = StringUtil.getLastToken(pathInVDB, "/"); //$NON-NLS-1$ // index files should not be visible Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -119,7 +119,7 @@ deployment.removeAttachment(IndexMetadataFactory.class); deployment.removeAttachment(UDFMetaData.class); deployment.addAttchment(QueryMetadataInterface.class, metadata); - deployment.addAttchment(CompositeMetadataStore.class, metadata.getMetadataStore()); + deployment.addAttchment(TransformationMetadata.class, metadata); // add transformation metadata to the repository. this.vdbRepository.addMetadata(deployment, metadata); Modified: trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -56,19 +56,22 @@ private DQPWorkContext workContext = new DQPWorkContext(); public LocalServerConnection(Properties connectionProperties) throws CommunicationException, ConnectionException{ + this.csr = getClientServiceRegistry(); + workContext.setSecurityHelper(csr.getSecurityHelper()); + this.result = authenticate(connectionProperties); + } + + protected ClientServiceRegistry getClientServiceRegistry() { try { InitialContext ic = new InitialContext(); - csr = (ClientServiceRegistry)ic.lookup(TEIID_RUNTIME); + return (ClientServiceRegistry)ic.lookup(TEIID_RUNTIME); } catch (NamingException e) { throw new MetaMatrixRuntimeException(e); } - workContext.setSecurityHelper(csr.getSecurityHelper()); - this.result = authenticate(connectionProperties); } public synchronized LogonResult authenticate(Properties connProps) throws ConnectionException, CommunicationException { try { - connProps.setProperty(ServerConnection.LOCAL_CONNECTION, Boolean.TRUE.toString()); LogonResult logonResult = this.getService(ILogon.class).logon(connProps); return logonResult; } catch (LogonException e) { @@ -79,7 +82,7 @@ if (e.getCause() instanceof CommunicationException) { throw (CommunicationException)e.getCause(); } - throw new CommunicationException(e, NetPlugin.Util.getString("PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to_MetaMatrix")); //$NON-NLS-1$ + throw new CommunicationException(e); } } Modified: trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -35,7 +35,6 @@ import org.teiid.client.util.ResultsFuture; import org.teiid.dqp.internal.process.DQPWorkContext; import org.teiid.net.TeiidURL; -import org.teiid.net.ServerConnection; import org.teiid.security.Credentials; import com.metamatrix.api.exception.ComponentNotFoundException; @@ -71,9 +70,9 @@ try { SessionMetadata sessionInfo = service.createSession(user,credential, applicationName, connProps, adminConnection); updateDQPContext(sessionInfo); - if (Boolean.parseBoolean(connProps.getProperty(ServerConnection.LOCAL_CONNECTION))) { + if (DQPWorkContext.getWorkContext().getClientAddress() == null) { sessionInfo.setEmbedded(true); - } + } return new LogonResult(sessionInfo.getSessionToken(), sessionInfo.getVDBName(), sessionInfo.getVDBVersion(), clusterName); } catch (LoginException e) { throw new LogonException(e.getMessage()); Modified: trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java =================================================================== --- trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -42,7 +42,7 @@ } public String getTestVDB() { - return UnitTestUtil.getTestDataPath() + "/partssupplier/PartsSupplier.vdb"; //$NON-NLS-1$ + return UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb"; //$NON-NLS-1$ } public void helpTestTranslate(String sql, String expectedOutput) { Modified: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -101,7 +101,6 @@ RequestWorkItem rwi = Mockito.mock(RequestWorkItem.class); DQPWorkContext workContext = new DQPWorkContext(); VDBMetaData vdb = new VDBMetaData(); - vdb.addAttchment(CompositeMetadataStore.class, metadata.getMetadataStore()); vdb.addAttchment(TransformationMetadata.class, metadata); workContext.getSession().setVdb(vdb); Mockito.stub(rwi.getDqpWorkContext()).toReturn(workContext); Added: trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java (rev 0) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.jdbc; + + +import java.io.File; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.util.Stack; + +import org.teiid.jdbc.TeiidDriver; + +import com.metamatrix.core.util.UnitTestUtil; + + +/** + * This class can be used as the base class to write Query based tests using + * the Teiid Driver for integration testing. Just like the scripted one this one should provide all + * those required flexibility in testing. + */ +public class AbstractMMQueryTestCase extends AbstractQueryTest { + + static { + new TeiidDriver(); + } + + private Stack<java.sql.Connection> contexts = new Stack<java.sql.Connection>(); + + public void pushConnection() { + this.contexts.push(this.internalConnection); + this.internalConnection = null; + } + + public void popConnection() { + this.internalConnection = this.contexts.pop(); + } + + public Connection getConnection(String vdb, String propsFile){ + return getConnection(vdb, propsFile, ""); //$NON-NLS-1$ + } + + public Connection getConnection(String vdb, String propsFile, String addtionalStuff){ + closeResultSet(); + closeStatement(); + closeConnection(); + try { + this.internalConnection = createConnection(vdb, propsFile, addtionalStuff); + } catch (SQLException e) { + throw new RuntimeException(e); + } + return this.internalConnection; + } + + public static Connection createConnection(String vdb, String propsFile, String addtionalStuff) throws SQLException { + String url = "jdbc:teiid:"+vdb+"@" + propsFile+addtionalStuff; //$NON-NLS-1$ //$NON-NLS-2$ + return DriverManager.getConnection(url); + } + + + protected void helpTest(String query, String[] expected, String vdb, String props, String urlProperties) { + getConnection(vdb, props, urlProperties); + executeAndAssertResults(query, expected); + closeConnection(); + } + + protected void checkResult(String testName, ResultSet actualResults, String testsuite) throws Exception { + ResultSetMetaData resultMetadata = actualResults.getMetaData(); + + String metafilename = UnitTestUtil.getTestDataPath() + File.separator+testsuite+File.separator + "expected" + File.separator+ testName.substring(4) + ".metadata.txt"; //$NON-NLS-1$ //$NON-NLS-2$ + assertResultsSetMetadataEquals(resultMetadata, new File(metafilename)); + + String filename = UnitTestUtil.getTestDataPath() + File.separator+testsuite+File.separator + "expected" + File.separator+ testName.substring(4) + ".txt"; //$NON-NLS-1$ //$NON-NLS-2$ + assertResultsSetEquals(actualResults, new File(filename)); + } + +} \ No newline at end of file Added: trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java (rev 0) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,479 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.jdbc; + + +import static org.junit.Assert.*; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Statement; + +import org.junit.After; +import org.teiid.script.io.MetadataReader; +import org.teiid.script.io.ResultSetReader; +import org.teiid.script.io.StringArrayReader; + + + +/** + * This class can be used as the base class to write Query tests for + * integration testing. Just like the scripted one this one should provide all + * those required flexibility in testing. + */ +public abstract class AbstractQueryTest { + + //NOTE not all tests will pass with this set to true, only those with scrollable resultsets + static boolean WRITE_ACTUAL = false; + + protected Connection internalConnection = null; + protected ResultSet internalResultSet = null; + protected Statement internalStatement = null; + private SQLException internalException = null; + protected int updateCount = -1; + protected String DELIMITER = " "; //$NON-NLS-1$ + + public AbstractQueryTest() { + super(); + } + + + public AbstractQueryTest(Connection conn) { + super(); + this.internalConnection = conn; + + } + + + @After public void tearDown() throws Exception { + closeConnection(); + } + + public void setConnection(Connection c) { + this.internalConnection = c; + } + + public Connection getConnection() { + return this.internalConnection; + } + + public boolean execute(String sql) { + return execute(sql, new Object[] {}); + } + + public boolean execute(String sql, Object[] params) { + closeResultSet(); + closeStatement(); + this.updateCount = -1; + try { + assertNotNull(this.internalConnection); + assertTrue(!this.internalConnection.isClosed()); + boolean result = false; + if (params != null && params.length > 0) { + if (sql.startsWith("exec ")) { //$NON-NLS-1$ + sql = sql.substring(5); + this.internalStatement = createPrepareCallStatement(sql); + } else { + this.internalStatement = createPrepareStatement(sql); + } + setParameters((PreparedStatement)this.internalStatement, params); + assignExecutionProperties(this.internalStatement); + result = ((PreparedStatement)this.internalStatement).execute(); + } else { + this.internalStatement = createStatement(); + assignExecutionProperties(this.internalStatement); + result = this.internalStatement.execute(sql); + } + if (result) { + this.internalResultSet = this.internalStatement.getResultSet(); + } else { + this.updateCount = this.internalStatement.getUpdateCount(); + } + return result; + } catch (SQLException e) { + this.internalException = e; + if (!exceptionExpected()) { + throw new RuntimeException(e); + } + } + return false; + } + + protected Statement createPrepareCallStatement(String sql) throws SQLException{ + return this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + protected Statement createPrepareStatement(String sql) throws SQLException{ + return this.internalConnection.prepareStatement(sql); + } + + protected Statement createStatement() throws SQLException{ + return this.internalConnection.createStatement(); + } + + private void setParameters(PreparedStatement stmt, Object[] params) throws SQLException{ + for (int i = 0; i < params.length; i++) { + stmt.setObject(i+1, params[i]); + } + } + + public int[] executeBatch(String[] sql) { + return executeBatch(sql, -1); + } + + public int[] executeBatch(String[] sql, int timeout) { + closeResultSet(); + closeStatement(); + + try { + assertNotNull(this.internalConnection); + assertTrue(!this.internalConnection.isClosed()); + + for (int i = 0; i < sql.length; i++) { + if (sql[i].indexOf("?") != -1) { //$NON-NLS-1$ + throw new RuntimeException("no prepared statements allowed in the batch command"); //$NON-NLS-1$ + } + } + + this.internalStatement = createStatement(); + assignExecutionProperties(this.internalStatement); + + if (timeout != -1) { + this.internalStatement.setQueryTimeout(timeout); + } + for (int i = 0; i < sql.length; i++) { + this.internalStatement.addBatch(sql[i]); + } + + return this.internalStatement.executeBatch(); + + } catch (SQLException e) { + this.internalException = e; + if (!exceptionExpected()) { + throw new RuntimeException(e); + } + } + + return null; + + } + + /** + * Override when you need to set an execution property on the statement before execution. + * + * <p>Example: + *<code>if (this.executionProperties.getProperty(ExecutionProperties.PROP_FETCH_SIZE) != null) { + * statement.setExecutionProperty(ExecutionProperties.PROP_FETCH_SIZE, this.executionProperties.getProperty(ExecutionProperties.PROP_FETCH_SIZE)); + * } + *</code> + *</p> + * @param stmt + * + * @since + */ + + + protected void assignExecutionProperties(Statement stmt) { + } + + + public boolean exceptionOccurred() { + return this.internalException != null; + } + + public boolean exceptionExpected() { + return false; + } + + + public SQLException getLastException() { + return this.internalException; + } + + public void assertResultsSetEquals(File expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet, File expected) { + assertNotNull(resultSet); + try { + writeResultSet(expected, new BufferedReader(new ResultSetReader(resultSet, DELIMITER))); + if (resultSet.getType() != ResultSet.TYPE_FORWARD_ONLY) { + resultSet.beforeFirst(); + } + assertReaderEquals(new ResultSetReader(resultSet, DELIMITER), new FileReader(expected)); + } catch (IOException e) { + throw new RuntimeException(e); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + private void writeResultSet(File expected, BufferedReader resultReader) + throws IOException { + if (WRITE_ACTUAL) { + BufferedWriter bw = new BufferedWriter(new FileWriter(expected)); + String s = null; + while ((s = resultReader.readLine()) != null) { + bw.write(s); + bw.write("\n"); //$NON-NLS-1$ + } + bw.close(); + } + } + + public void assertResultsSetEquals(String expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet,String expected) { + assertNotNull(resultSet); + assertReaderEquals(new ResultSetReader(resultSet, DELIMITER), new StringReader(expected)); + } + + public void assertResults(String[] expected) { + assertResultsSetEquals(expected); + } + + public void assertResultsSetEquals(String[] expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet, String[] expected) { + assertNotNull(resultSet); + assertReaderEquals(new ResultSetReader(resultSet, DELIMITER), new StringArrayReader(expected)); + } + + public void assertReaderEquals(Reader expected, Reader reader) { + BufferedReader resultReader = new BufferedReader(expected); + BufferedReader expectedReader = new BufferedReader(reader); + try { + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, File expected) { + assertNotNull(metadata); + try { + writeResultSet(expected, new BufferedReader(new MetadataReader(metadata, DELIMITER))); + assertReaderEquals(new MetadataReader(metadata, DELIMITER), new FileReader(expected)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, String[] expected) { + assertNotNull(metadata); + assertReaderEquals(new MetadataReader(metadata, DELIMITER), new StringArrayReader(expected)); + } + + protected static String read(BufferedReader r, boolean casesensitive) throws IOException { + StringBuffer result = new StringBuffer(); + String s = null; + try { + while ((s = r.readLine()) != null) { + result.append( (casesensitive ? s.trim() : s.trim().toLowerCase()) ); + result.append("\n"); //$NON-NLS-1$ + } + } finally { + r.close(); + } + return result.toString(); + } + + protected void compareResults(BufferedReader resultReader, BufferedReader expectedReader) throws IOException { + assertEquals(read(expectedReader, compareCaseSensitive()) , read(resultReader, compareCaseSensitive())); + } + + protected boolean compareCaseSensitive() { + return true; + } + + public void printResults() { + printResults(this.internalResultSet); + } + + public void printResults(ResultSet results) { + printResults(results, false); + } + + public void printResults(boolean comparePrint) { + assertNotNull(this.internalResultSet); + printResults(this.internalResultSet, comparePrint); + } + + public void walkResults() { + assertNotNull(this.internalResultSet); + + try { + int columnCount = this.internalResultSet.getMetaData().getColumnCount(); + while(this.internalResultSet.next()) { + for (int col = 1; col <= columnCount; col++) { + this.internalResultSet.getObject(col); + } + } + closeResultSet(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + void printResults(ResultSet results, boolean comparePrint) { + if(results == null) { + System.out.println("ResultSet is null"); //$NON-NLS-1$ + return; + } + int row; + try { + row = -1; + BufferedReader in = new BufferedReader(new ResultSetReader(results, DELIMITER)); + String line = in.readLine(); + while(line != null) { + row++; + if (comparePrint) { + line=line.replaceAll("\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$ + System.out.println("\""+line+"\","); //$NON-NLS-1$ //$NON-NLS-2$ + } + else { + System.out.println(line); + } + line = in.readLine(); + } + System.out.println("Fetched "+row+" rows\n"); //$NON-NLS-1$ //$NON-NLS-2$ + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public void assertUpdateCount(int expected) { + assertEquals(expected, updateCount); + } + + public void assertRowCount(int expected) { + int count = getRowCount(); + assertEquals(expected, count); + } + + public int getRowCount() { + assertNotNull(this.internalResultSet); + // Count all + try { + int count = 0; + while(this.internalResultSet.next()) { + count++; + } + return count; + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + public void closeStatement() { + closeResultSet(); + + if (this.internalStatement != null){ + try { + this.internalStatement.close(); + } catch(SQLException e) { + throw new RuntimeException(e); + } finally { + this.internalStatement = null; + } + } + } + + public void closeResultSet() { + this.internalException = null; + + if (this.internalResultSet != null) { + try { + this.internalResultSet.close(); + } catch(SQLException e) { + // ignore + } finally { + this.internalResultSet = null; + } + } + } + + public void closeConnection() { + closeStatement(); + try { + if (this.internalConnection != null) { + try { + this.internalConnection.close(); + } catch(SQLException e) { + throw new RuntimeException(e); + } + } + } finally { + this.internalConnection = null; + } + } + + public void cancelQuery() throws SQLException { + assertNotNull(this.internalConnection); + assertTrue(!this.internalConnection.isClosed()); + assertNotNull(this.internalStatement); + this.internalStatement.cancel(); + } + + public void print(String msg) { + System.out.println(msg); + } + + public void print(Throwable e) { + e.printStackTrace(); + } + + + protected void executeAndAssertResults(String query, String[] expected) { + execute(query); + if (expected != null) { + assertResults(expected); + } + else { + printResults(); + } + } +} \ No newline at end of file Property changes on: trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestCase3473.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestCase3473.java (rev 0) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestCase3473.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.jdbc; + +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; + +import org.junit.Before; +import org.junit.Test; + +import com.metamatrix.core.util.UnitTestUtil; + +/** + */ +public class TestCase3473 { + + private DatabaseMetaData dbmd; + + ////////////////////Query Related Methods/////////////////////////// + + @Before public void setUp() throws Exception { + Connection conn = TestMMDatabaseMetaData.createConnection("jdbc:teiid:test", UnitTestUtil.getTestDataPath() + "/TestCase3473/test.vdb"); //$NON-NLS-1$ //$NON-NLS-2$ + dbmd = conn.getMetaData(); + } + + @Test public void testGetCrossReference() throws Exception { + ResultSet rs = dbmd.getCrossReference(null,"test", "all_databases", null,"test", "all_models");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + ResultSet rs1 = dbmd.getCrossReference(null, "Foo%", "%", null, null, "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ResultSet rs2 = dbmd.getCrossReference("foo", "Foo%", "%", null, null, "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + ResultSet rs3 = dbmd.getCrossReference(null, null, null, null, null, null); + TestMMDatabaseMetaData.compareResultSet(rs, rs1, rs2, rs3); + } + + @Test public void testGetImportedKeys() throws Exception { + ResultSet rs = dbmd.getImportedKeys(null,"test", "all_models"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getImportedKeys(null, "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getImportedKeys("foo", "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TestMMDatabaseMetaData.compareResultSet(rs, rs1, rs2); + } + + @Test public void testGetExportedKeys() throws Exception { + ResultSet rs = dbmd.getExportedKeys(null,"test", "all_models"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getExportedKeys(null, "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getExportedKeys("foo", "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TestMMDatabaseMetaData.compareResultSet(rs, rs1, rs2); + } + + @Test public void testGetPrimaryKeys() throws Exception { + ResultSet rs = dbmd.getPrimaryKeys(null,"test", "all_models"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getPrimaryKeys(null, "Foo%", "test.all_models"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getPrimaryKeys("foo", "Foo%", "test.all_models"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TestMMDatabaseMetaData.compareResultSet(rs, rs1, rs2); + } + + @Test public void testGetTables() throws Exception{ + ResultSet rs = dbmd.getTables(null, null, null, null); + ResultSet rs1 = dbmd.getTables(null, "%foo", null, null); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getTables("foo", "%foo", null, null); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(rs, rs1, rs2); + } +} Added: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java (rev 0) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,997 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.jdbc; + +import static org.junit.Assert.*; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.jboss.deployers.spi.DeploymentException; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.Mockito; +import org.teiid.adminapi.impl.ModelMetaData; +import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.client.DQP; +import org.teiid.client.security.ILogon; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.Schema; +import org.teiid.deployers.VDBRepository; +import org.teiid.dqp.internal.datamgr.impl.ConnectorManager; +import org.teiid.dqp.internal.datamgr.impl.ConnectorManagerRepository; +import org.teiid.dqp.internal.datamgr.impl.FakeTransactionService; +import org.teiid.dqp.internal.process.DQPConfiguration; +import org.teiid.dqp.internal.process.DQPCore; +import org.teiid.jdbc.util.ResultSetUtil; +import org.teiid.metadata.TransformationMetadata; +import org.teiid.metadata.index.VDBMetadataFactory; +import org.teiid.net.TeiidURL; +import org.teiid.services.SessionServiceImpl; +import org.teiid.transport.ClientServiceRegistry; +import org.teiid.transport.ClientServiceRegistryImpl; +import org.teiid.transport.LocalServerConnection; +import org.teiid.transport.LogonImpl; + +import com.metamatrix.common.queue.FakeWorkManager; +import com.metamatrix.common.util.ApplicationInfo; +import com.metamatrix.core.CoreConstants; +import com.metamatrix.core.util.UnitTestUtil; +import com.metamatrix.dqp.service.FakeBufferService; +import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.optimizer.capabilities.BasicSourceCapabilities; +import com.metamatrix.query.optimizer.capabilities.SourceCapabilities; + +/** + */ +@SuppressWarnings("nls") +public class TestMMDatabaseMetaData { + + public static ConnectionImpl createConnection(String embeddedURL, final String vdbPath) throws Exception { + final Properties p = new Properties(); + EmbeddedProfile.parseURL(embeddedURL, p); + return new ConnectionImpl(new LocalServerConnection(p) { + @Override + protected ClientServiceRegistry getClientServiceRegistry() { + ClientServiceRegistryImpl impl = new ClientServiceRegistryImpl(); + SessionServiceImpl sessionService = new SessionServiceImpl(); + LogonImpl logon = new LogonImpl(sessionService, null); + impl.registerClientService(ILogon.class, logon, null); + DQPCore dqp = new DQPCore(); + sessionService.setDqp(dqp); + TransformationMetadata metadata = VDBMetadataFactory.getVDBMetadata(vdbPath); + VDBRepository repo = new VDBRepository(); + VDBMetaData vdbMetaData = new VDBMetaData(); + vdbMetaData.setName(p.getProperty(TeiidURL.JDBC.VDB_NAME)); + vdbMetaData.addAttchment(QueryMetadataInterface.class, metadata); + vdbMetaData.addAttchment(TransformationMetadata.class, metadata); + repo.addMetadata(vdbMetaData, metadata); + for (Schema schema : metadata.getMetadataStore().getSchemas().values()) { + ModelMetaData model = new ModelMetaData(); + model.setName(schema.getName()); + vdbMetaData.addModel(model); + model.addSourceMapping("source", "jndi:source"); + } + ConnectorManagerRepository cmr = Mockito.mock(ConnectorManagerRepository.class); + Mockito.stub(cmr.getConnectorManager("jndi:source")).toReturn(new ConnectorManager("x") { + @Override + public SourceCapabilities getCapabilities() + throws ConnectorException { + return new BasicSourceCapabilities(); + } + }); + try { + repo.addVDB(vdbMetaData); + } catch (DeploymentException e) { + throw new RuntimeException(e); + } + sessionService.setVDBRepository(repo); + dqp.setWorkManager(new FakeWorkManager()); + dqp.setBufferService(new FakeBufferService()); + dqp.setTransactionService(new FakeTransactionService()); + dqp.setConnectorManagerRepository(cmr); + dqp.start(new DQPConfiguration()); + impl.registerClientService(DQP.class, dqp, null); + return impl; + } + }, p, embeddedURL); + } + + private static final boolean REPLACE_EXPECTED = false; + private static final boolean WRITE_ACTUAL_RESULTS_TO_FILE = false; + private static final boolean PRINT_RESULTSETS_TO_CONSOLE = false; + + private static final int MAX_COL_WIDTH = 65; + + public static void compareResultSet(ResultSet... rs) throws IOException, SQLException { + StackTraceElement ste = new Exception().getStackTrace()[1]; + String testName = ste.getMethodName(); + String className = ste.getClassName(); + className = className.substring(className.lastIndexOf('.') + 1); + testName = className + "/" + testName; //$NON-NLS-1$ + compareResultSet(testName, rs); + } + + public static void compareResultSet(String testName, ResultSet... rs) + throws FileNotFoundException, SQLException, IOException { + FileOutputStream actualOut = null; + BufferedReader expectedIn = null; + PrintStream stream = null; + try { + if (REPLACE_EXPECTED) { + File actual = new File(UnitTestUtil.getTestDataPath() + "/" +testName+".expected"); //$NON-NLS-1$ //$NON-NLS-2$ + actualOut = new FileOutputStream(actual); + } else { + if (WRITE_ACTUAL_RESULTS_TO_FILE) { + File actual = new File(UnitTestUtil.getTestDataPath() + "/" +testName+".actual"); //$NON-NLS-1$ //$NON-NLS-2$ + actualOut = new FileOutputStream(actual); + } + File expected = new File(UnitTestUtil.getTestDataPath() + "/"+testName+".expected"); //$NON-NLS-1$ //$NON-NLS-2$ + expectedIn = new BufferedReader(new FileReader(expected)); + } + PrintStream defaultStream = null; + if (PRINT_RESULTSETS_TO_CONSOLE) { + defaultStream = new PrintStream(System.out) { + // SYS.out should be protected from being closed. + public void close() {} + }; + } + stream = ResultSetUtil.getPrintStream(actualOut, expectedIn, defaultStream); + for (int i = 0; i < rs.length; i++) { + ResultSetUtil.printResultSet(rs[i], MAX_COL_WIDTH, true, stream); + } + assertEquals("Actual data did not match expected", //$NON-NLS-1$ + Collections.EMPTY_LIST, + ResultSetUtil.getUnequalLines(stream)); + } finally { + if (stream != null) { + stream.close(); + } + if (actualOut != null) { + actualOut.close(); + } + if (expectedIn != null) { + expectedIn.close(); + } + } + } + + static Connection conn = null; + + DatabaseMetaData dbmd; + private Map expectedMap = new HashMap(); + + // constant + private static final int NO_LIMIT = 0; + + //============================================================================== + // The following 2 constants are defined here to provide access to constants + // defined in the JDBC 3.0 implementation that comes with the 1.4 JRE. + // They are defined this way to allow this class to compile with the 1.3 JRE. + //============================================================================== + private static final int ResultSet_HOLD_CURSORS_OVER_COMMIT = 1; // ResultSet.HOLD_CURSORS_OVER_COMMIT == 1 + private static final int ResultSet_CLOSE_CURSORS_AT_COMMIT = 2; // ResultSet.CLOSE_CURSORS_AT_COMMIT == 2 + + @Before + public void setUp() throws Exception { + dbmd = new DatabaseMetaDataImpl((ConnectionImpl) conn); + } + + @AfterClass + public static void oneTimeTearDown() throws Exception { + if (conn != null) { + conn.close(); + } + } + + @BeforeClass + public static void oneTimeSetUp() throws Exception { + conn = createConnection("jdbc:teiid:QT_Ora9DS", UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** Test all the non-query methods */ + @Test + public void testMethodsWithoutParams() throws Exception { + Class dbmdClass = dbmd.getClass(); + // non-query Methods return String, boolean or int + Method[] methods = dbmdClass.getDeclaredMethods(); + + expectedMap = getExpected(); + //SYS.out.println(" -- total method == " + methods.length + ", non-query == " + expectedMap.size()); + for (int i = 0; i < methods.length; i++) { + if (expectedMap.containsKey(methods[i].getName())) { + + Object actualValue = null; + Object expectedValue = null; + Object expectedReturn = expectedMap.get(methods[i].getName()); + Object[] params = null; + + if (expectedReturn instanceof List) { + // has input parameters + List returned = (List) expectedReturn; + params = (Object[]) returned.get(1); + //SYS.out.println(" params == " + params[0]); + expectedValue = returned.get(0); + actualValue = methods[i].invoke(dbmd, params); + } else { + // without params + expectedValue = expectedReturn; + actualValue = methods[i].invoke(dbmd, new Object[0]); + } + + assertEquals(" Expected doesn't match with actual for method - " + //$NON-NLS-1$ + methods[i].getName(), expectedValue, actualValue); + //SYS.out.println("method [" + methods[i].getName() + " ] 's expectedValue == " + expectedValue + " actual == " + actualValue); + } + } + } + + /** Test all the methods that throw exception */ + @Test + public void testMethodsWithExceptions() throws Exception { + Class dbmdClass = dbmd.getClass(); + Method[] methods = dbmdClass.getDeclaredMethods(); + + expectedMap = new HashMap(); //none expected + //SYS.out.println(" -- total method == " + methods.length + ", non-query == " + expectedMap.size()); + for (int i =0; i< methods.length; i++) { + if (expectedMap.containsKey(methods[i].getName())) { + methods[i].invoke(dbmd, new Object[0]); + } + } + } + + /** test supportResultSetConcurrency() with params and test them with different input values */ + @Test + public void testSupportResultSetConcurrency() throws Exception { + boolean returned = true; + String functionName = "supportResultSetConcurrency"; //$NON-NLS-1$ + + // should return true; + Object[] params = + new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY), new Integer(ResultSet.CONCUR_READ_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = + new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE), new Integer(ResultSet.CONCUR_READ_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = + new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE), new Integer(ResultSet.CONCUR_UPDATABLE)}; + returned = false; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY), new Integer(ResultSet.CONCUR_UPDATABLE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test supportResultSetHoldability() with params and test them with different input values */ + @Test + public void testSupportResultSetHoldability() throws Exception { + boolean returned = false; + String functionName = "supportResultSetHoldability"; //$NON-NLS-1$ + + // should return false; + Object[] params = new Object[] { new Integer(ResultSet_HOLD_CURSORS_OVER_COMMIT)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return false; + params = new Object[] { new Integer(ResultSet_CLOSE_CURSORS_AT_COMMIT)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test supportResultSetType() with params and test them with different input values */ + @Test + public void testSupportResultSetType() throws Exception { + boolean returned = true; + String functionName = "supportResultSetType"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + returned = false; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test supportsTransactionIsolationLevel() with params and test them with different input values */ + @Test + public void testSupportsTransactionIsolationLevel() throws Exception { + boolean returned = false; + String functionName = "supportsTransactionIsolationLevel"; //$NON-NLS-1$ + + // should return true; + //TODO: what is transaction isolation level? + Object[] params = new Object[] { new Integer(1)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test deletesAreDetected() with params and test them with different input values */ + @Test + public void testDeletesAreDetected() throws Exception { + boolean returned = false; + String functionName = "deletesAreDetected"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test insertsAreDetected() with params and test them with different input values */ + @Test + public void testInsertsAreDetected() throws Exception { + boolean returned = false; + String functionName = "insertsAreDetected"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test updatesAreDetected() with params and test them with different input values */ + @Test + public void testUpdatesAreDetected() throws Exception { + boolean returned = false; + String functionName = "updatesAreDetected"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test ownUpdatesAreVisible() with params and test them with different input values */ + @Test + public void testOwnUpdatesAreVisible() throws Exception { + boolean returned = false; + String functionName = "ownUpdatesAreVisible"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test ownInsertsAreVisible() with params and test them with different input values */ + @Test + public void testOwnInsertsAreVisible() throws Exception { + boolean returned = false; + String functionName = "ownInsertsAreVisible"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test othersUpdatesAreVisible() with params and test them with different input values */ + @Test + public void testOthersUpdatesAreVisible() throws Exception { + boolean returned = false; + String functionName = "othersUpdatesAreVisible"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test othersInsertsAreVisible() with params and test them with different input values */ + @Test + public void testOthersInsertsAreVisible() throws Exception { + boolean returned = false; + String functionName = "othersInsertsAreVisible"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test othersInsertsAreVisible() with params and test them with different input values */ + @Test + public void testOthersDeletesAreVisible() throws Exception { + boolean returned = false; + String functionName = "othersDeletesAreVisible"; //$NON-NLS-1$ + + // should return true; + Object[] params = new Object[] { new Integer(ResultSet.TYPE_FORWARD_ONLY)}; + helpTestMethodsWithParams(functionName, returned, params); + + // shoud return true; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_INSENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + + // should return false; + params = new Object[] { new Integer(ResultSet.TYPE_SCROLL_SENSITIVE)}; + helpTestMethodsWithParams(functionName, returned, params); + } + + /** test overloaded method supportsConvert() with params and test them with different input values */ + @Test + public void testSupportsConvert1() throws Exception { + assertEquals("Expected doesn't match with actual for method - supportsConvert()", //$NON-NLS-1$ + true, dbmd.supportsConvert()); + } + + /** test overloaded method supportsConvert() without params */ + @Test + public void testSupportsConvert2() throws Exception { + // should succeed + helpTestSupportsConverts(Types.CHAR, Types.CHAR, true); + helpTestSupportsConverts(Types.CHAR, Types.VARCHAR, true); + helpTestSupportsConverts(Types.CHAR, Types.LONGVARCHAR, true); + helpTestSupportsConverts(Types.CHAR, Types.BIT, true); + helpTestSupportsConverts(Types.CHAR, Types.SMALLINT, true); + helpTestSupportsConverts(Types.CHAR, Types.TINYINT, true); + helpTestSupportsConverts(Types.CHAR, Types.INTEGER, true); + helpTestSupportsConverts(Types.CHAR, Types.BIGINT, true); + helpTestSupportsConverts(Types.CHAR, Types.FLOAT, true); + helpTestSupportsConverts(Types.CHAR, Types.REAL, true); + helpTestSupportsConverts(Types.CHAR, Types.DOUBLE, true); + helpTestSupportsConverts(Types.CHAR, Types.NUMERIC, true); + helpTestSupportsConverts(Types.CHAR, Types.DECIMAL, true); + helpTestSupportsConverts(Types.CHAR, Types.DATE, true); + helpTestSupportsConverts(Types.CHAR, Types.TIME, true); + helpTestSupportsConverts(Types.CHAR, Types.TIMESTAMP, true); + + // should fail + helpTestSupportsConverts(Types.DATE, Types.INTEGER, false); + + // TODO: there are other combination tests + helpTestSupportsConverts(Types.CHAR, Types.BIGINT, true); + helpTestSupportsConverts(Types.CHAR, Types.FLOAT, true); + helpTestSupportsConverts(Types.CHAR, Types.REAL, true); + } + + ////////////////////Query Related Methods/////////////////////////// + + @Test + public void testUcaseMatchReturnsRows() throws Exception { + ResultSet rs = null; + try { + java.sql.Statement stmt = conn.createStatement(); + + // Returns 0 rows (but should be identical and return 24 rows): + rs = stmt.executeQuery("SELECT Name FROM SYS.Tables WHERE UCASE(SchemaName) = 'SYS'"); //$NON-NLS-1$ + + int count = 0; + while(rs.next()) { + count++; + } + assertEquals(11, count); + } finally { + if(rs != null) { + rs.close(); + } + } + } + + @Test + public void testGetColumnsSingleMatch() throws Exception { + ResultSet rs = dbmd.getColumns(null, "System", "VirtualDatabases", "Name"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs); + } + + @Test + public void testGetCatalogs() throws Exception { + compareResultSet(dbmd.getCatalogs()); + } + + @Test + public void testGetCrossReference() throws Exception { + ResultSet rs = dbmd.getCrossReference(null, "BQT1", "SmallA", null, "BQT1", "SmallB");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + ResultSet rs1 = dbmd.getCrossReference(null, "Foo%", "%", null, null, "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ResultSet rs2 = dbmd.getCrossReference("foo", "Foo%", "%", null, null, "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + compareResultSet(rs, rs1, rs2); + } + + @Test public void testGetImportedKeys() throws Exception { + ResultSet rs = dbmd.getImportedKeys(null, "BQT1", "SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getImportedKeys(null, "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getImportedKeys("foo", "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetExportedKeys() throws Exception { + ResultSet rs = dbmd.getExportedKeys(null, "BQT1", "SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getExportedKeys(null, "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getExportedKeys("foo", "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetIndexInfo() throws Exception { + ResultSet rs = dbmd.getIndexInfo(null, "System", "KeyColumns", true, true); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getIndexInfo(null, "Foo%", "%", true, false); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getIndexInfo("foo", "Foo%", "%", true, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetPrimaryKeys() throws Exception { + ResultSet rs = dbmd.getPrimaryKeys(null, "BQT1", "SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getPrimaryKeys(null, "Foo%", "BQT1.SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getPrimaryKeys("foo", "Foo%", "BQT1.SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetProcedureColumns() throws Exception { + ResultSet rs = dbmd.getProcedureColumns(null, null, null, null); + ResultSet rs1 = dbmd.getProcedureColumns(null, "Foo%", null, null); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getProcedureColumns("foo", "Foo%", null, null); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetProcedures() throws Exception { + ResultSet rs = dbmd.getProcedures(null, null, null); + ResultSet rs1 = dbmd.getProcedures(null, "Foo%", null); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getProcedures("foo", "Foo%", null); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetSchemas() throws Exception { + compareResultSet(dbmd.getSchemas()); + } + + @Test + public void testGetColumns() throws Exception { + ResultSet rs = dbmd.getColumns(null, null, null, null); + compareResultSet(rs); + } + + @Test + public void testGetColumns2() throws Exception { + ResultSet rs = dbmd.getColumns(null, "QT_Ora%", "%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs); + } + + @Test + public void testGetColumns3() throws Exception { + ResultSet rs = dbmd.getColumns(null, "Foo%", "%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs); + } + + @Test + public void testGetColumns4() throws Exception { + ResultSet rs = dbmd.getColumns("foo", "Foo%", "%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + compareResultSet(rs); + } + + + @Test + public void testGetColumnPrivileges() throws Exception { + ResultSet rs = dbmd.getColumnPrivileges(null, "Parts", "%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ResultSet rs1 = dbmd.getColumnPrivileges(null, "%foo", null, null); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getColumnPrivileges("foo", "%foo", null, null); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetColumnPrivilegesResultSetMetaData() throws Exception { + ResultSet rs = dbmd.getColumnPrivileges(null, "Parts", "%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs); + } + + @Test + public void testGetTablePrivileges() throws Exception { + ResultSet rs = dbmd.getTablePrivileges(null, "Parts", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs); + } + + @Test + public void testGetTablePrivilegesResultSetMetaData() throws Exception { + ResultSet rs = dbmd.getTablePrivileges(null, "Parts", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs); + } + + @Test + public void testGetTables_specificTable() throws Exception { + ResultSet rs = dbmd.getTables(null, "SYSTEM", "VIRTUALDATABASES", null); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs); + } + + @Test + public void testGetTables_specificTableTypes() throws Exception { + String[] tables = new String[] { "Table" }; //$NON-NLS-1$ + ResultSet rs = dbmd.getTables(null, null, null, tables); + compareResultSet(rs); + } + + @Test + public void testGetTables_specificTableMultipleTypes() throws Exception { + String[] tables = new String[] { "Table", "View" }; //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs = dbmd.getTables(null, null, null, tables); + compareResultSet(rs); + } + + @Test + public void testGetTables() throws Exception{ + ResultSet rs = dbmd.getTables(null, null, null, null); + ResultSet rs1 = dbmd.getTables(null, "%foo", null, null); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getTables("foo", "%foo", null, null); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetTables_allTables() throws Exception { + ResultSet rs = dbmd.getTables(null, null, null, null); + compareResultSet(rs); + } + + @Test + public void testGetTableTypes() throws Exception { + ResultSet rs = dbmd.getTableTypes(); + compareResultSet(rs); + } + + @Test + public void testGetTypeInfo_TotalNumber() throws Exception { + ResultSet rs = dbmd.getTypeInfo(); + compareResultSet(rs); + } + + @Test + public void testGetUDTs() throws Exception{ + ResultSet rs = dbmd.getUDTs(null, null, "%blob%", null); //$NON-NLS-1$ + ResultSet rs1 = dbmd.getUDTs(null, "%foo", "%blob%", null); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getUDTs("foo", "%foo", "%blob%", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetUDTs_specificTypeName() throws Exception { + ResultSet rs = dbmd.getUDTs(null, null, "%blob%", null); //$NON-NLS-1$ + compareResultSet(rs); + } + + @Test + public void testGetVersionColumns() throws Exception { + ResultSet rs = dbmd.getVersionColumns(null, null, null); + ResultSet rs1 = dbmd.getVersionColumns(null, "Foo%", null); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getVersionColumns("foo", "Foo%", null); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetBestRowIdentifier() throws Exception { + ResultSet rs = dbmd.getBestRowIdentifier(null, null, "SYS.VIRTUALDATABASES", //$NON-NLS-1$ + DatabaseMetaData.bestRowTemporary, true); + ResultSet rs1 = dbmd.getBestRowIdentifier(null, "%foo", null, 1,true); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getBestRowIdentifier("foo", "%foo", null, 1,true); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetSuperTables() throws Exception { + ResultSet rs = dbmd.getSuperTables(null, "Parts", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs); + } + + @Test + public void testGetSuperTypes() throws Exception { + ResultSet rs = dbmd.getSuperTypes(null, "Parts", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs); + } + + @Test + public void testGetColumnsWithEscape() throws Exception { + ResultSet columns = dbmd.getColumns("QT\\_Ora9DS", "BQT1", "SmallA", "IntKey"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + columns.next(); + assertEquals("BQT1", columns.getString(2));//$NON-NLS-1$ + assertFalse(columns.next()); + } + + @Test + public void testGetCrossReferenceWithEscape() throws Exception { + ResultSet rs = dbmd.getCrossReference(null, "QT\\_Ora9DS", "BQT1.SmallA", null, null, "BQT1.SmallB");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ResultSet rs1 = dbmd.getCrossReference(null, "Foo%", "%", null, null, "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ResultSet rs2 = dbmd.getCrossReference("foo", "Foo%", "%", null, null, "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetExportedKeysWithEscape() throws Exception { + ResultSet rs = dbmd.getExportedKeys(null, "QT\\_Ora9DS", "BQT1.SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getExportedKeys(null, "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getExportedKeys("foo", "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetImportedKeysWithEscape() throws Exception { + ResultSet rs = dbmd.getImportedKeys(null, "QT\\_Ora9DS", "BQT1.SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getImportedKeys(null, "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getImportedKeys("foo", "Foo%", "%"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetIndexInfoWithEscape() throws Exception { + ResultSet rs = dbmd.getIndexInfo(null, "QT\\_Ora9DS", "SYS.KeyElements", true, true); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs1 = dbmd.getIndexInfo(null, "Foo%", "%", true, false); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getIndexInfo("foo", "Foo%", "%", true, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetPrimaryKeysWithEscape() throws Exception { + ResultSet rs = dbmd.getPrimaryKeys("QT\\_Ora9DS", "BQT1", "SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ResultSet rs1 = dbmd.getPrimaryKeys(null, "Foo%", "BQT1.SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ + ResultSet rs2 = dbmd.getPrimaryKeys("foo", "Foo%", "BQT1.SmallA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + compareResultSet(rs, rs1, rs2); + } + + @Test + public void testGetProceduresWithEscape() throws Exception { + ResultSet rs = dbmd.getProcedures("QT\\_Ora9DS", null, null); //$NON-NLS-1$ + ResultSet rs1 = dbmd.getProcedures(null, "Foo%", null); //$NON-NLS-1$ + ResultSet rs2 = dbmd.getProcedures("foo", "Foo%", null); //$NON-NLS-1$ //$NON-NLS-2$ + compareResultSet(rs, rs1, rs2); + } + ///////////////////////////Helper Method////////////////////////////// + + private void helpTestSupportsConverts(int from, int to, boolean result) throws Exception { + assertEquals("Expected doesn't match with actual for method - supportsConvert()", //$NON-NLS-1$ + result, dbmd.supportsConvert(from, to)); + } + + private void helpTestMethodsWithParams(String methodName, boolean returned, Object[] params) throws Exception { + Class dbmdClass = dbmd.getClass(); + Method[] methods = dbmdClass.getDeclaredMethods(); + + for (int i = 0; i < methods.length; i++) { + if (methods[i].getName().equalsIgnoreCase(methodName)) { + Object actual = methods[i].invoke(dbmd, params); + assertEquals("Expected doesn't match with actual for method - " + methodName, //$NON-NLS-1$ + new Boolean(returned), actual); + } + } + } + + //////////////////////Expected Result////////////////// + + private Map getExpected() { + Map<String, Object> expected = new HashMap<String, Object>(); + // return type -- boolean + expected.put("allProceduresAreCallable", Boolean.TRUE); //$NON-NLS-1$ + expected.put("allTablesAreSelectable", Boolean.TRUE); //$NON-NLS-1$ + expected.put("doesMaxRowSizeIncludeBlobs", Boolean.FALSE); //$NON-NLS-1$ + expected.put("isCatalogAtStart", Boolean.FALSE); //$NON-NLS-1$ + expected.put("isReadOnly", Boolean.FALSE); //$NON-NLS-1$ + expected.put("locatorsUpdateCopy", Boolean.FALSE); //$NON-NLS-1$ + expected.put("nullPlusNonNullIsNull", Boolean.TRUE); //$NON-NLS-1$ + expected.put("nullsAreSortedAtEnd", Boolean.FALSE); //$NON-NLS-1$ + expected.put("nullsAreSortedAtStart", Boolean.FALSE); //$NON-NLS-1$ + expected.put("nullsAreSortedHigh", Boolean.FALSE); //$NON-NLS-1$ + expected.put("nullsAreSortedLow", Boolean.TRUE); //$NON-NLS-1$ + expected.put("storesLowerCaseIdentifiers", Boolean.FALSE); //$NON-NLS-1$ + expected.put("storesLowerCaseQuotedIdentifiers", Boolean.FALSE); //$NON-NLS-1$ + expected.put("storesMixedCaseIdentifiers", Boolean.TRUE); //$NON-NLS-1$ + expected.put("storesMixedCaseQuotedIdentifiers", Boolean.TRUE); //$NON-NLS-1$ + expected.put("storesUpperCaseIdentifiers", Boolean.FALSE); //$NON-NLS-1$ + expected.put("storesUpperCaseQuotedIdentifiers", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsAlterTableWithAddColumn", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsAlterTableWithDropColumn", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsANSI92EntryLevelSQL", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsANSI92FullSQL", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsANSI92IntermediateSQL", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsBatchUpdates", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsCatalogsInDataManipulation", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsCatalogsInIndexDefinitions", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsCatalogsInPrivilegeDefinitions", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsCatalogsInProcedureCalls", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsCatalogsInTableDefinitions", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsColumnAliasing", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsCorrelatedSubqueries", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsCoreSQLGrammar", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsDataDefinitionAndDataManipulationTransactions", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsDataManipulationTransactionsOnly", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsDifferentTableCorrelationNames", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsExpressionsInOrderBy", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsExtendedSQLGrammar", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsFullOuterJoins", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsGetGeneratedKeys", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsGroupBy", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsGroupByBeyondSelect", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsGroupByUnrelated", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsIntegrityEnhancementFacility", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsLikeEscapeClause", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsLimitedOuterJoins", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsMinimumSQLGrammar", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsMixedCaseIdentifiers", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsMixedCaseQuotedIdentifiers", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsOpenCursorsAcrossCommit", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsMultipleResultSets", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsMultipleOpenResults", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsMultipleTransactions", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsNamedParameters", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsNonNullableColumns", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsOpenCursorsAcrossRollback", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsOpenStatementsAcrossCommit", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsOpenStatementsAcrossRollback", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsOrderByUnrelated", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsOuterJoins", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsPositionedDelete", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsPositionedUpdate", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsSavepoints", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsSchemasInDataManipulation", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsSchemasInIndexDefinitions", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsSchemasInPrivilegeDefinitions", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsSchemasInProcedureCalls", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsSchemasInTableDefinitions", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsSelectForUpdate", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsStatementPooling", Boolean.FALSE); //$NON-NLS-1$ + expected.put("supportsStoredProcedures", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsSubqueriesInComparisons", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsSubqueriesInExists", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsSubqueriesInIns", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsSubqueriesInQuantifieds", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsTableCorrelationNames", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsTransactions", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsUnion", Boolean.TRUE); //$NON-NLS-1$ + expected.put("supportsUnionAll", Boolean.TRUE); //$NON-NLS-1$ + expected.put("usesLocalFilePerTable", Boolean.FALSE); //$NON-NLS-1$ + expected.put("usesLocalFiles", Boolean.FALSE); //$NON-NLS-1$ + expected.put("usesLocalFilePerTable", Boolean.FALSE); //$NON-NLS-1$ + + // return type -- int + expected.put("getDatabaseMinorVersion", new Integer(ApplicationInfo.getInstance().getMinorReleaseVersion())); //$NON-NLS-1$ + expected.put("getDatabaseMajorVersion", new Integer(ApplicationInfo.getInstance().getMajorReleaseVersion())); //$NON-NLS-1$ + expected.put("getJDBCMajorVersion", new Integer(3)); //$NON-NLS-1$ + expected.put("getJDBCMinorVersion", new Integer(0)); //$NON-NLS-1$ + expected.put("getDefaultTransactionIsolation", Connection.TRANSACTION_READ_COMMITTED); //$NON-NLS-1$ + expected.put("getDriverMajorVersion", new Integer(ApplicationInfo.getInstance().getMajorReleaseVersion())); //$NON-NLS-1$ + expected.put("getDriverMinorVersion", new Integer(ApplicationInfo.getInstance().getMinorReleaseVersion())); //$NON-NLS-1$ + expected.put("getMaxBinaryLiteralLength", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxCatalogNameLength", 255); //$NON-NLS-1$ + expected.put("getMaxCharLiteralLength", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxColumnNameLength", new Integer(255)); //$NON-NLS-1$ + expected.put("getMaxColumnsInGroupBy", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxColumnsInIndex", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxColumnsInOrderBy", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxColumnsInSelect", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxColumnsInTable", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxConnections", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxCursorNameLength", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxIndexLength", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxProcedureNameLength", new Integer(255)); //$NON-NLS-1$ + expected.put("getMaxRowSize", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxSchemaNameLength", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxStatementLength", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxStatements", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxTableNameLength", new Integer(255)); //$NON-NLS-1$ + expected.put("getMaxTablesInSelect", new Integer(NO_LIMIT)); //$NON-NLS-1$ + expected.put("getMaxUserNameLength", new Integer(255)); //$NON-NLS-1$ + //TODO: change expected value; + expected.put("getSQLStateType", new Integer(2)); //$NON-NLS-1$ + + // return type -- String + expected.put("getCatalogSeparator", ""); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getCatalogTerm", "VirtualDatabase"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getDatabaseProductName", "Teiid Embedded"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getDatabaseProductVersion", "7.0"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getDriverName", "Teiid JDBC Driver"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getDriverVersion", ApplicationInfo.getInstance().getMajorReleaseVersion()+"."+ApplicationInfo.getInstance().getMinorReleaseVersion()); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getExtraNameCharacters", ".@"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getIdentifierQuoteString", "\""); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getNumericFunctions", DatabaseMetaDataImpl.NUMERIC_FUNCTIONS); //$NON-NLS-1$ + expected.put("getProcedureTerm", "StoredProcedure"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getSchemaTerm", "Schema"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getSearchStringEscape", "\\"); //$NON-NLS-1$ //$NON-NLS-2$ + expected.put("getSQLKeywords", DatabaseMetaDataImpl.KEY_WORDS); //$NON-NLS-1$ + expected.put("getStringFunctions", DatabaseMetaDataImpl.STRING_FUNCTIONS); //$NON-NLS-1$ + expected.put("getSystemFunctions", DatabaseMetaDataImpl.SYSTEM_FUNCTIONS); //$NON-NLS-1$ + expected.put("getTimeDateFunctions", DatabaseMetaDataImpl.DATE_FUNCTIONS); //$NON-NLS-1$ + //expected.put("getUrl", primaryUrl + serverUrl); //$NON-NLS-1$ + expected.put("getUserName", CoreConstants.DEFAULT_ANON_USERNAME); //$NON-NLS-1$ + + // return type - Object + expected.put("getConnection", conn); //$NON-NLS-1$ + + return expected; + } + +} Copied: trunk/test-integration/common/src/test/java/org/teiid/systemmodel (from rev 1988, trunk/test-integration/db/src/test/java/org/teiid/systemmodel) Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestPartsDatabaseMetadata.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/systemmodel/TestPartsDatabaseMetadata.java 2010-03-22 21:50:36 UTC (rev 1988) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestPartsDatabaseMetadata.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -22,99 +22,86 @@ package org.teiid.systemmodel; -import java.io.File; import java.sql.Connection; import java.sql.DatabaseMetaData; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; import java.sql.SQLException; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.teiid.jdbc.api.AbstractMMQueryTestCase; +import org.teiid.jdbc.TestMMDatabaseMetaData; import com.metamatrix.core.util.UnitTestUtil; /** * Test the DatabaseMetadata results using the Parts VDB. */ -public class TestPartsDatabaseMetadata extends AbstractMMQueryTestCase { +@SuppressWarnings("nls") +public class TestPartsDatabaseMetadata { - private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/partssupplier/dqp.properties;user=test"; //$NON-NLS-1$ - private static final String VDB = "PartsSupplier"; //$NON-NLS-1$ - static DatabaseMetaData dbMetadata; static Connection connection; - public TestPartsDatabaseMetadata() { - // this is needed because the result files are generated - // with another tool which uses tab as delimiter - super.DELIMITER = "\t"; //$NON-NLS-1$ - } + static final String VDB = "PartsSupplier"; - @Before public void setUp() throws SQLException { - getConnection(VDB, DQP_PROP_FILE); - dbMetadata = this.internalConnection.getMetaData(); + @Before public void setUp() throws Exception { + connection = TestMMDatabaseMetaData.createConnection("jdbc:teiid:" + VDB, UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb"); + dbMetadata = connection.getMetaData(); } - @After public void tearDown() { - closeConnection(); + @After public void tearDown() throws SQLException { + connection.close(); } @Test public void testExportedKeys() throws Exception { - checkResult("testExportedKeys", dbMetadata.getExportedKeys(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getExportedKeys(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ } - private void checkResult(String string, ResultSet exportedKeys) throws Exception { - checkResult(string, exportedKeys, "partssupplier"); //$NON-NLS-1$ - } - @Test public void testImportedKeys() throws Exception { - checkResult("testImportedKeys", dbMetadata.getImportedKeys(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getImportedKeys(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testPrimaryKeys() throws Exception { - checkResult("testPrimaryKeys", dbMetadata.getPrimaryKeys(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getPrimaryKeys(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testProcedures() throws Exception { - checkResult("testProcedures", dbMetadata.getProcedures(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getProcedures(VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testProcedureColumns() throws Exception { - checkResult("testProcedureColumns", dbMetadata.getProcedureColumns(VDB, null, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getProcedureColumns(VDB, null, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @Test public void testUDTs() throws Exception { - checkResult("testUDTs", dbMetadata.getUDTs(VDB, null, "%", null)); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getUDTs(VDB, null, "%", null)); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testIndexInfo() throws Exception { - checkResult("testIndexInfo", dbMetadata.getIndexInfo(VDB, null, "%", true, true)); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getIndexInfo(VDB, null, "%", true, true)); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testCrossReference() throws Exception { - checkResult("testCrossReference", dbMetadata.getCrossReference(VDB, null, "%", VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getCrossReference(VDB, null, "%", VDB, null, "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @Test public void testTypeInfo() throws Exception { - checkResult("testTypeInfo",dbMetadata.getTypeInfo()); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getTypeInfo()); //$NON-NLS-1$ } @Test public void testCatalogs() throws Exception { - checkResult("testCatalogs", dbMetadata.getCatalogs()); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getCatalogs()); //$NON-NLS-1$ } @Test public void testSchemas() throws Exception { - checkResult("testSchemas", dbMetadata.getSchemas()); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getSchemas()); //$NON-NLS-1$ } @Test public void testTables() throws Exception { - checkResult("testTables", dbMetadata.getTables(VDB, null, "%", null)); //$NON-NLS-1$ //$NON-NLS-2$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getTables(VDB, null, "%", null)); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testColumns() throws Exception { - checkResult("testColumns", dbMetadata.getColumns(VDB, null, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TestMMDatabaseMetaData.compareResultSet(dbMetadata.getColumns(VDB, null, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestResultSetMetadata.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/systemmodel/TestResultSetMetadata.java 2010-03-22 21:50:36 UTC (rev 1988) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestResultSetMetadata.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -22,29 +22,32 @@ package org.teiid.systemmodel; +import java.sql.SQLException; + import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.teiid.jdbc.api.AbstractMMQueryTestCase; +import org.teiid.jdbc.AbstractMMQueryTestCase; +import org.teiid.jdbc.TestMMDatabaseMetaData; import com.metamatrix.core.util.UnitTestUtil; +@SuppressWarnings("nls") public class TestResultSetMetadata extends AbstractMMQueryTestCase { - private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/partssupplier/dqp.properties;user=test"; //$NON-NLS-1$ private static final String VDB = "PartsSupplier"; //$NON-NLS-1$ - public TestResultSetMetadata() { - // this is needed because the result files are generated - // with another tool which uses tab as delimiter - super.DELIMITER = "\t"; //$NON-NLS-1$ - } + public TestResultSetMetadata() { + // this is needed because the result files are generated + // with another tool which uses tab as delimiter + super.DELIMITER = "\t"; //$NON-NLS-1$ + } - @Before public void setUp() { - getConnection(VDB, DQP_PROP_FILE); + @Before public void setUp() throws Exception { + this.internalConnection = TestMMDatabaseMetaData.createConnection("jdbc:teiid:" + VDB, UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb"); } - @After public void tearDown() { + @After public void tearDown() throws SQLException { closeConnection(); } @@ -65,7 +68,7 @@ "ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName", //$NON-NLS-1$ "count 4 integer java.lang.Integer 1 null null PartsSupplier" //$NON-NLS-1$ }; - executeTest("select count(*) from parts", expected); //$NON-NLS-1$ + executeTest("select count(*) from parts where 1=0", expected); //$NON-NLS-1$ } @Test public void testStar() throws Exception { @@ -76,7 +79,7 @@ "PART_COLOR 12 string java.lang.String 1 PARTSSUPPLIER.PARTS PartsSupplier PartsSupplier", //$NON-NLS-1$ "PART_WEIGHT 12 string java.lang.String 1 PARTSSUPPLIER.PARTS PartsSupplier PartsSupplier" //$NON-NLS-1$ }; - executeTest("select * from parts", expected); //$NON-NLS-1$ + executeTest("select * from parts where 1=0", expected); //$NON-NLS-1$ } @Test public void testTempGroupStar() throws Exception { @@ -87,7 +90,7 @@ "PART_COLOR 12 string java.lang.String 1 FOO null PartsSupplier", //$NON-NLS-1$ "PART_WEIGHT 12 string java.lang.String 1 FOO null PartsSupplier" //$NON-NLS-1$ }; - executeTest("select * from (select * from parts) foo", expected); //$NON-NLS-1$ + executeTest("select * from (select * from parts) foo where 1=0", expected); //$NON-NLS-1$ } @Test public void testCountAndElement() throws Exception { @@ -96,7 +99,7 @@ "count 4 integer java.lang.Integer 1 null null PartsSupplier", //$NON-NLS-1$ "part_name 12 string java.lang.String 1 PARTSSUPPLIER.PARTS PartsSupplier PartsSupplier" //$NON-NLS-1$ }; - executeTest("select count(*), part_name from parts group by part_name", expected); //$NON-NLS-1$ + executeTest("select count(*), part_name from parts where 1=0 group by part_name", expected); //$NON-NLS-1$ } @Test public void testStar_PreparedStatement() throws Exception { @@ -107,7 +110,7 @@ "PART_COLOR 12 string java.lang.String 1 PARTSSUPPLIER.PARTS PartsSupplier PartsSupplier", //$NON-NLS-1$ "PART_WEIGHT 12 string java.lang.String 1 PARTSSUPPLIER.PARTS PartsSupplier PartsSupplier" //$NON-NLS-1$ }; - executePreparedTest("select * from parts", expected); //$NON-NLS-1$ + executePreparedTest("select * from parts where 1=0", expected); //$NON-NLS-1$ } @Test public void testCount_PreparedStatement() throws Exception { @@ -115,7 +118,7 @@ "ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName", //$NON-NLS-1$ "count 4 integer java.lang.Integer 1 null null PartsSupplier" //$NON-NLS-1$ }; - executePreparedTest("select count(*) from parts", expected); //$NON-NLS-1$ + executePreparedTest("select count(*) from parts where 1=0", expected); //$NON-NLS-1$ } @Test public void testCountAndElement_PreparedStatement() throws Exception { @@ -124,6 +127,6 @@ "count 4 integer java.lang.Integer 1 null null PartsSupplier", //$NON-NLS-1$ "part_name 12 string java.lang.String 1 PARTSSUPPLIER.PARTS PartsSupplier PartsSupplier" //$NON-NLS-1$ }; - executePreparedTest("select count(*), part_name from parts group by part_name", expected); //$NON-NLS-1$ + executePreparedTest("select count(*), part_name from parts where 1=0 group by part_name", expected); //$NON-NLS-1$ } } Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2010-03-22 21:50:36 UTC (rev 1988) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -25,15 +25,16 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.teiid.jdbc.api.AbstractMMQueryTestCase; +import org.teiid.jdbc.AbstractMMQueryTestCase; +import org.teiid.jdbc.TestMMDatabaseMetaData; import com.metamatrix.core.util.UnitTestUtil; /** * Exercises each virtual table in the system model. */ +@SuppressWarnings("nls") public class TestSystemVirtualModel extends AbstractMMQueryTestCase { - private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath()+ "/partssupplier/dqp.properties;user=test"; //$NON-NLS-1$ private static final String VDB = "PartsSupplier"; //$NON-NLS-1$ public TestSystemVirtualModel() { @@ -42,8 +43,8 @@ super.DELIMITER = "\t"; //$NON-NLS-1$ } - @Before public void setUp() { - getConnection(VDB, DQP_PROP_FILE); + @Before public void setUp() throws Exception { + this.internalConnection = TestMMDatabaseMetaData.createConnection("jdbc:teiid:" + VDB, UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb"); } @Ignore("ODBC support to be readded") @@ -52,7 +53,7 @@ executeAndAssertResults( "SELECT OA_SCOPE as \"SCOPE\" , COLUMN_NAME, DATA_TYPE, TYPE_NAME, OA_PRECISION as \"PRECISION\", " + //$NON-NLS-1$ "OA_LENGTH as \"LENGTH\", OA_SCALE as \"SCALE\", PSEUDO_COLUMN " + //$NON-NLS-1$ - "FROM System.ODBC.OA_COLUMNS " + //$NON-NLS-1$ + "FROM SYS.ODBC.OA_COLUMNS " + //$NON-NLS-1$ "WHERE TABLE_NAME = N'AUTHORS' AND TABLE_OWNER = N's1' AND " + //$NON-NLS-1$ "(OA_COLUMNTYPE = 2 OR OA_COLUMNTYPE = 3) " + //$NON-NLS-1$ "AND (OA_SCOPE is null OR OA_SCOPE >= 1) " + //$NON-NLS-1$ @@ -67,32 +68,32 @@ } @Test public void testModels() throws Exception { - checkResult("testSchemas", "select* from System.Schemas"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testSchemas", "select* from SYS.Schemas"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testKeys() throws Exception { - checkResult("testKeys", "select* from System.Keys order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testKeys", "select* from SYS.Keys order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testGroups() throws Exception { - checkResult("testTables", "select* from System.Tables order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testTables", "select* from SYS.Tables order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testDataTypes() throws Exception { - checkResult("testDataTypes", "select * from System.DataTypes order by name"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testDataTypes", "select * from SYS.DataTypes order by name"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testProcedureParams() throws Exception { - checkResult("testProcedureParams", "select * from System.ProcedureParams order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testProcedureParams", "select * from SYS.ProcedureParams order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testProcedures() throws Exception { - checkResult("testProcedures", "select* from System.Procedures order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testProcedures", "select* from SYS.Procedures order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testProperties() { String[] expected = { "Name[string] Value[string] UID[string]", }; //$NON-NLS-1$ - executeAndAssertResults("select* from System.Properties", expected); //$NON-NLS-1$ + executeAndAssertResults("select* from SYS.Properties", expected); //$NON-NLS-1$ } @Test public void testVirtualDatabase() { @@ -100,37 +101,39 @@ String[] expected = { "Name[string] Version[string] ", "PartsSupplier 1", //$NON-NLS-1$ //$NON-NLS-2$ }; - executeAndAssertResults("select* from System.VirtualDatabases", //$NON-NLS-1$ + executeAndAssertResults("select* from SYS.VirtualDatabases", //$NON-NLS-1$ expected); } @Test public void testKeyColumns() throws Exception { - checkResult("testKeyColumns", "select* from System.KeyColumns order by Name, KeyName"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testKeyColumns", "select* from SYS.KeyColumns order by Name, KeyName"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testVDBResourcePathsProcedure() { - String[] expected = { "ResourcePath[string] isBinary[boolean] ", //$NON-NLS-1$ - "/parts/partsmd/PartsSupplier.xmi false", //$NON-NLS-1$ + String[] expected = { "ResourcePath[string] isBinary[boolean]", + "/parts/partsmd/PartsSupplier.xmi false", + "/ConfigurationInfo.def false", + "/MetaMatrix-VdbManifestModel.xmi false", }; execute("exec getVDBResourcePaths()",new Object[] {}); //$NON-NLS-1$ assertResults(expected); } @Test public void testColumns() throws Exception { - checkResult("testColumns", "select* from System.Columns order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testColumns", "select* from SYS.Columns order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testTableType() { String[] expected = { "Type[string] ", "Table", }; //$NON-NLS-1$ //$NON-NLS-2$ executeAndAssertResults( - "select distinct Type from System.Tables order by Type", //$NON-NLS-1$ + "select distinct Type from SYS.Tables order by Type", //$NON-NLS-1$ expected); } @Test public void testTableIsSystem() throws Exception { - checkResult("testTableIsSystem", "select Name from System.Tables where IsSystem = 'false' order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testTableIsSystem", "select Name from SYS.Tables where IsSystem = 'false' order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } @Ignore("ODBC support to be readded") @@ -145,7 +148,7 @@ "PartsSupplier System getVDBResourcePaths 0 0 0 null 1", //$NON-NLS-1$ }; - executeAndAssertResults("select* FROM System.ODBC.OA_PROC", expected); //$NON-NLS-1$ + executeAndAssertResults("select* FROM SYS.ODBC.OA_PROC", expected); //$NON-NLS-1$ } @Ignore("ODBC support to be readded") @@ -168,7 +171,7 @@ }; executeAndAssertResults( - "select* FROM System.ODBC.OA_PROCCOLUMNS ORDER BY OA_NAME, COLUMN_NAME ", //$NON-NLS-1$ + "select* FROM SYS.ODBC.OA_PROCCOLUMNS ORDER BY OA_NAME, COLUMN_NAME ", //$NON-NLS-1$ expected); } @@ -180,7 +183,7 @@ "select TYPE_NAME, DATA_TYPE, OA_PRECISION as PRECISION, LITERAL_PREFIX, LITERAL_SUFFIX, " //$NON-NLS-1$ + " CREATE_PARAMS, OA_NULLABLE as NULLABLE, CASE_SENSITIVE, OA_SEARCHABLE as SEARCHABLE, " //$NON-NLS-1$ + " UNSIGNED_ATTRIB as UNSIGNED_ATTRIBUTE, OA_MONEY as MONEY, AUTO_INCREMENT, LOCAL_TYPE_NAME, " //$NON-NLS-1$ - + " MINIMUM_SCALE, MAXIMUM_SCALE FROM System.ODBC.OA_TYPES WHERE DATA_TYPE = -6", //$NON-NLS-1$ + + " MINIMUM_SCALE, MAXIMUM_SCALE FROM SYS.ODBC.OA_TYPES WHERE DATA_TYPE = -6", //$NON-NLS-1$ expected); } @@ -470,7 +473,7 @@ }; executeAndAssertResults( - "select* FROM System.ODBC.OA_COLUMNS ORDER BY TABLE_QUALIFIER, TABLE_OWNER, TABLE_NAME, COLUMN_NAME", //$NON-NLS-1$ + "select* FROM SYS.ODBC.OA_COLUMNS ORDER BY TABLE_QUALIFIER, TABLE_OWNER, TABLE_NAME, COLUMN_NAME", //$NON-NLS-1$ expected); } @@ -491,7 +494,7 @@ "TIMESTAMP 11 19 {ts ' '} null 1 0 2 0 0 0 null null TIMESTAMP", //$NON-NLS-1$ "VARCHAR 12 2147483647 ' ' null 1 1 3 0 0 0 null null VARCHAR", }; //$NON-NLS-1$ executeAndAssertResults( - "select* FROM System.ODBC.OA_TYPES ORDER BY TYPE_NAME", //$NON-NLS-1$ + "select* FROM SYS.ODBC.OA_TYPES ORDER BY TYPE_NAME", //$NON-NLS-1$ expected); } @@ -512,7 +515,7 @@ }; executeAndAssertResults( - "select* FROM System.ODBC.OA_FKEYS ORDER BY PK_NAME, KEY_SEQ", //$NON-NLS-1$ + "select* FROM SYS.ODBC.OA_FKEYS ORDER BY PK_NAME, KEY_SEQ", //$NON-NLS-1$ expected); } @@ -532,7 +535,7 @@ "PartsSupplier PartsSupplier/PARTSSUPPLIER SUPPLIER_PARTS 0 PK_SUPPLIER_PARTS 3 1 SUPPLIER_ID null null null ", //$NON-NLS-1$ }; - executeAndAssertResults("select* FROM System.ODBC.OA_STATISTICS order by TABLE_NAME, INDEX_NAME, COLUMN_NAME", //$NON-NLS-1$ + executeAndAssertResults("select* FROM SYS.ODBC.OA_STATISTICS order by TABLE_NAME, INDEX_NAME, COLUMN_NAME", //$NON-NLS-1$ expected); } @@ -549,17 +552,17 @@ }; - executeAndAssertResults("select KeyName, RefKeyUID FROM System.KeyColumns WHERE RefKeyUID IS NULL order by KeyName",expected); //$NON-NLS-1$ + executeAndAssertResults("select KeyName, RefKeyUID FROM SYS.KeyColumns WHERE RefKeyUID IS NULL order by KeyName",expected); //$NON-NLS-1$ } @Test public void testReferenceKeyColumns() throws Exception { - checkResult("testReferenceKeyColumns", "select* FROM System.ReferenceKeyColumns order by PKTABLE_NAME"); //$NON-NLS-1$ //$NON-NLS-2$ + checkResult("testReferenceKeyColumns", "select* FROM SYS.ReferenceKeyColumns order by PKTABLE_NAME"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testVirtualLookup() { String[] expected = { "expr[string]", "null"}; //$NON-NLS-1$ //$NON-NLS-2$ executeAndAssertResults( - "select lookup('System.KeyColumns', 'RefKeyUID', 'KeyName', 'PK_PARTS')", expected); //$NON-NLS-1$ + "select lookup('SYS.KeyColumns', 'RefKeyUID', 'KeyName', 'PK_PARTS')", expected); //$NON-NLS-1$ } } Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2010-03-22 21:50:36 UTC (rev 1988) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -25,7 +25,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.teiid.jdbc.api.AbstractMMQueryTestCase; +import org.teiid.jdbc.AbstractMMQueryTestCase; +import org.teiid.jdbc.TestMMDatabaseMetaData; import com.metamatrix.core.util.UnitTestUtil; @@ -33,9 +34,9 @@ * Tests xml virtual documents which are built on top of virtual * procedures (see defect 12309 and all related). */ +@SuppressWarnings("nls") public class TestVirtualDocWithVirtualProc extends AbstractMMQueryTestCase { - private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/xml-vp/xmlvp.properties;user=test"; //$NON-NLS-1$ private static final String VDB = "xmlvp"; //$NON-NLS-1$ public TestVirtualDocWithVirtualProc() { @@ -44,8 +45,8 @@ super.DELIMITER = "\t"; //$NON-NLS-1$ } - @Before public void setUp() { - getConnection(VDB, DQP_PROP_FILE); + @Before public void setUp() throws Exception { + this.internalConnection = TestMMDatabaseMetaData.createConnection("jdbc:teiid:" + VDB, UnitTestUtil.getTestDataPath() + "/xml-vp/xmlvp_1.vdb"); } @After public void tearDown() { @@ -54,7 +55,7 @@ @Test public void testDefect15241() { - String sql = "SELECT SchemaName, Name, Description FROM System.Tables WHERE Name = 'yyyTestDocument'"; //$NON-NLS-1$ + String sql = "SELECT SchemaName, Name, Description FROM SYS.Tables WHERE Name = 'yyyTestDocument'"; //$NON-NLS-1$ String[] expected ={ "SchemaName[string] Name[string] Description[string]", //$NON-NLS-1$ @@ -65,7 +66,7 @@ } @Test public void testDefect15241a() { - String sql = "SELECT TableName, Name, Description FROM System.Columns WHERE Name = 'IntKey'"; //$NON-NLS-1$ + String sql = "SELECT TableName, Name, Description FROM SYS.Columns WHERE Name = 'IntKey'"; //$NON-NLS-1$ String[] expected ={ "TableName[string] Name[string] Description[string]", //$NON-NLS-1$ "HugeA IntKey null", //$NON-NLS-1$ @@ -82,7 +83,7 @@ @Test public void testDefect15241b() { - String sql = "SELECT Name, Value, UID FROM System.Properties"; //$NON-NLS-1$ + String sql = "SELECT p.Name, p.Value, UID FROM SYS.Properties p"; //$NON-NLS-1$ String[] expected ={ "Name[string] Value[string] UID[string]", //$NON-NLS-1$ "NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1", //$NON-NLS-1$ Added: trunk/test-integration/common/src/test/resources/PartsSupplier.vdb =================================================================== (Binary files differ) Property changes on: trunk/test-integration/common/src/test/resources/PartsSupplier.vdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/test-integration/common/src/test/resources/TestCase3473 (from rev 1988, trunk/test-integration/common/src/test/resources/3473) Copied: trunk/test-integration/common/src/test/resources/TestCase3473/test.vdb (from rev 1988, trunk/test-integration/db/src/test/resources/3473/test.vdb) =================================================================== (Binary files differ) Property changes on: trunk/test-integration/common/src/test/resources/TestCase3473/test.vdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected (from rev 1988, trunk/test-integration/db/src/test/resources/3473/testGetCrossReference.expected) =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,75 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +test test all_databases database_id test test all_models database_id 1 3 3 databae_model_fk databases_pk 5 +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +test test all_databases database_id test test all_models database_id 1 3 3 databae_model_fk databases_pk 5 +test test all_models model_id test test all_tables model_id 1 3 3 table_model_fk models_pk 5 +Row Count : 2 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Copied: trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected (from rev 1988, trunk/test-integration/db/src/test/resources/3473/testGetExportedKeys.expected) =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,55 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +test test all_models model_id test test all_tables model_id 1 3 3 table_model_fk models_pk 5 +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Copied: trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected (from rev 1988, trunk/test-integration/db/src/test/resources/3473/testGetImportedKeys.expected) =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,55 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +test test all_databases database_id test test all_models database_id 1 3 3 databae_model_fk databases_pk 5 +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Copied: trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected (from rev 1988, trunk/test-integration/db/src/test/resources/3473/testGetPrimaryKeys.expected) =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,31 @@ +string string string string short string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME +test test all_models model_id 1 models_pk +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 test java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +string string string string short string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 test java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +string string string string short string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 test java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true +PK_NAME 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false Copied: trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected (from rev 1988, trunk/test-integration/db/src/test/resources/3473/testGetTables.expected) =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,59 @@ +string string string string string string string string string string boolean +TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL +test SYS Columns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS DataTypes SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS KeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS Keys SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS ProcedureParams SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS Procedures SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS Properties SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS ReferenceKeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS Schemas SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test test all_databases TABLE <null> <null> <null> <null> <null> <null> false +test test all_models TABLE <null> <null> <null> <null> <null> <null> false +test test all_tables TABLE <null> <null> <null> <null> <null> <null> false +Row Count : 14 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 test java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false +TABLE_TYPE 12 test java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true +TYPE_CAT 12 test java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_SCHEM 12 test java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_NAME 12 test java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +SELF_REFERENCING_COL_NAME 12 test java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +REF_GENERATION 12 test java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true +ISPHYSICAL -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false +string string string string string string string string string string boolean +TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 test java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false +TABLE_TYPE 12 test java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true +TYPE_CAT 12 test java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_SCHEM 12 test java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_NAME 12 test java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +SELF_REFERENCING_COL_NAME 12 test java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +REF_GENERATION 12 test java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true +ISPHYSICAL -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false +string string string string string string string string string string boolean +TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 test java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false +TABLE_TYPE 12 test java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true +TYPE_CAT 12 test java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_SCHEM 12 test java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_NAME 12 test java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +SELF_REFERENCING_COL_NAME 12 test java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +REF_GENERATION 12 test java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true +ISPHYSICAL -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnPrivileges.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnPrivileges.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnPrivileges.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -22,3 +22,15 @@ GRANTEE 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false PRIVILEGE 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false IS_GRANTABLE 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false +string string string string string string string string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false +TABLE_NAME 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false +GRANTOR 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false +GRANTEE 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false +PRIVILEGE 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false +IS_GRANTABLE 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,4 +1,3 @@ -getColumns1 string string string string short string integer string integer integer integer string string string string integer integer string string string string ! string string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TABLE! SOURCE_DATA_TYPE IS_AUTOINCREMENT QT_Ora9DS XQTDoc BQTDocTestDocument BigDecimalValue 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 NO <null> <null> <null> ! <null> NO @@ -158,52 +157,52 @@ QT_Ora9DS VQT Base.Order3 E 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Base.Order4 StringNum 12 string 10 <null> 0 10 1 <null> <null> <null> <null> 10 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS VQT Base.Order5 StringNum 12 string 10 <null> 0 10 1 <null> <null> <null> <null> 10 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns TableName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns DataType 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns Scale 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns ElementLength 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns IsLengthFixed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 10 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns SupportsSelect -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 11 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 12 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 13 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns IsSigned -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 14 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns IsCurrency -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 15 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 16 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 17 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns MinRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 18 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns MaxRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 19 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 20 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns Format 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 21 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns DefaultValue 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 22 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 23 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 24 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns CharOctetLength 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 25 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 26 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 27 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Columns Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 28 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes Name 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes IsStandard -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes IsPhysical -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes TypeName 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes Scale 4 integer 10 <null> 0 10 1 <null> (0) <null> <null> 10 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes IsSigned -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 9 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 10 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 11 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes Radix 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 13 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 14 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 15 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes RuntimeType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 16 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes BaseType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 17 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System DataTypes Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 18 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns TableName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns DataType 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Scale 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Length 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsLengthFixed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 10 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SupportsSelect -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 11 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 12 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 13 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsSigned -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 14 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsCurrency -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 15 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 16 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 17 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns MinRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 18 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns MaxRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 19 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 20 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Format 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 21 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns DefaultValue 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 22 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 23 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 24 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns CharOctetLength 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 25 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 26 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 27 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 28 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Name 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsStandard -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsPhysical -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes TypeName 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Scale 4 integer 10 <null> 0 10 1 <null> (0) <null> <null> 10 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsSigned -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 10 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 11 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Radix 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 13 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 14 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 15 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes RuntimeType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 16 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes BaseType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 17 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 18 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 HugeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 HugeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 HugeA StringKey 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 2 YES <null> <null> <null> ! <null> NO @@ -272,25 +271,25 @@ QT_Ora9DS BQT2 HugeB BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 HugeB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 HugeB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns KeyName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns KeyType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System KeyColumns Position 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 9 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys IsIndexed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 9 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Keys UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 10 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns KeyName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns KeyType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns Position 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 9 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys IsIndexed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 9 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 10 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 LargeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 LargeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 LargeA StringKey 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 2 YES <null> <null> <null> ! <null> NO @@ -427,50 +426,50 @@ QT_Ora9DS BQT2 MediumB BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 MediumB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 MediumB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams ProcedureName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams DataType 12 string 25 <null> 0 10 0 <null> <null> <null> <null> 25 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams Type 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams Optional -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 10 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams Scale 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 11 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams NullType 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 13 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ProcedureParams UID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 14 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Procedures VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Procedures SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Procedures Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Procedures NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Procedures ReturnsResults -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Procedures UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Procedures Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Properties Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Properties Value 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Properties UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns PKTABLE_CAT 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns PKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns PKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns PKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns FKTABLE_CAT 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns FKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns FKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns FKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns KEY_SEQ 5 short 5 <null> 0 10 1 <null> <null> <null> <null> 5 9 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns UPDATE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 10 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns DELETE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 11 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns FK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 12 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns PK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 13 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System ReferenceKeyColumns DEFERRABILITY 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 14 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Schemas VDBName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Schemas Name 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Schemas IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Schemas UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Schemas Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Schemas PrimaryMetamodelURI 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams ProcedureName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams DataType 12 string 25 <null> 0 10 0 <null> <null> <null> <null> 25 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Type 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Optional -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 10 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Scale 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 11 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams NullType 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 13 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams UID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 14 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures ReturnsResults -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties Value 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_CAT 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_CAT 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns KEY_SEQ 5 short 5 <null> 0 10 1 <null> <null> <null> <null> 5 9 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns UPDATE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 10 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns DELETE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 11 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 12 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 13 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns DEFERRABILITY 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 14 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas VDBName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas Name 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas PrimaryMetamodelURI 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 6 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 SmallA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 SmallA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 SmallA StringKey 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 2 YES <null> <null> <null> ! <null> NO @@ -539,18 +538,18 @@ QT_Ora9DS BQT2 SmallB BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 SmallB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 SmallB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables VDBName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables Cardinality 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 10 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables IsSystem -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 11 NO <null> <null> <null> ! <null> NO -QT_Ora9DS System Tables IsMaterialized -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 12 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables VDBName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Cardinality 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 10 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables IsSystem -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 11 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables IsMaterialized -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 12 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U1 IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U1 StringKey 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 2 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U1 IntNum 4 integer 22 <null> 0 10 1 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO @@ -666,8 +665,8 @@ QT_Ora9DS VQT Union.U9 A 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U9 B 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 2 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U9 C 7 float 20 <null> 0 10 0 <null> <null> <null> <null> 126 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System VirtualDatabases Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS System VirtualDatabases Version 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS VirtualDatabases Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS VirtualDatabases Version 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 2 YES <null> <null> <null> ! <null> NO QT_Ora9DS XQTDoc choiceTestDocument data1 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 NO <null> <null> <null> ! <null> NO QT_Ora9DS XQTDoc choiceTestDocument key1 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 NO <null> <null> <null> ! <null> NO QT_Ora9DS XQTDoc choiceTestDocument wrapper1 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 NO <null> <null> <null> ! <null> NO @@ -974,23 +973,23 @@ QT_Ora9DS XQT xqtFullData ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 NO <null> <null> <null> ! <null> NO Row Count : 971 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Columns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Columns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Columns 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System Columns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false DATA_TYPE 5 QT_Ora9DS java.lang.Short DATA_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System Columns 100 100 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false COLUMN_SIZE 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer <null> <null> 11 10 0 false false false true 1 false true true true BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer System Columns 11 10 0 false false false false 0 true true false false -NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer System Columns 11 10 0 false false false false 0 true true false false +DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false +NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Columns 255 255 0 false true false true 1 false true true true -COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string System Columns 255 255 0 false false false false 1 true true false false +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true +COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer System Columns 11 10 0 false false false false 1 true true false false -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System Columns 11 10 0 false false false false 0 true true false false +CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,25 +1,24 @@ -getColumns2 string string string string short string integer string integer integer integer string string string string integer integer string string string string ! string string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TABLE! SOURCE_DATA_TYPE IS_AUTOINCREMENT Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Columns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Columns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Columns 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System Columns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false DATA_TYPE 5 QT_Ora9DS java.lang.Short DATA_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System Columns 100 100 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false COLUMN_SIZE 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer <null> <null> 11 10 0 false false false true 1 false true true true BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer System Columns 11 10 0 false false false false 0 true true false false -NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer System Columns 11 10 0 false false false false 0 true true false false +DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false +NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Columns 255 255 0 false true false true 1 false true true true -COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string System Columns 255 255 0 false false false false 1 true true false false +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true +COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer System Columns 11 10 0 false false false false 1 true true false false -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System Columns 11 10 0 false false false false 0 true true false false +CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,25 +1,24 @@ -getColumns3 string string string string short string integer string integer integer integer string string string string integer integer string string string string ! string string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TABLE! SOURCE_DATA_TYPE IS_AUTOINCREMENT Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Columns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Columns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Columns 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System Columns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false DATA_TYPE 5 QT_Ora9DS java.lang.Short DATA_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System Columns 100 100 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false COLUMN_SIZE 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer <null> <null> 11 10 0 false false false true 1 false true true true BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer System Columns 11 10 0 false false false false 0 true true false false -NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer System Columns 11 10 0 false false false false 0 true true false false +DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false +NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Columns 255 255 0 false true false true 1 false true true true -COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string System Columns 255 255 0 false false false false 1 true true false false +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true +COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer System Columns 11 10 0 false false false false 1 true true false false -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System Columns 11 10 0 false false false false 0 true true false false +CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,25 +1,24 @@ -getColumns4 string string string string short string integer string integer integer integer string string string string integer integer string string string string ! string string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TABLE! SOURCE_DATA_TYPE IS_AUTOINCREMENT Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Columns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Columns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Columns 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System Columns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false DATA_TYPE 5 QT_Ora9DS java.lang.Short DATA_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System Columns 100 100 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false COLUMN_SIZE 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer <null> <null> 11 10 0 false false false true 1 false true true true BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer System Columns 11 10 0 false false false false 0 true true false false -NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer System Columns 11 10 0 false false false false 0 true true false false +DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false +NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Columns 255 255 0 false true false true 1 false true true true -COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string System Columns 255 255 0 false false false false 1 true true false false +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true +COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer System Columns 11 10 0 false false false false 1 true true false false -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System Columns 11 10 0 false false false false 0 true true false false +CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,25 +1,24 @@ string string string string short string integer string integer integer integer string string string string integer integer string string string string ! string string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TABLE! SOURCE_DATA_TYPE IS_AUTOINCREMENT -QT_Ora9DS System VirtualDatabases Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -Row Count : 1 +Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Columns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Columns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Columns 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System Columns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false DATA_TYPE 5 QT_Ora9DS java.lang.Short DATA_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System Columns 100 100 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false COLUMN_SIZE 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer <null> <null> 11 10 0 false false false true 1 false true true true BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer System Columns 11 10 0 false false false false 0 true true false false -NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer System Columns 11 10 0 false false false false 0 true true false false +DECIMAL_DIGITS 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false +NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Columns 255 255 0 false true false true 1 false true true true -COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string System Columns 255 255 0 false false false false 1 true true false false +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true +COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer System Columns 11 10 0 false false false false 1 true true false false -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System Columns 11 10 0 false false false false 0 true true false false +CHAR_OCTET_LENGTH 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Deleted: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatchQuery.expected =================================================================== Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,57 +1,54 @@ -getCrossReference1 string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -getCrossReference2 +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -getCrossReference3 +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,54 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -2,53 +2,53 @@ PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,54 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,57 +1,54 @@ -getImportedKeys1 string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -getImportedKeys2 +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -getImportedKeys3 +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short System ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer System ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,54 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -2,15 +2,15 @@ TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System KeyColumns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System KeyColumns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System KeyColumns 2048 2048 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false NON_UNIQUE -7 QT_Ora9DS java.lang.Boolean NON_UNIQUE boolean <null> <null> 5 1 0 false false false true 1 false true true true INDEX_QUALIFIER 12 QT_Ora9DS java.lang.String INDEX_QUALIFIER string <null> <null> 4000 4000 0 false false false true 1 false true true true -INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string System KeyColumns 255 255 0 false false false false 1 true true false false +INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false TYPE 4 QT_Ora9DS java.lang.Integer TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true ORDINAL_POSITION 5 QT_Ora9DS java.lang.Short ORDINAL_POSITION short <null> <null> 6 5 0 false false false true 1 false true true true -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System KeyColumns 255 255 0 false false false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false ASC_OR_DESC 12 QT_Ora9DS java.lang.String ASC_OR_DESC string <null> <null> 4000 4000 0 false false false true 1 false true true true CARDINALITY 4 QT_Ora9DS java.lang.Integer CARDINALITY integer <null> <null> 11 10 0 false false false true 1 false true true true PAGES 4 QT_Ora9DS java.lang.Integer PAGES integer <null> <null> 11 10 0 false false false true 1 false true true true @@ -19,15 +19,15 @@ TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System KeyColumns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System KeyColumns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System KeyColumns 2048 2048 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false NON_UNIQUE -7 QT_Ora9DS java.lang.Boolean NON_UNIQUE boolean <null> <null> 5 1 0 false false false true 1 false true true true INDEX_QUALIFIER 12 QT_Ora9DS java.lang.String INDEX_QUALIFIER string <null> <null> 4000 4000 0 false false false true 1 false true true true -INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string System KeyColumns 255 255 0 false false false false 1 true true false false +INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false TYPE 4 QT_Ora9DS java.lang.Integer TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true ORDINAL_POSITION 5 QT_Ora9DS java.lang.Short ORDINAL_POSITION short <null> <null> 6 5 0 false false false true 1 false true true true -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System KeyColumns 255 255 0 false false false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false ASC_OR_DESC 12 QT_Ora9DS java.lang.String ASC_OR_DESC string <null> <null> 4000 4000 0 false false false true 1 false true true true CARDINALITY 4 QT_Ora9DS java.lang.Integer CARDINALITY integer <null> <null> 11 10 0 false false false true 1 false true true true PAGES 4 QT_Ora9DS java.lang.Integer PAGES integer <null> <null> 11 10 0 false false false true 1 false true true true @@ -36,15 +36,15 @@ TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System KeyColumns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System KeyColumns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System KeyColumns 2048 2048 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false NON_UNIQUE -7 QT_Ora9DS java.lang.Boolean NON_UNIQUE boolean <null> <null> 5 1 0 false false false true 1 false true true true INDEX_QUALIFIER 12 QT_Ora9DS java.lang.String INDEX_QUALIFIER string <null> <null> 4000 4000 0 false false false true 1 false true true true -INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string System KeyColumns 255 255 0 false false false false 1 true true false false +INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false TYPE 4 QT_Ora9DS java.lang.Integer TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true ORDINAL_POSITION 5 QT_Ora9DS java.lang.Short ORDINAL_POSITION short <null> <null> 6 5 0 false false false true 1 false true true true -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System KeyColumns 255 255 0 false false false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false ASC_OR_DESC 12 QT_Ora9DS java.lang.String ASC_OR_DESC string <null> <null> 4000 4000 0 false false false true 1 false true true true CARDINALITY 4 QT_Ora9DS java.lang.Integer CARDINALITY integer <null> <null> 11 10 0 false false false true 1 false true true true PAGES 4 QT_Ora9DS java.lang.Integer PAGES integer <null> <null> 11 10 0 false false false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,51 @@ +string string string boolean string string integer short string string integer integer string +TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +NON_UNIQUE -7 QT_Ora9DS java.lang.Boolean NON_UNIQUE boolean <null> <null> 5 1 0 false false false true 1 false true true true +INDEX_QUALIFIER 12 QT_Ora9DS java.lang.String INDEX_QUALIFIER string <null> <null> 4000 4000 0 false false false true 1 false true true true +INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +TYPE 4 QT_Ora9DS java.lang.Integer TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true +ORDINAL_POSITION 5 QT_Ora9DS java.lang.Short ORDINAL_POSITION short <null> <null> 6 5 0 false false false true 1 false true true true +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +ASC_OR_DESC 12 QT_Ora9DS java.lang.String ASC_OR_DESC string <null> <null> 4000 4000 0 false false false true 1 false true true true +CARDINALITY 4 QT_Ora9DS java.lang.Integer CARDINALITY integer <null> <null> 11 10 0 false false false true 1 false true true true +PAGES 4 QT_Ora9DS java.lang.Integer PAGES integer <null> <null> 11 10 0 false false false true 1 false true true true +FILTER_CONDITION 12 QT_Ora9DS java.lang.String FILTER_CONDITION string <null> <null> 4000 4000 0 false false false true 1 false true true true +string string string boolean string string integer short string string integer integer string +TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +NON_UNIQUE -7 QT_Ora9DS java.lang.Boolean NON_UNIQUE boolean <null> <null> 5 1 0 false false false true 1 false true true true +INDEX_QUALIFIER 12 QT_Ora9DS java.lang.String INDEX_QUALIFIER string <null> <null> 4000 4000 0 false false false true 1 false true true true +INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +TYPE 4 QT_Ora9DS java.lang.Integer TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true +ORDINAL_POSITION 5 QT_Ora9DS java.lang.Short ORDINAL_POSITION short <null> <null> 6 5 0 false false false true 1 false true true true +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +ASC_OR_DESC 12 QT_Ora9DS java.lang.String ASC_OR_DESC string <null> <null> 4000 4000 0 false false false true 1 false true true true +CARDINALITY 4 QT_Ora9DS java.lang.Integer CARDINALITY integer <null> <null> 11 10 0 false false false true 1 false true true true +PAGES 4 QT_Ora9DS java.lang.Integer PAGES integer <null> <null> 11 10 0 false false false true 1 false true true true +FILTER_CONDITION 12 QT_Ora9DS java.lang.String FILTER_CONDITION string <null> <null> 4000 4000 0 false false false true 1 false true true true +string string string boolean string string integer short string string integer integer string +TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +NON_UNIQUE -7 QT_Ora9DS java.lang.Boolean NON_UNIQUE boolean <null> <null> 5 1 0 false false false true 1 false true true true +INDEX_QUALIFIER 12 QT_Ora9DS java.lang.String INDEX_QUALIFIER string <null> <null> 4000 4000 0 false false false true 1 false true true true +INDEX_NAME 12 QT_Ora9DS java.lang.String INDEX_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +TYPE 4 QT_Ora9DS java.lang.Integer TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true +ORDINAL_POSITION 5 QT_Ora9DS java.lang.Short ORDINAL_POSITION short <null> <null> 6 5 0 false false false true 1 false true true true +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +ASC_OR_DESC 12 QT_Ora9DS java.lang.String ASC_OR_DESC string <null> <null> 4000 4000 0 false false false true 1 false true true true +CARDINALITY 4 QT_Ora9DS java.lang.Integer CARDINALITY integer <null> <null> 11 10 0 false false false true 1 false true true true +PAGES 4 QT_Ora9DS java.lang.Integer PAGES integer <null> <null> 11 10 0 false false false true 1 false true true true +FILTER_CONDITION 12 QT_Ora9DS java.lang.String FILTER_CONDITION string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -3,29 +3,29 @@ QT_Ora9DS BQT1 SmallA IntKey 1 PK_SmallA Row Count : 1 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System KeyColumns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System KeyColumns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System KeyColumns 2048 2048 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System KeyColumns 255 255 0 false false false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false string string string string short string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System KeyColumns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System KeyColumns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System KeyColumns 2048 2048 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System KeyColumns 255 255 0 false false false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false string string string string short string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System KeyColumns 255 255 0 false false false false 0 true true false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System KeyColumns 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System KeyColumns 2048 2048 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string System KeyColumns 255 255 0 false false false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false Added: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,31 @@ +string string string string short string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME +QT_Ora9DS BQT1 SmallA IntKey 1 PK_SmallA +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +string string string string short string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +string string string string short string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -41,79 +41,81 @@ QT_Ora9DS SP sp_rows_between BigIntegerValue 3 2 biginteger 19 28 0 10 1 <null> <null> <null> <null> <null> 15 YES sp_rows_between QT_Ora9DS SP sp_rows_between BigDecimalValue 3 2 bigdecimal 20 126 0 10 1 <null> <null> <null> <null> <null> 16 YES sp_rows_between QT_Ora9DS SP sp_rows_between ObjectValue 3 2000 object 2147483647 2048 0 10 1 <null> <null> <null> <null> <null> 17 YES sp_rows_between -QT_Ora9DS System getBinaryVDBResource resourcePath 1 12 string 50 50 0 10 0 <null> <null> <null> <null> <null> 1 NO getBinaryVDBResource -QT_Ora9DS System getBinaryVDBResource VdbResource 3 2004 blob 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getBinaryVDBResource -QT_Ora9DS System getCharacterVDBResource resourcePath 1 12 string 50 50 0 10 0 <null> <null> <null> <null> <null> 1 NO getCharacterVDBResource -QT_Ora9DS System getCharacterVDBResource VdbResource 3 2005 clob 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getCharacterVDBResource -QT_Ora9DS System getVDBResourcePaths ResourcePath 3 12 string 50 50 0 10 1 <null> <null> <null> <null> <null> 1 YES getVDBResourcePaths -QT_Ora9DS System getVDBResourcePaths isBinary 3 -7 boolean 1 1 0 10 1 <null> <null> <null> <null> <null> 2 YES getVDBResourcePaths -Row Count : 47 +QT_Ora9DS SYS getBinaryVDBResource resourcePath 1 12 string 50 50 0 10 0 <null> <null> <null> <null> <null> 1 NO getBinaryVDBResource +QT_Ora9DS SYS getBinaryVDBResource VdbResource 3 2004 blob 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getBinaryVDBResource +QT_Ora9DS SYS getCharacterVDBResource resourcePath 1 12 string 50 50 0 10 0 <null> <null> <null> <null> <null> 1 NO getCharacterVDBResource +QT_Ora9DS SYS getCharacterVDBResource VdbResource 3 2005 clob 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getCharacterVDBResource +QT_Ora9DS SYS getVDBResourcePaths ResourcePath 3 12 string 50 50 0 10 1 <null> <null> <null> <null> <null> 1 YES getVDBResourcePaths +QT_Ora9DS SYS getVDBResourcePaths isBinary 3 -7 boolean 1 1 0 10 1 <null> <null> <null> <null> <null> 2 YES getVDBResourcePaths +QT_Ora9DS SYS getXMLSchemas document 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO getXMLSchemas +QT_Ora9DS SYS getXMLSchemas schema 3 2009 xml 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getXMLSchemas +Row Count : 49 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string System ProcedureParams 255 255 0 false false false false 0 true true false false -PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string System ProcedureParams 255 255 0 false true false true 1 false true true true -PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string System ProcedureParams 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System ProcedureParams 255 255 0 false false false false 0 true true false false +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS ProcedureParams 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS ProcedureParams 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS ProcedureParams 255 255 0 false false false false 0 true true false false COLUMN_TYPE 5 QT_Ora9DS java.lang.Short COLUMN_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true DATA_TYPE 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System ProcedureParams 25 25 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS ProcedureParams 25 25 0 false true false false 0 true true true false PRECISION 4 QT_Ora9DS java.lang.Integer PRECISION integer <null> <null> 11 10 0 false false false true 1 false true true true LENGTH 4 QT_Ora9DS java.lang.Integer LENGTH integer <null> <null> 11 10 0 false false false true 1 false true true true SCALE 5 QT_Ora9DS java.lang.Short SCALE short <null> <null> 6 5 0 false false false true 1 false true true true -RADIX 4 QT_Ora9DS java.lang.Integer RADIX integer System ProcedureParams 11 10 0 false false false false 0 true true false false +RADIX 4 QT_Ora9DS java.lang.Integer RADIX integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true REMARKS 12 QT_Ora9DS java.lang.String REMARKS string <null> <null> 4000 4000 0 false false false true 1 false true true true COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true CHAR_OCTET_LENGTH 12 QT_Ora9DS java.lang.String CHAR_OCTET_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System ProcedureParams 11 10 0 false false false false 0 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true -SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string System ProcedureParams 255 255 0 false true false false 0 true true false false +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false string string string string short integer string integer integer short integer integer string string string string string integer string string PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME COLUMN_TYPE DATA_TYPE TYPE_NAME PRECISION LENGTH SCALE RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string System ProcedureParams 255 255 0 false false false false 0 true true false false -PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string System ProcedureParams 255 255 0 false true false true 1 false true true true -PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string System ProcedureParams 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System ProcedureParams 255 255 0 false false false false 0 true true false false +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS ProcedureParams 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS ProcedureParams 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS ProcedureParams 255 255 0 false false false false 0 true true false false COLUMN_TYPE 5 QT_Ora9DS java.lang.Short COLUMN_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true DATA_TYPE 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System ProcedureParams 25 25 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS ProcedureParams 25 25 0 false true false false 0 true true true false PRECISION 4 QT_Ora9DS java.lang.Integer PRECISION integer <null> <null> 11 10 0 false false false true 1 false true true true LENGTH 4 QT_Ora9DS java.lang.Integer LENGTH integer <null> <null> 11 10 0 false false false true 1 false true true true SCALE 5 QT_Ora9DS java.lang.Short SCALE short <null> <null> 6 5 0 false false false true 1 false true true true -RADIX 4 QT_Ora9DS java.lang.Integer RADIX integer System ProcedureParams 11 10 0 false false false false 0 true true false false +RADIX 4 QT_Ora9DS java.lang.Integer RADIX integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true REMARKS 12 QT_Ora9DS java.lang.String REMARKS string <null> <null> 4000 4000 0 false false false true 1 false true true true COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true CHAR_OCTET_LENGTH 12 QT_Ora9DS java.lang.String CHAR_OCTET_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System ProcedureParams 11 10 0 false false false false 0 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true -SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string System ProcedureParams 255 255 0 false true false false 0 true true false false +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false string string string string short integer string integer integer short integer integer string string string string string integer string string PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME COLUMN_TYPE DATA_TYPE TYPE_NAME PRECISION LENGTH SCALE RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string System ProcedureParams 255 255 0 false false false false 0 true true false false -PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string System ProcedureParams 255 255 0 false true false true 1 false true true true -PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string System ProcedureParams 255 255 0 false true false false 0 true true false false -COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string System ProcedureParams 255 255 0 false false false false 0 true true false false +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS ProcedureParams 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS ProcedureParams 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS ProcedureParams 255 255 0 false false false false 0 true true false false COLUMN_TYPE 5 QT_Ora9DS java.lang.Short COLUMN_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true DATA_TYPE 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true -TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string System ProcedureParams 25 25 0 false true false false 0 true true true false +TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS ProcedureParams 25 25 0 false true false false 0 true true true false PRECISION 4 QT_Ora9DS java.lang.Integer PRECISION integer <null> <null> 11 10 0 false false false true 1 false true true true LENGTH 4 QT_Ora9DS java.lang.Integer LENGTH integer <null> <null> 11 10 0 false false false true 1 false true true true SCALE 5 QT_Ora9DS java.lang.Short SCALE short <null> <null> 6 5 0 false false false true 1 false true true true -RADIX 4 QT_Ora9DS java.lang.Integer RADIX integer System ProcedureParams 11 10 0 false false false false 0 true true false false +RADIX 4 QT_Ora9DS java.lang.Integer RADIX integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true REMARKS 12 QT_Ora9DS java.lang.String REMARKS string <null> <null> 4000 4000 0 false false false true 1 false true true true COLUMN_DEF 12 QT_Ora9DS java.lang.String COLUMN_DEF string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true CHAR_OCTET_LENGTH 12 QT_Ora9DS java.lang.String CHAR_OCTET_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer System ProcedureParams 11 10 0 false false false false 0 true true false false +ORDINAL_POSITION 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true -SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string System ProcedureParams 255 255 0 false true false false 0 true true false false +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -4,43 +4,44 @@ QT_Ora9DS SP sp_count_all_smalla_rows <null> <null> <null> <null> 1 sp_count_all_smalla_rows QT_Ora9DS SP sp_count_rows_between <null> <null> <null> <null> 1 sp_count_rows_between QT_Ora9DS SP sp_rows_between <null> <null> <null> <null> 2 sp_rows_between -QT_Ora9DS System getBinaryVDBResource <null> <null> <null> <null> 2 getBinaryVDBResource -QT_Ora9DS System getCharacterVDBResource <null> <null> <null> <null> 2 getCharacterVDBResource -QT_Ora9DS System getVDBResourcePaths <null> <null> <null> <null> 2 getVDBResourcePaths -Row Count : 7 +QT_Ora9DS SYS getBinaryVDBResource <null> <null> <null> <null> 2 getBinaryVDBResource +QT_Ora9DS SYS getCharacterVDBResource <null> <null> <null> <null> 2 getCharacterVDBResource +QT_Ora9DS SYS getVDBResourcePaths <null> <null> <null> <null> 2 getVDBResourcePaths +QT_Ora9DS SYS getXMLSchemas <null> <null> <null> <null> 2 getXMLSchemas +Row Count : 8 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string System Procedures 255 255 0 false false false false 0 true true false false -PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string System Procedures 255 255 0 false true false true 1 false true true true -PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string System Procedures 255 255 0 false true false false 0 true true false false +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false RESERVED_1 12 QT_Ora9DS java.lang.String RESERVED_1 string <null> <null> 4000 4000 0 false false false true 1 false true true true RESERVED_2 12 QT_Ora9DS java.lang.String RESERVED_2 string <null> <null> 4000 4000 0 false false false true 1 false true true true RESERVED_3 12 QT_Ora9DS java.lang.String RESERVED_3 string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Procedures 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Procedures 255 255 0 false true false true 1 false true true true PROCEDURE_TYPE 5 QT_Ora9DS java.lang.Short PROCEDURE_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string System Procedures 255 255 0 false true false false 0 true true false false +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false string string string string string string string short string PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME RESERVED_1 RESERVED_2 RESERVED_3 REMARKS PROCEDURE_TYPE SPECIFIC_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string System Procedures 255 255 0 false false false false 0 true true false false -PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string System Procedures 255 255 0 false true false true 1 false true true true -PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string System Procedures 255 255 0 false true false false 0 true true false false +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false RESERVED_1 12 QT_Ora9DS java.lang.String RESERVED_1 string <null> <null> 4000 4000 0 false false false true 1 false true true true RESERVED_2 12 QT_Ora9DS java.lang.String RESERVED_2 string <null> <null> 4000 4000 0 false false false true 1 false true true true RESERVED_3 12 QT_Ora9DS java.lang.String RESERVED_3 string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Procedures 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Procedures 255 255 0 false true false true 1 false true true true PROCEDURE_TYPE 5 QT_Ora9DS java.lang.Short PROCEDURE_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string System Procedures 255 255 0 false true false false 0 true true false false +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false string string string string string string string short string PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME RESERVED_1 RESERVED_2 RESERVED_3 REMARKS PROCEDURE_TYPE SPECIFIC_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string System Procedures 255 255 0 false false false false 0 true true false false -PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string System Procedures 255 255 0 false true false true 1 false true true true -PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string System Procedures 255 255 0 false true false false 0 true true false false +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false RESERVED_1 12 QT_Ora9DS java.lang.String RESERVED_1 string <null> <null> 4000 4000 0 false false false true 1 false true true true RESERVED_2 12 QT_Ora9DS java.lang.String RESERVED_2 string <null> <null> 4000 4000 0 false false false true 1 false true true true RESERVED_3 12 QT_Ora9DS java.lang.String RESERVED_3 string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Procedures 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Procedures 255 255 0 false true false true 1 false true true true PROCEDURE_TYPE 5 QT_Ora9DS java.lang.Short PROCEDURE_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true -SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string System Procedures 255 255 0 false true false false 0 true true false false +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false Added: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,47 @@ +string string string string string string string short string +PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME RESERVED_1 RESERVED_2 RESERVED_3 REMARKS PROCEDURE_TYPE SPECIFIC_NAME +QT_Ora9DS SP sp_all_smalla_rows <null> <null> <null> <null> 2 sp_all_smalla_rows +QT_Ora9DS SP sp_count_all_smalla_rows <null> <null> <null> <null> 1 sp_count_all_smalla_rows +QT_Ora9DS SP sp_count_rows_between <null> <null> <null> <null> 1 sp_count_rows_between +QT_Ora9DS SP sp_rows_between <null> <null> <null> <null> 2 sp_rows_between +QT_Ora9DS SYS getBinaryVDBResource <null> <null> <null> <null> 2 getBinaryVDBResource +QT_Ora9DS SYS getCharacterVDBResource <null> <null> <null> <null> 2 getCharacterVDBResource +QT_Ora9DS SYS getVDBResourcePaths <null> <null> <null> <null> 2 getVDBResourcePaths +QT_Ora9DS SYS getXMLSchemas <null> <null> <null> <null> 2 getXMLSchemas +Row Count : 8 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false +RESERVED_1 12 QT_Ora9DS java.lang.String RESERVED_1 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_2 12 QT_Ora9DS java.lang.String RESERVED_2 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_3 12 QT_Ora9DS java.lang.String RESERVED_3 string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_TYPE 5 QT_Ora9DS java.lang.Short PROCEDURE_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false +string string string string string string string short string +PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME RESERVED_1 RESERVED_2 RESERVED_3 REMARKS PROCEDURE_TYPE SPECIFIC_NAME +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false +RESERVED_1 12 QT_Ora9DS java.lang.String RESERVED_1 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_2 12 QT_Ora9DS java.lang.String RESERVED_2 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_3 12 QT_Ora9DS java.lang.String RESERVED_3 string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_TYPE 5 QT_Ora9DS java.lang.Short PROCEDURE_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false +string string string string string string string short string +PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME RESERVED_1 RESERVED_2 RESERVED_3 REMARKS PROCEDURE_TYPE SPECIFIC_NAME +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PROCEDURE_CAT 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 QT_Ora9DS java.lang.String PROCEDURE_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false +RESERVED_1 12 QT_Ora9DS java.lang.String RESERVED_1 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_2 12 QT_Ora9DS java.lang.String RESERVED_2 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_3 12 QT_Ora9DS java.lang.String RESERVED_3 string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_TYPE 5 QT_Ora9DS java.lang.Short PROCEDURE_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true +SPECIFIC_NAME 12 QT_Ora9DS java.lang.String SPECIFIC_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSchemas.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSchemas.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSchemas.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -3,7 +3,7 @@ BQT1 QT_Ora9DS BQT2 QT_Ora9DS SP QT_Ora9DS -System QT_Ora9DS +SYS QT_Ora9DS VQT QT_Ora9DS XQT QT_Ora9DS XQTDoc QT_Ora9DS @@ -11,5 +11,5 @@ XQTRecursiveDoc QT_Ora9DS Row Count : 9 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Schemas 255 255 0 false true false true 1 false true true true -TABLE_CATALOG 12 QT_Ora9DS java.lang.String TABLE_CATALOG string System Schemas 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Schemas 255 255 0 false true false true 1 false true true true +TABLE_CATALOG 12 QT_Ora9DS java.lang.String TABLE_CATALOG string SYS Schemas 255 255 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSuperTables.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSuperTables.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSuperTables.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,8 @@ +string string string string +TABLE_CAT TABLE_SCHEM TABLE_NAME SUPERTABLE_NAME +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false +TABLE_SCHEM 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false +TABLE_NAME 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false +SUPERTABLE_NAME 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -18,17 +18,17 @@ QT_Ora9DS XQTRecursiveDoc testNestedDocument DOCUMENT <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQTRecursiveDoc testSimpleDocument DOCUMENT <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQTRecursiveDoc testSimpleTempTable DOCUMENT <null> <null> <null> <null> <null> <null> false -QT_Ora9DS System Columns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System DataTypes SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System KeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Keys SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System ProcedureParams SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Procedures SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Properties SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System ReferenceKeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Schemas SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Columns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS DataTypes SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS KeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Keys SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS ProcedureParams SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Procedures SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Properties SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS ReferenceKeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Schemas SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT1 HugeA TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT1 HugeB TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT1 LargeA TABLE <null> <null> <null> <null> <null> <null> true @@ -123,44 +123,44 @@ QT_Ora9DS XQTRecursiveDoc testSimpleTempTable.MappingClasses.TemporaryTable1 XMLSTAGINGTABLE <null> <null> <null> <null> <null> <null> false Row Count : 121 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Tables 255 255 0 false true false true 1 false true true true -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Tables 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Tables 255 255 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 QT_Ora9DS java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Tables 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true TYPE_CAT 12 QT_Ora9DS java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 QT_Ora9DS java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 QT_Ora9DS java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 QT_Ora9DS java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean System Tables 5 1 0 false true false false 0 true true false false +ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false string string string string string string string string string string boolean TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Tables 255 255 0 false true false true 1 false true true true -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Tables 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Tables 255 255 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 QT_Ora9DS java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Tables 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true TYPE_CAT 12 QT_Ora9DS java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 QT_Ora9DS java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 QT_Ora9DS java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 QT_Ora9DS java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean System Tables 5 1 0 false true false false 0 true true false false +ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false string string string string string string string string string string boolean TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Tables 255 255 0 false true false true 1 false true true true -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Tables 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Tables 255 255 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 QT_Ora9DS java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Tables 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true TYPE_CAT 12 QT_Ora9DS java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 QT_Ora9DS java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 QT_Ora9DS java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 QT_Ora9DS java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean System Tables 5 1 0 false true false false 0 true true false false +ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -18,17 +18,17 @@ QT_Ora9DS XQTRecursiveDoc testNestedDocument DOCUMENT <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQTRecursiveDoc testSimpleDocument DOCUMENT <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQTRecursiveDoc testSimpleTempTable DOCUMENT <null> <null> <null> <null> <null> <null> false -QT_Ora9DS System Columns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System DataTypes SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System KeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Keys SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System ProcedureParams SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Procedures SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Properties SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System ReferenceKeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Schemas SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS System VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Columns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS DataTypes SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS KeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Keys SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS ProcedureParams SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Procedures SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Properties SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS ReferenceKeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Schemas SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT1 HugeA TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT1 HugeB TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT1 LargeA TABLE <null> <null> <null> <null> <null> <null> true @@ -123,14 +123,14 @@ QT_Ora9DS XQTRecursiveDoc testSimpleTempTable.MappingClasses.TemporaryTable1 XMLSTAGINGTABLE <null> <null> <null> <null> <null> <null> false Row Count : 121 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Tables 255 255 0 false true false true 1 false true true true -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Tables 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Tables 255 255 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 QT_Ora9DS java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Tables 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true TYPE_CAT 12 QT_Ora9DS java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 QT_Ora9DS java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 QT_Ora9DS java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 QT_Ora9DS java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean System Tables 5 1 0 false true false false 0 true true false false +ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTable.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTable.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTable.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,16 +1,15 @@ string string string string string string string string string string boolean TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL -QT_Ora9DS System VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true -Row Count : 1 +Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Tables 255 255 0 false true false true 1 false true true true -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Tables 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Tables 255 255 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 QT_Ora9DS java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Tables 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true TYPE_CAT 12 QT_Ora9DS java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 QT_Ora9DS java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 QT_Ora9DS java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 QT_Ora9DS java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean System Tables 5 1 0 false true false false 0 true true false false +ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -51,14 +51,14 @@ QT_Ora9DS XQT xqtFullData TABLE <null> <null> <null> <null> <null> <null> false Row Count : 49 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Tables 255 255 0 false true false true 1 false true true true -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Tables 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Tables 255 255 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 QT_Ora9DS java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Tables 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true TYPE_CAT 12 QT_Ora9DS java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 QT_Ora9DS java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 QT_Ora9DS java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 QT_Ora9DS java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean System Tables 5 1 0 false true false false 0 true true false false +ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -51,14 +51,14 @@ QT_Ora9DS XQT xqtFullData TABLE <null> <null> <null> <null> <null> <null> false Row Count : 49 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string System Tables 255 255 0 false true false true 1 false true true true -TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string System Tables 255 255 0 false true false true 1 false true true true -TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string System Tables 255 255 0 false true false false 0 true true false false +TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 QT_Ora9DS java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -REMARKS 12 QT_Ora9DS java.lang.String REMARKS string System Tables 255 255 0 false true false true 1 false true true true +REMARKS 12 QT_Ora9DS java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true TYPE_CAT 12 QT_Ora9DS java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 QT_Ora9DS java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 QT_Ora9DS java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 QT_Ora9DS java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean System Tables 5 1 0 false true false false 0 true true false false +ISPHYSICAL -7 QT_Ora9DS java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -20,21 +20,21 @@ clob 2005 2147483647 <null> <null> <null> 1 false 3 true true false clob 0 255 <null> <null> 0 Row Count : 18 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TYPE_NAME 12 QT_Ora9DS java.lang.String <null> string System DataTypes 4000 4000 0 false false false false 0 true true false false -DATA_TYPE 4 QT_Ora9DS java.lang.Integer <null> integer System DataTypes 11 10 0 false false false true 1 false true true true -PRECISION 4 QT_Ora9DS java.lang.Integer <null> integer System DataTypes 11 10 0 false false false true 1 false true true true -LITERAL_PREFIX 12 QT_Ora9DS java.lang.String <null> string System DataTypes 4000 4000 0 false false false true 1 false true true true -LITERAL_SUFFIX 12 QT_Ora9DS java.lang.String <null> string System DataTypes 4000 4000 0 false false false true 1 false true true true -CREATE_PARAMS 12 QT_Ora9DS java.lang.String <null> string System DataTypes 4000 4000 0 false false false true 1 false true true true -NULLABLE 5 QT_Ora9DS java.lang.Short <null> short System DataTypes 6 5 0 false false false true 1 false true true true -CASE_SENSITIVE -7 QT_Ora9DS java.lang.Boolean <null> boolean System DataTypes 5 1 0 false true false false 0 true true false false -SEARCHABLE 5 QT_Ora9DS java.lang.Short <null> short System DataTypes 6 5 0 false false false true 1 false true true true -UNSIGNED_ATTRIBUTE -7 QT_Ora9DS java.lang.Boolean <null> boolean System DataTypes 5 1 0 false false false true 1 false true true true -FIXED_PREC_SCALE -7 QT_Ora9DS java.lang.Boolean <null> boolean System DataTypes 5 1 0 false false false true 1 false true true true -AUTO_INCREMENT -7 QT_Ora9DS java.lang.Boolean <null> boolean System DataTypes 5 1 0 false true false false 0 true true true false -LOCAL_TYPE_NAME 12 QT_Ora9DS java.lang.String <null> string System DataTypes 4000 4000 0 false false false false 0 true true false false -MINIMUM_SCALE 5 QT_Ora9DS java.lang.Short <null> short System DataTypes 6 5 0 false false false true 1 false true true true -MAXIMUM_SCALE 5 QT_Ora9DS java.lang.Short <null> short System DataTypes 6 5 0 false false false true 1 false true true true -SQL_DATA_TYPE 4 QT_Ora9DS java.lang.Integer <null> integer System DataTypes 11 10 0 false false false true 1 false true true true -SQL_DATETIME_SUB 4 QT_Ora9DS java.lang.Integer <null> integer System DataTypes 11 10 0 false false false true 1 false true true true -NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer <null> integer System DataTypes 11 10 0 false false false false 1 true true false false +TYPE_NAME 12 QT_Ora9DS java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false false 0 true true false false +DATA_TYPE 4 QT_Ora9DS java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +PRECISION 4 QT_Ora9DS java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +LITERAL_PREFIX 12 QT_Ora9DS java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false true 1 false true true true +LITERAL_SUFFIX 12 QT_Ora9DS java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false true 1 false true true true +CREATE_PARAMS 12 QT_Ora9DS java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false true 1 false true true true +NULLABLE 5 QT_Ora9DS java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +CASE_SENSITIVE -7 QT_Ora9DS java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false true false false 0 true true false false +SEARCHABLE 5 QT_Ora9DS java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +UNSIGNED_ATTRIBUTE -7 QT_Ora9DS java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false false false true 1 false true true true +FIXED_PREC_SCALE -7 QT_Ora9DS java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false false false true 1 false true true true +AUTO_INCREMENT -7 QT_Ora9DS java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false true false false 0 true true true false +LOCAL_TYPE_NAME 12 QT_Ora9DS java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false false 0 true true false false +MINIMUM_SCALE 5 QT_Ora9DS java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +MAXIMUM_SCALE 5 QT_Ora9DS java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +SQL_DATA_TYPE 4 QT_Ora9DS java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +SQL_DATETIME_SUB 4 QT_Ora9DS java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +NUM_PREC_RADIX 4 QT_Ora9DS java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false false 1 true true false false Deleted: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testSuperTables.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testSuperTables.expected 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testSuperTables.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,8 +0,0 @@ -string string string string -TABLE_CAT TABLE_SCHEM TABLE_NAME SUPERTABLE_NAME -Row Count : 0 -getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -TABLE_CAT 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false -TABLE_SCHEM 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false -TABLE_NAME 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false -SUPERTABLE_NAME 12 QT_Ora9DS java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 0 true false false false Copied: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata (from rev 1988, trunk/test-integration/common/src/test/resources/partssupplier) Deleted: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/PartsSupplier.vdb =================================================================== (Binary files differ) Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCatalogs.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCatalogs.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCatalogs.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,5 @@ +string +TABLE_CAT +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 PartsSupplier java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 1 true false false false Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,167 @@ +string string string string short string integer string integer integer integer string string string string integer integer string string string string ! string string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TABLE! SOURCE_DATA_TYPE IS_AUTOINCREMENT +PartsSupplier SYS Columns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns TableName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 5 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns DataType 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Scale 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 8 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Length 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns IsLengthFixed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 10 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns SupportsSelect -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 11 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 12 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 13 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns IsSigned -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 14 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns IsCurrency -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 15 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 16 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 17 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns MinRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 18 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns MaxRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 19 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 20 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Format 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 21 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns DefaultValue 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 22 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 23 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 24 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns CharOctetLength 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 25 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 26 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 27 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Columns Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 28 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes Name 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes IsStandard -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes IsPhysical -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 3 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes TypeName 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 4 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 5 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes Scale 4 integer 10 <null> 0 10 1 <null> (0) <null> <null> 10 6 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 7 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 8 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes IsSigned -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 9 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 10 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 11 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes Radix 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 13 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 14 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 15 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes RuntimeType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 16 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes BaseType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 17 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS DataTypes Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 18 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns KeyName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns KeyType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 6 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 7 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS KeyColumns Position 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 9 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 7 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys IsIndexed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 9 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Keys UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 10 YES <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID 12 string 4 <null> 0 10 0 <null> <null> <null> <null> 4 1 YES <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_COLOR 12 string 30 <null> 0 10 1 <null> <null> <null> <null> 30 3 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_WEIGHT 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_ID 5 short 2 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_NAME 12 string 30 <null> 0 10 1 <null> <null> <null> <null> 30 2 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID 5 short 2 <null> 0 10 0 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_NAME 12 string 30 <null> 0 10 1 <null> <null> <null> <null> 30 2 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 1 YES <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_NAME 12 string 30 <null> 0 10 1 <null> <null> <null> <null> 30 2 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS 5 short 2 <null> 0 10 1 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_CITY 12 string 30 <null> 0 10 1 <null> <null> <null> <null> 30 4 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATE 12 string 2 <null> 0 10 1 <null> <null> <null> <null> 2 5 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 1 YES <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID 12 string 4 <null> 0 10 0 <null> <null> <null> <null> 4 2 YES <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS QUANTITY 5 short 3 <null> 0 10 1 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SHIPPER_ID 5 short 2 <null> 0 10 1 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams ProcedureName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams DataType 12 string 25 <null> 0 10 0 <null> <null> <null> <null> 25 5 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 6 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams Type 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams Optional -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 10 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams Scale 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 11 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams NullType 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 13 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ProcedureParams UID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 14 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Procedures VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Procedures SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Procedures Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Procedures NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Procedures ReturnsResults -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 5 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Procedures UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 6 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Procedures Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 7 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Properties Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Properties Value 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Properties UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns PKTABLE_CAT 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns PKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns PKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns PKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns FKTABLE_CAT 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns FKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns FKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 7 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns FKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 8 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns KEY_SEQ 5 short 5 <null> 0 10 1 <null> <null> <null> <null> 5 9 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns UPDATE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 10 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns DELETE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 11 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns FK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 12 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns PK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 13 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS ReferenceKeyColumns DEFERRABILITY 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 14 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Schemas VDBName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Schemas Name 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Schemas IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Schemas UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 4 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Schemas Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Schemas PrimaryMetamodelURI 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 6 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables VDBName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables SchemaName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 4 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 6 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 7 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables Cardinality 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 10 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables IsSystem -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 11 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables IsMaterialized -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 12 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS VirtualDatabases Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO +PartsSupplier SYS VirtualDatabases Version 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 2 YES <null> <null> <null> ! <null> NO +Row Count : 140 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 PartsSupplier java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 PartsSupplier java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 PartsSupplier java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false +DATA_TYPE 5 PartsSupplier java.lang.Short DATA_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true +TYPE_NAME 12 PartsSupplier java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false +COLUMN_SIZE 4 PartsSupplier java.lang.Integer COLUMN_SIZE integer <null> <null> 11 10 0 false false false true 1 false true true true +BUFFER_LENGTH 12 PartsSupplier java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true +DECIMAL_DIGITS 4 PartsSupplier java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false +NUM_PREC_RADIX 4 PartsSupplier java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false +NULLABLE 4 PartsSupplier java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true +REMARKS 12 PartsSupplier java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true +COLUMN_DEF 12 PartsSupplier java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false +SQL_DATA_TYPE 12 PartsSupplier java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true +SQL_DATETIME_SUB 12 PartsSupplier java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true +CHAR_OCTET_LENGTH 4 PartsSupplier java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false +ORDINAL_POSITION 4 PartsSupplier java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false +IS_NULLABLE 12 PartsSupplier java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true +SCOPE_CATALOG 12 PartsSupplier java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true +SCOPE_SCHEMA 12 PartsSupplier java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true +SCOPE_TABLE 12 PartsSupplier java.lang.String SCOPE_TABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true +SOURCE_DATA_TYPE 12 PartsSupplier java.lang.String SOURCE_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true +IS_AUTOINCREMENT 12 PartsSupplier java.lang.String IS_AUTOINCREMENT string <null> <null> 4000 4000 0 false false false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,21 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS 1 3 3 FK_SPLIER_STATS PK_STATUS 5 +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID 1 3 3 FK_SPLIER_PRTS_PRTS PK_PARTS 5 +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID 1 3 3 FK_SPLY_PRTS_SPLY PK_SUPPLIER 5 +Row Count : 3 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 PartsSupplier java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 PartsSupplier java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 PartsSupplier java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 PartsSupplier java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 PartsSupplier java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 PartsSupplier java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 PartsSupplier java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 PartsSupplier java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 PartsSupplier java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 PartsSupplier java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 PartsSupplier java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 PartsSupplier java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 PartsSupplier java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 PartsSupplier java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,21 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS 1 3 3 FK_SPLIER_STATS PK_STATUS 5 +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID 1 3 3 FK_SPLIER_PRTS_PRTS PK_PARTS 5 +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID 1 3 3 FK_SPLY_PRTS_SPLY PK_SUPPLIER 5 +Row Count : 3 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 PartsSupplier java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 PartsSupplier java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 PartsSupplier java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 PartsSupplier java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 PartsSupplier java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 PartsSupplier java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 PartsSupplier java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 PartsSupplier java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 PartsSupplier java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 PartsSupplier java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 PartsSupplier java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 PartsSupplier java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 PartsSupplier java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 PartsSupplier java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,21 @@ +string string string string string string string string short integer integer string string integer +PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID 1 3 3 FK_SPLIER_PRTS_PRTS PK_PARTS 5 +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS 1 3 3 FK_SPLIER_STATS PK_STATUS 5 +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID 1 3 3 FK_SPLY_PRTS_SPLY PK_SUPPLIER 5 +Row Count : 3 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PKTABLE_CAT 12 PartsSupplier java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_SCHEM 12 PartsSupplier java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKTABLE_NAME 12 PartsSupplier java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PKCOLUMN_NAME 12 PartsSupplier java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_CAT 12 PartsSupplier java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_SCHEM 12 PartsSupplier java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKTABLE_NAME 12 PartsSupplier java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +FKCOLUMN_NAME 12 PartsSupplier java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +KEY_SEQ 5 PartsSupplier java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true +UPDATE_RULE 4 PartsSupplier java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +DELETE_RULE 4 PartsSupplier java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +FK_NAME 12 PartsSupplier java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +PK_NAME 12 PartsSupplier java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true +DEFERRABILITY 4 PartsSupplier java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,17 @@ +string string string boolean string string integer short string string integer integer string +TABLE_CAT TABLE_SCHEM TABLE_NAME NON_UNIQUE INDEX_QUALIFIER INDEX_NAME TYPE ORDINAL_POSITION COLUMN_NAME ASC_OR_DESC CARDINALITY PAGES FILTER_CONDITION +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 PartsSupplier java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 PartsSupplier java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +NON_UNIQUE -7 PartsSupplier java.lang.Boolean NON_UNIQUE boolean <null> <null> 5 1 0 false false false true 1 false true true true +INDEX_QUALIFIER 12 PartsSupplier java.lang.String INDEX_QUALIFIER string <null> <null> 4000 4000 0 false false false true 1 false true true true +INDEX_NAME 12 PartsSupplier java.lang.String INDEX_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +TYPE 4 PartsSupplier java.lang.Integer TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true +ORDINAL_POSITION 5 PartsSupplier java.lang.Short ORDINAL_POSITION short <null> <null> 6 5 0 false false false true 1 false true true true +COLUMN_NAME 12 PartsSupplier java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +ASC_OR_DESC 12 PartsSupplier java.lang.String ASC_OR_DESC string <null> <null> 4000 4000 0 false false false true 1 false true true true +CARDINALITY 4 PartsSupplier java.lang.Integer CARDINALITY integer <null> <null> 11 10 0 false false false true 1 false true true true +PAGES 4 PartsSupplier java.lang.Integer PAGES integer <null> <null> 11 10 0 false false false true 1 false true true true +FILTER_CONDITION 12 PartsSupplier java.lang.String FILTER_CONDITION string <null> <null> 4000 4000 0 false false false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,16 @@ +string string string string short string +TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID 1 PK_PARTS +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID 2 PK_SUPPLIER_PARTS +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_ID 1 PK_SHIP_VIA +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID 1 PK_STATUS +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID 1 PK_SUPPLIER_PARTS +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID 1 PK_SUPPLIER +Row Count : 6 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 PartsSupplier java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false +TABLE_SCHEM 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 PartsSupplier java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false +COLUMN_NAME 12 PartsSupplier java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +KEY_SEQ 5 PartsSupplier java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true +PK_NAME 12 PartsSupplier java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,32 @@ +string string string string short integer string integer integer short integer integer string string string string string integer string string +PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME COLUMN_TYPE DATA_TYPE TYPE_NAME PRECISION LENGTH SCALE RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME +PartsSupplier SYS getBinaryVDBResource resourcePath 1 12 string 50 50 0 10 0 <null> <null> <null> <null> <null> 1 NO getBinaryVDBResource +PartsSupplier SYS getBinaryVDBResource VdbResource 3 2004 blob 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getBinaryVDBResource +PartsSupplier SYS getCharacterVDBResource resourcePath 1 12 string 50 50 0 10 0 <null> <null> <null> <null> <null> 1 NO getCharacterVDBResource +PartsSupplier SYS getCharacterVDBResource VdbResource 3 2005 clob 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getCharacterVDBResource +PartsSupplier SYS getVDBResourcePaths ResourcePath 3 12 string 50 50 0 10 1 <null> <null> <null> <null> <null> 1 YES getVDBResourcePaths +PartsSupplier SYS getVDBResourcePaths isBinary 3 -7 boolean 1 1 0 10 1 <null> <null> <null> <null> <null> 2 YES getVDBResourcePaths +PartsSupplier SYS getXMLSchemas document 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO getXMLSchemas +PartsSupplier SYS getXMLSchemas schema 3 2009 xml 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getXMLSchemas +Row Count : 8 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PROCEDURE_CAT 12 PartsSupplier java.lang.String PROCEDURE_CAT string SYS ProcedureParams 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 PartsSupplier java.lang.String PROCEDURE_SCHEM string SYS ProcedureParams 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 PartsSupplier java.lang.String PROCEDURE_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false +COLUMN_NAME 12 PartsSupplier java.lang.String COLUMN_NAME string SYS ProcedureParams 255 255 0 false false false false 0 true true false false +COLUMN_TYPE 5 PartsSupplier java.lang.Short COLUMN_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true +DATA_TYPE 4 PartsSupplier java.lang.Integer DATA_TYPE integer <null> <null> 11 10 0 false false false true 1 false true true true +TYPE_NAME 12 PartsSupplier java.lang.String TYPE_NAME string SYS ProcedureParams 25 25 0 false true false false 0 true true true false +PRECISION 4 PartsSupplier java.lang.Integer PRECISION integer <null> <null> 11 10 0 false false false true 1 false true true true +LENGTH 4 PartsSupplier java.lang.Integer LENGTH integer <null> <null> 11 10 0 false false false true 1 false true true true +SCALE 5 PartsSupplier java.lang.Short SCALE short <null> <null> 6 5 0 false false false true 1 false true true true +RADIX 4 PartsSupplier java.lang.Integer RADIX integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false +NULLABLE 4 PartsSupplier java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true +REMARKS 12 PartsSupplier java.lang.String REMARKS string <null> <null> 4000 4000 0 false false false true 1 false true true true +COLUMN_DEF 12 PartsSupplier java.lang.String COLUMN_DEF string <null> <null> 4000 4000 0 false false false true 1 false true true true +SQL_DATA_TYPE 12 PartsSupplier java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true +SQL_DATETIME_SUB 12 PartsSupplier java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true +CHAR_OCTET_LENGTH 12 PartsSupplier java.lang.String CHAR_OCTET_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true +ORDINAL_POSITION 4 PartsSupplier java.lang.Integer ORDINAL_POSITION integer SYS ProcedureParams 11 10 0 false false false false 0 true true false false +IS_NULLABLE 12 PartsSupplier java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true +SPECIFIC_NAME 12 PartsSupplier java.lang.String SPECIFIC_NAME string SYS ProcedureParams 255 255 0 false true false false 0 true true false false Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,17 @@ +string string string string string string string short string +PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME RESERVED_1 RESERVED_2 RESERVED_3 REMARKS PROCEDURE_TYPE SPECIFIC_NAME +PartsSupplier SYS getBinaryVDBResource <null> <null> <null> <null> 2 getBinaryVDBResource +PartsSupplier SYS getCharacterVDBResource <null> <null> <null> <null> 2 getCharacterVDBResource +PartsSupplier SYS getVDBResourcePaths <null> <null> <null> <null> 2 getVDBResourcePaths +PartsSupplier SYS getXMLSchemas <null> <null> <null> <null> 2 getXMLSchemas +Row Count : 4 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +PROCEDURE_CAT 12 PartsSupplier java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false +PROCEDURE_SCHEM 12 PartsSupplier java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_NAME 12 PartsSupplier java.lang.String PROCEDURE_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false +RESERVED_1 12 PartsSupplier java.lang.String RESERVED_1 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_2 12 PartsSupplier java.lang.String RESERVED_2 string <null> <null> 4000 4000 0 false false false true 1 false true true true +RESERVED_3 12 PartsSupplier java.lang.String RESERVED_3 string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 PartsSupplier java.lang.String REMARKS string SYS Procedures 255 255 0 false true false true 1 false true true true +PROCEDURE_TYPE 5 PartsSupplier java.lang.Short PROCEDURE_TYPE short <null> <null> 6 5 0 false false false true 1 false true true true +SPECIFIC_NAME 12 PartsSupplier java.lang.String SPECIFIC_NAME string SYS Procedures 255 255 0 false true false false 0 true true false false Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testSchemas.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testSchemas.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testSchemas.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,8 @@ +string string +TABLE_SCHEM TABLE_CATALOG +PartsSupplier PartsSupplier +SYS PartsSupplier +Row Count : 2 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_SCHEM 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS Schemas 255 255 0 false true false true 1 false true true true +TABLE_CATALOG 12 PartsSupplier java.lang.String TABLE_CATALOG string SYS Schemas 255 255 0 false true false true 1 false true true true Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,31 @@ +string string string string string string string string string string boolean +TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL +PartsSupplier SYS Columns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS DataTypes SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS KeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS Keys SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS ProcedureParams SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS Procedures SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS Properties SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS ReferenceKeyColumns SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS Schemas SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS TABLE <null> <null> <null> <null> <null> <null> true +Row Count : 16 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TABLE_CAT 12 PartsSupplier java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_SCHEM 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +TABLE_NAME 12 PartsSupplier java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false +TABLE_TYPE 12 PartsSupplier java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true +REMARKS 12 PartsSupplier java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true +TYPE_CAT 12 PartsSupplier java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_SCHEM 12 PartsSupplier java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true +TYPE_NAME 12 PartsSupplier java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +SELF_REFERENCING_COL_NAME 12 PartsSupplier java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true +REF_GENERATION 12 PartsSupplier java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true +ISPHYSICAL -7 PartsSupplier java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,40 @@ +string integer integer string string string short boolean short boolean boolean boolean string short short integer integer integer +TYPE_NAME DATA_TYPE PRECISION LITERAL_PREFIX LITERAL_SUFFIX CREATE_PARAMS NULLABLE CASE_SENSITIVE SEARCHABLE UNSIGNED_ATTRIBUTE FIXED_PREC_SCALE AUTO_INCREMENT LOCAL_TYPE_NAME MINIMUM_SCALE MAXIMUM_SCALE SQL_DATA_TYPE SQL_DATETIME_SUB NUM_PREC_RADIX +boolean -7 1 {b' } <null> 1 false 3 true true false boolean 0 255 <null> <null> 0 +byte -6 3 <null> <null> <null> 1 false 3 true true false byte 0 255 <null> <null> 0 +long -5 19 <null> <null> <null> 1 false 3 false false false long 0 255 <null> <null> 10 +char 1 1 ' ' <null> 1 false 3 true true false char 0 255 <null> <null> 0 +bigdecimal 2 20 <null> <null> <null> 1 false 3 false true false bigdecimal 0 255 <null> <null> 10 +biginteger 2 19 <null> <null> <null> 1 false 3 false false false biginteger 0 255 <null> <null> 10 +integer 4 10 <null> <null> <null> 1 false 3 false false false integer 0 255 <null> <null> 10 +short 5 5 <null> <null> <null> 1 false 3 false false false short 0 255 <null> <null> 10 +float 7 20 <null> <null> <null> 1 false 3 false false false float 0 255 <null> <null> 10 +double 8 20 <null> <null> <null> 1 false 3 false false false double 0 255 <null> <null> 10 +string 12 4000 ' ' <null> 1 false 3 true true false string 0 255 <null> <null> 0 +xml 2009 2147483647 <null> <null> <null> 1 false 3 true true false xml 0 255 <null> <null> 0 +date 91 10 {d' } <null> 1 false 3 true true false date 0 255 <null> <null> 0 +time 92 8 {t' } <null> 1 false 3 true true false time 0 255 <null> <null> 0 +timestamp 93 29 {ts' } <null> 1 false 3 true true false timestamp 0 255 <null> <null> 0 +object 2000 2147483647 <null> <null> <null> 1 false 3 true true false object 0 255 <null> <null> 0 +blob 2004 2147483647 <null> <null> <null> 1 false 3 true true false blob 0 255 <null> <null> 0 +clob 2005 2147483647 <null> <null> <null> 1 false 3 true true false clob 0 255 <null> <null> 0 +Row Count : 18 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TYPE_NAME 12 PartsSupplier java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false false 0 true true false false +DATA_TYPE 4 PartsSupplier java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +PRECISION 4 PartsSupplier java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +LITERAL_PREFIX 12 PartsSupplier java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false true 1 false true true true +LITERAL_SUFFIX 12 PartsSupplier java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false true 1 false true true true +CREATE_PARAMS 12 PartsSupplier java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false true 1 false true true true +NULLABLE 5 PartsSupplier java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +CASE_SENSITIVE -7 PartsSupplier java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false true false false 0 true true false false +SEARCHABLE 5 PartsSupplier java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +UNSIGNED_ATTRIBUTE -7 PartsSupplier java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false false false true 1 false true true true +FIXED_PREC_SCALE -7 PartsSupplier java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false false false true 1 false true true true +AUTO_INCREMENT -7 PartsSupplier java.lang.Boolean <null> boolean SYS DataTypes 5 1 0 false true false false 0 true true true false +LOCAL_TYPE_NAME 12 PartsSupplier java.lang.String <null> string SYS DataTypes 4000 4000 0 false false false false 0 true true false false +MINIMUM_SCALE 5 PartsSupplier java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +MAXIMUM_SCALE 5 PartsSupplier java.lang.Short <null> short SYS DataTypes 6 5 0 false false false true 1 false true true true +SQL_DATA_TYPE 4 PartsSupplier java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +SQL_DATETIME_SUB 4 PartsSupplier java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false true 1 false true true true +NUM_PREC_RADIX 4 PartsSupplier java.lang.Integer <null> integer SYS DataTypes 11 10 0 false false false false 1 true true false false Added: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testUDTs.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testUDTs.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testUDTs.expected 2010-03-23 19:22:07 UTC (rev 1991) @@ -0,0 +1,11 @@ +string string string string string string short +TYPE_CAT TYPE_SCHEM TYPE_NAME CLASS_NAME DATA_TYPE REMARKS BASE_TYPE +Row Count : 0 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +TYPE_CAT 12 PartsSupplier java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 2 true false false false +TYPE_SCHEM 12 PartsSupplier java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 2 true false false false +TYPE_NAME 12 PartsSupplier java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 2 true false false false +CLASS_NAME 12 PartsSupplier java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 2 true false false false +DATA_TYPE 12 PartsSupplier java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 2 true false false false +REMARKS 12 PartsSupplier java.lang.String <null> string <null> <null> 4000 4000 0 false false false false 2 true false false false +BASE_TYPE 5 PartsSupplier java.lang.Short <null> short <null> <null> 6 5 0 false false false false 2 true false false false Copied: trunk/test-integration/common/src/test/resources/bqt/bqt.vdb (from rev 1988, trunk/test-integration/db/src/test/resources/bqt/bqt.vdb) =================================================================== (Binary files differ) Property changes on: trunk/test-integration/common/src/test/resources/bqt/bqt.vdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/test-integration/common/src/test/resources/system/expected/Columns.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Columns.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Columns.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,29 +1,29 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -VDBName 12 string java.lang.String 0 Columns System PartsSupplier -SchemaName 12 string java.lang.String 1 Columns System PartsSupplier -TableName 12 string java.lang.String 0 Columns System PartsSupplier -Name 12 string java.lang.String 0 Columns System PartsSupplier -Position 4 integer java.lang.Integer 0 Columns System PartsSupplier -NameInSource 12 string java.lang.String 1 Columns System PartsSupplier -DataType 12 string java.lang.String 0 Columns System PartsSupplier -Scale 4 integer java.lang.Integer 0 Columns System PartsSupplier -ElementLength 4 integer java.lang.Integer 0 Columns System PartsSupplier -IsLengthFixed -7 boolean java.lang.Boolean 0 Columns System PartsSupplier -SupportsSelect -7 boolean java.lang.Boolean 0 Columns System PartsSupplier -SupportsUpdates -7 boolean java.lang.Boolean 0 Columns System PartsSupplier -IsCaseSensitive -7 boolean java.lang.Boolean 0 Columns System PartsSupplier -IsSigned -7 boolean java.lang.Boolean 0 Columns System PartsSupplier -IsCurrency -7 boolean java.lang.Boolean 0 Columns System PartsSupplier -IsAutoIncremented -7 boolean java.lang.Boolean 0 Columns System PartsSupplier -NullType 12 string java.lang.String 0 Columns System PartsSupplier -MinRange 12 string java.lang.String 1 Columns System PartsSupplier -MaxRange 12 string java.lang.String 1 Columns System PartsSupplier -SearchType 12 string java.lang.String 0 Columns System PartsSupplier -Format 12 string java.lang.String 1 Columns System PartsSupplier -DefaultValue 12 string java.lang.String 1 Columns System PartsSupplier -JavaClass 12 string java.lang.String 0 Columns System PartsSupplier -Precision 4 integer java.lang.Integer 0 Columns System PartsSupplier -CharOctetLength 4 integer java.lang.Integer 1 Columns System PartsSupplier -Radix 4 integer java.lang.Integer 0 Columns System PartsSupplier -UID 12 string java.lang.String 0 Columns System PartsSupplier -Description 12 string java.lang.String 1 Columns System PartsSupplier +VDBName 12 string java.lang.String 0 Columns SYS PartsSupplier +SchemaName 12 string java.lang.String 1 Columns SYS PartsSupplier +TableName 12 string java.lang.String 0 Columns SYS PartsSupplier +Name 12 string java.lang.String 0 Columns SYS PartsSupplier +Position 4 integer java.lang.Integer 0 Columns SYS PartsSupplier +NameInSource 12 string java.lang.String 1 Columns SYS PartsSupplier +DataType 12 string java.lang.String 0 Columns SYS PartsSupplier +Scale 4 integer java.lang.Integer 0 Columns SYS PartsSupplier +Length 4 integer java.lang.Integer 0 Columns SYS PartsSupplier +IsLengthFixed -7 boolean java.lang.Boolean 0 Columns SYS PartsSupplier +SupportsSelect -7 boolean java.lang.Boolean 0 Columns SYS PartsSupplier +SupportsUpdates -7 boolean java.lang.Boolean 0 Columns SYS PartsSupplier +IsCaseSensitive -7 boolean java.lang.Boolean 0 Columns SYS PartsSupplier +IsSigned -7 boolean java.lang.Boolean 0 Columns SYS PartsSupplier +IsCurrency -7 boolean java.lang.Boolean 0 Columns SYS PartsSupplier +IsAutoIncremented -7 boolean java.lang.Boolean 0 Columns SYS PartsSupplier +NullType 12 string java.lang.String 0 Columns SYS PartsSupplier +MinRange 12 string java.lang.String 1 Columns SYS PartsSupplier +MaxRange 12 string java.lang.String 1 Columns SYS PartsSupplier +SearchType 12 string java.lang.String 0 Columns SYS PartsSupplier +Format 12 string java.lang.String 1 Columns SYS PartsSupplier +DefaultValue 12 string java.lang.String 1 Columns SYS PartsSupplier +JavaClass 12 string java.lang.String 0 Columns SYS PartsSupplier +Precision 4 integer java.lang.Integer 0 Columns SYS PartsSupplier +CharOctetLength 4 integer java.lang.Integer 1 Columns SYS PartsSupplier +Radix 4 integer java.lang.Integer 0 Columns SYS PartsSupplier +UID 12 string java.lang.String 0 Columns SYS PartsSupplier +Description 12 string java.lang.String 1 Columns SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/Columns.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Columns.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Columns.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,91 +1,91 @@ -VDBName[string] SchemaName[string] TableName[string] Name[string] Position[integer] NameInSource[string] DataType[string] Scale[integer] ElementLength[integer] IsLengthFixed[boolean] SupportsSelect[boolean] SupportsUpdates[boolean] IsCaseSensitive[boolean] IsSigned[boolean] IsCurrency[boolean] IsAutoIncremented[boolean] NullType[string] MinRange[string] MaxRange[string] SearchType[string] Format[string] DefaultValue[string] JavaClass[string] Precision[integer] CharOctetLength[integer] Radix[integer] UID[string] Description[string] -PartsSupplier System DataTypes BaseType 17 null string 0 64 true true false true true false false Nullable null null Searchable null null java.lang.String 64 64 10 mmuuid:03beb57c-968b-4821-a6ae-cb1154cfadee null -PartsSupplier System Tables Cardinality 9 null integer 0 10 false true false true true false false No Nulls null null All Except Like null null java.lang.Integer 10 10 10 mmuuid:24cdad3a-e8f7-4376-bb32-79f8bc8eeed2 null -PartsSupplier System Columns CharOctetLength 25 null integer 0 10 true true false false false false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:de5def94-2804-4c91-91ed-26d630ce8afe null -PartsSupplier System ReferenceKeyColumns DEFERRABILITY 14 null integer 0 10 false true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:88380f55-2cbd-4325-b9a3-9dcaa88a690e null -PartsSupplier System ReferenceKeyColumns DELETE_RULE 11 null integer 0 10 false true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:9207f4df-a5ce-43bd-b3b2-fee57e459849 null -PartsSupplier System Columns DataType 7 null string 0 100 true true false true true false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:9a8dc0d5-e65c-4032-a066-187f8d2e73ea null -PartsSupplier System ProcedureParams DataType 5 null string 0 25 true true false true true false false No Nulls null null Searchable null null java.lang.String 25 25 10 mmuuid:207a09af-65b8-405f-b1cb-537bc8632fa4 null -PartsSupplier System Columns DefaultValue 22 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:7e853988-356b-4c7c-83d4-a9f015bff279 null -PartsSupplier System Columns Description 28 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:74d73b53-b723-419e-9fea-de56408409ee null -PartsSupplier System DataTypes Description 18 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:b7d95ef6-63a3-441c-8de5-c98e2e577ea3 null -PartsSupplier System Keys Description 5 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:175e21b2-24c3-4677-a253-6d7cdb513a9a null -PartsSupplier System Procedures Description 7 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 225 255 10 mmuuid:fa0b5db7-acb1-4975-8410-d5d27df46040 null -PartsSupplier System Schemas Description 5 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:1cb99300-a527-4a26-b4e6-08ebd92a781d null -PartsSupplier System Tables Description 10 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:51605e41-5cb0-40ca-8c4a-4eca52780afc null -PartsSupplier System Columns ElementLength 9 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:b36ea0f6-cbff-4049-bc9c-8ec9928be048 null -PartsSupplier System ReferenceKeyColumns FKCOLUMN_NAME 8 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:f4b2b32c-e411-45e6-a236-fec4718f0874 null -PartsSupplier System ReferenceKeyColumns FKTABLE_CAT 5 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 1 255 10 mmuuid:a0095da3-1258-44dc-bab9-33eacf886a28 null -PartsSupplier System ReferenceKeyColumns FKTABLE_NAME 7 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:53284aaa-4c07-4930-8a0e-5e2aaa2da5cb null -PartsSupplier System ReferenceKeyColumns FKTABLE_SCHEM 6 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:93a35adf-b6b1-4d9c-bdef-d336a84f478e null -PartsSupplier System ReferenceKeyColumns FK_NAME 12 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:a9ca7516-6898-419d-b1ad-7d174d946d07 null -PartsSupplier System Columns Format 21 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:172b133e-5bf1-4020-953c-de4446b1e64a null -PartsSupplier System Columns IsAutoIncremented 16 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:0d41e284-f274-4fd1-8576-7696f4b758d0 null -PartsSupplier System DataTypes IsAutoIncremented 10 null boolean 0 1 true true false true true false false No Nulls null null Searchable null ('0') java.lang.Boolean 1 1 10 mmuuid:2a1568e2-776a-474b-981f-040a6ad63361 null -PartsSupplier System Columns IsCaseSensitive 13 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:21ee166a-b462-41a1-b88d-dc79f63d6e17 null -PartsSupplier System DataTypes IsCaseSensitive 11 null boolean 0 1 true true false true false false false No Nulls null null Searchable null ('0') java.lang.Boolean 1 1 10 mmuuid:1468aaf2-6481-4d10-9554-44d0363fe571 null -PartsSupplier System Columns IsCurrency 15 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:b28a2963-36e0-4b4a-a8f8-a2c06f2b440a null -PartsSupplier System Keys IsIndexed 8 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:ea96cb7c-2dcf-453c-b83a-1aaa921d8f92 null -PartsSupplier System Columns IsLengthFixed 10 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:571aa4ce-3254-4a2b-aa48-1cb23a0c47ed null -PartsSupplier System Tables IsMaterialized 12 null boolean 0 0 false true true false false false false No Nulls null null Searchable null null java.lang.Boolean 0 0 10 mmuuid:89265cba-ab85-48c2-960a-a5a9594ba6d0 null -PartsSupplier System DataTypes IsPhysical 3 null boolean 0 1 true true false true true false false Nullable null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:983714a2-bd0b-4fad-b4e8-dfb7832e9c4b null -PartsSupplier System Schemas IsPhysical 3 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:bab257d7-cced-4605-9b40-8ca6c078aca7 null -PartsSupplier System Tables IsPhysical 6 null boolean 0 1 true true false true false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:e27712f6-a0a6-452e-848d-9de77691e939 null -PartsSupplier System Columns IsSigned 14 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:36be2afa-8ebc-4af8-acc5-a887cf2b5a86 null -PartsSupplier System DataTypes IsSigned 9 null boolean 0 1 true true false true false false false No Nulls null null Searchable null ('0') java.lang.Boolean 1 1 10 mmuuid:235cea48-b2b9-41d5-b296-8ab9c649b6e7 null -PartsSupplier System DataTypes IsStandard 2 null boolean 0 1 true true false true true false false Nullable null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:02f27c5d-af55-4677-b91b-8690793671b2 null -PartsSupplier System Tables IsSystem 11 null boolean 0 1 false true true true true false false Nullable null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:9fa7987c-7dc8-4102-9cc0-5658d5b46382 null -PartsSupplier System Columns JavaClass 23 null string 0 500 true true false true false false false No Nulls null null Searchable null null java.lang.String 500 500 10 mmuuid:6b8d5df5-7bd2-425c-8b2b-e427e026ef66 null -PartsSupplier System DataTypes JavaClass 5 null string 0 500 true true false true false false false No Nulls null null Searchable null null java.lang.String 500 500 10 mmuuid:4c68ef90-8042-44ab-896a-bb3890a8fe04 null -PartsSupplier System ReferenceKeyColumns KEY_SEQ 9 null short 0 5 false true true true true false false Nullable null null Searchable null null java.lang.Short 5 5 10 mmuuid:4884ac83-84ed-4b67-9f1a-bd79c0199269 null -PartsSupplier System KeyColumns KeyName 5 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:da4bef58-83f4-4b88-8bb0-2dc8990be539 null -PartsSupplier System KeyColumns KeyType 6 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:df9e15e6-ab77-486d-bfe0-0adc378aa99d null -PartsSupplier System Columns MaxRange 19 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:0b0df4a5-7de5-4315-94f7-22c84958302e null -PartsSupplier System Columns MinRange 18 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:dba0f97d-fab5-45f6-a1eb-3459ab3fcc74 null -PartsSupplier System Columns Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:d1f44a6d-3e39-4251-b873-1280c2b035b3 null -PartsSupplier System DataTypes Name 1 null string 0 100 true true false true true false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:17f7de33-e6f0-4b9c-b55e-a87f6b7bb9b3 null -PartsSupplier System KeyColumns Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:08bda0c7-5f66-4fed-8285-d74b63eeb0e2 null -PartsSupplier System Keys Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:149de302-2107-45ca-839d-fc0dd1e7d7f4 null -PartsSupplier System ProcedureParams Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:2bf20c6f-5a95-436d-8f30-a24d164e77a4 null -PartsSupplier System Procedures Name 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:bd17e98a-c40a-43b1-93ac-88d62937c051 null -PartsSupplier System Properties Name 1 null string 0 255 true true false true true false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:ba007c56-04b6-4981-ab89-3fdd33ff0de8 null -PartsSupplier System Schemas Name 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:654112f8-bb4c-4453-9e4d-f3a96fba61ec null -PartsSupplier System Tables Name 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:ef487cc2-1214-439c-af6e-da431df00d2c null -PartsSupplier System VirtualDatabases Name 1 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:42fa1249-8b24-4aae-a252-0a347db6ec30 null -PartsSupplier System Columns NameInSource 6 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:fac72c6e-41dc-4a1b-8af3-f0796690d9cc null -PartsSupplier System Keys NameInSource 6 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:a52a6169-99e0-4b7e-9dc6-3a93ffa6094a null -PartsSupplier System Procedures NameInSource 4 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:a4e7a0fd-c340-49a9-9ac0-8328caaffda8 null -PartsSupplier System Tables NameInSource 5 null string 0 255 true true false true false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:1f036fb0-b841-450c-8462-986cdd57e921 null -PartsSupplier System Columns NullType 17 null string 0 20 true true false true false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:4d83bdbb-a7ce-44cc-a201-021a517d3c1a null -PartsSupplier System DataTypes NullType 8 null string 0 20 true true false true false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:278b0534-1164-495e-a8c6-de45e0ff53a4 null -PartsSupplier System ProcedureParams NullType 13 null string 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.String 10 10 10 mmuuid:d887c203-6bf5-462b-b2f0-f5302e2f4bcd null -PartsSupplier System ProcedureParams Optional 8 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:4033f891-5ef5-4a75-8a50-bd1d021e43ad null +VDBName[string] SchemaName[string] TableName[string] Name[string] Position[integer] NameInSource[string] DataType[string] Scale[integer] Length[integer] IsLengthFixed[boolean] SupportsSelect[boolean] SupportsUpdates[boolean] IsCaseSensitive[boolean] IsSigned[boolean] IsCurrency[boolean] IsAutoIncremented[boolean] NullType[string] MinRange[string] MaxRange[string] SearchType[string] Format[string] DefaultValue[string] JavaClass[string] Precision[integer] CharOctetLength[integer] Radix[integer] UID[string] Description[string] +PartsSupplier SYS DataTypes BaseType 17 null string 0 64 true true false true true false false Nullable null null Searchable null null java.lang.String 64 64 10 mmuuid:03beb57c-968b-4821-a6ae-cb1154cfadee null +PartsSupplier SYS Tables Cardinality 9 null integer 0 10 false true false true true false false No Nulls null null All Except Like null null java.lang.Integer 10 10 10 mmuuid:24cdad3a-e8f7-4376-bb32-79f8bc8eeed2 null +PartsSupplier SYS Columns CharOctetLength 25 null integer 0 10 true true false false false false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:de5def94-2804-4c91-91ed-26d630ce8afe null +PartsSupplier SYS ReferenceKeyColumns DEFERRABILITY 14 null integer 0 10 false true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:88380f55-2cbd-4325-b9a3-9dcaa88a690e null +PartsSupplier SYS ReferenceKeyColumns DELETE_RULE 11 null integer 0 10 false true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:9207f4df-a5ce-43bd-b3b2-fee57e459849 null +PartsSupplier SYS Columns DataType 7 null string 0 100 true true false true true false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:9a8dc0d5-e65c-4032-a066-187f8d2e73ea null +PartsSupplier SYS ProcedureParams DataType 5 null string 0 25 true true false true true false false No Nulls null null Searchable null null java.lang.String 25 25 10 mmuuid:207a09af-65b8-405f-b1cb-537bc8632fa4 null +PartsSupplier SYS Columns DefaultValue 22 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:7e853988-356b-4c7c-83d4-a9f015bff279 null +PartsSupplier SYS Columns Description 28 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:74d73b53-b723-419e-9fea-de56408409ee null +PartsSupplier SYS DataTypes Description 18 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:b7d95ef6-63a3-441c-8de5-c98e2e577ea3 null +PartsSupplier SYS Keys Description 5 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:175e21b2-24c3-4677-a253-6d7cdb513a9a null +PartsSupplier SYS Procedures Description 7 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 225 255 10 mmuuid:fa0b5db7-acb1-4975-8410-d5d27df46040 null +PartsSupplier SYS Schemas Description 5 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:1cb99300-a527-4a26-b4e6-08ebd92a781d null +PartsSupplier SYS Tables Description 10 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:51605e41-5cb0-40ca-8c4a-4eca52780afc null +PartsSupplier SYS ReferenceKeyColumns FKCOLUMN_NAME 8 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:f4b2b32c-e411-45e6-a236-fec4718f0874 null +PartsSupplier SYS ReferenceKeyColumns FKTABLE_CAT 5 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 1 255 10 mmuuid:a0095da3-1258-44dc-bab9-33eacf886a28 null +PartsSupplier SYS ReferenceKeyColumns FKTABLE_NAME 7 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:53284aaa-4c07-4930-8a0e-5e2aaa2da5cb null +PartsSupplier SYS ReferenceKeyColumns FKTABLE_SCHEM 6 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:93a35adf-b6b1-4d9c-bdef-d336a84f478e null +PartsSupplier SYS ReferenceKeyColumns FK_NAME 12 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:a9ca7516-6898-419d-b1ad-7d174d946d07 null +PartsSupplier SYS Columns Format 21 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:172b133e-5bf1-4020-953c-de4446b1e64a null +PartsSupplier SYS Columns IsAutoIncremented 16 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:0d41e284-f274-4fd1-8576-7696f4b758d0 null +PartsSupplier SYS DataTypes IsAutoIncremented 10 null boolean 0 1 true true false true true false false No Nulls null null Searchable null ('0') java.lang.Boolean 1 1 10 mmuuid:2a1568e2-776a-474b-981f-040a6ad63361 null +PartsSupplier SYS Columns IsCaseSensitive 13 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:21ee166a-b462-41a1-b88d-dc79f63d6e17 null +PartsSupplier SYS DataTypes IsCaseSensitive 11 null boolean 0 1 true true false true false false false No Nulls null null Searchable null ('0') java.lang.Boolean 1 1 10 mmuuid:1468aaf2-6481-4d10-9554-44d0363fe571 null +PartsSupplier SYS Columns IsCurrency 15 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:b28a2963-36e0-4b4a-a8f8-a2c06f2b440a null +PartsSupplier SYS Keys IsIndexed 8 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:ea96cb7c-2dcf-453c-b83a-1aaa921d8f92 null +PartsSupplier SYS Columns IsLengthFixed 10 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:571aa4ce-3254-4a2b-aa48-1cb23a0c47ed null +PartsSupplier SYS Tables IsMaterialized 12 null boolean 0 0 false true true false false false false No Nulls null null Searchable null null java.lang.Boolean 0 0 10 mmuuid:89265cba-ab85-48c2-960a-a5a9594ba6d0 null +PartsSupplier SYS DataTypes IsPhysical 3 null boolean 0 1 true true false true true false false Nullable null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:983714a2-bd0b-4fad-b4e8-dfb7832e9c4b null +PartsSupplier SYS Schemas IsPhysical 3 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:bab257d7-cced-4605-9b40-8ca6c078aca7 null +PartsSupplier SYS Tables IsPhysical 6 null boolean 0 1 true true false true false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:e27712f6-a0a6-452e-848d-9de77691e939 null +PartsSupplier SYS Columns IsSigned 14 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:36be2afa-8ebc-4af8-acc5-a887cf2b5a86 null +PartsSupplier SYS DataTypes IsSigned 9 null boolean 0 1 true true false true false false false No Nulls null null Searchable null ('0') java.lang.Boolean 1 1 10 mmuuid:235cea48-b2b9-41d5-b296-8ab9c649b6e7 null +PartsSupplier SYS DataTypes IsStandard 2 null boolean 0 1 true true false true true false false Nullable null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:02f27c5d-af55-4677-b91b-8690793671b2 null +PartsSupplier SYS Tables IsSystem 11 null boolean 0 1 false true true true true false false Nullable null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:9fa7987c-7dc8-4102-9cc0-5658d5b46382 null +PartsSupplier SYS Columns JavaClass 23 null string 0 500 true true false true false false false No Nulls null null Searchable null null java.lang.String 500 500 10 mmuuid:6b8d5df5-7bd2-425c-8b2b-e427e026ef66 null +PartsSupplier SYS DataTypes JavaClass 5 null string 0 500 true true false true false false false No Nulls null null Searchable null null java.lang.String 500 500 10 mmuuid:4c68ef90-8042-44ab-896a-bb3890a8fe04 null +PartsSupplier SYS ReferenceKeyColumns KEY_SEQ 9 null short 0 5 false true true true true false false Nullable null null Searchable null null java.lang.Short 5 5 10 mmuuid:4884ac83-84ed-4b67-9f1a-bd79c0199269 null +PartsSupplier SYS KeyColumns KeyName 5 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:da4bef58-83f4-4b88-8bb0-2dc8990be539 null +PartsSupplier SYS KeyColumns KeyType 6 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:df9e15e6-ab77-486d-bfe0-0adc378aa99d null +PartsSupplier SYS Columns Length 9 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:b36ea0f6-cbff-4049-bc9c-8ec9928be048 null +PartsSupplier SYS Columns MaxRange 19 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:0b0df4a5-7de5-4315-94f7-22c84958302e null +PartsSupplier SYS Columns MinRange 18 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:dba0f97d-fab5-45f6-a1eb-3459ab3fcc74 null +PartsSupplier SYS Columns Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:d1f44a6d-3e39-4251-b873-1280c2b035b3 null +PartsSupplier SYS DataTypes Name 1 null string 0 100 true true false true true false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:17f7de33-e6f0-4b9c-b55e-a87f6b7bb9b3 null +PartsSupplier SYS KeyColumns Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:08bda0c7-5f66-4fed-8285-d74b63eeb0e2 null +PartsSupplier SYS Keys Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:149de302-2107-45ca-839d-fc0dd1e7d7f4 null +PartsSupplier SYS ProcedureParams Name 4 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:2bf20c6f-5a95-436d-8f30-a24d164e77a4 null +PartsSupplier SYS Procedures Name 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:bd17e98a-c40a-43b1-93ac-88d62937c051 null +PartsSupplier SYS Properties Name 1 null string 0 255 true true false true true false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:ba007c56-04b6-4981-ab89-3fdd33ff0de8 null +PartsSupplier SYS Schemas Name 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:654112f8-bb4c-4453-9e4d-f3a96fba61ec null +PartsSupplier SYS Tables Name 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:ef487cc2-1214-439c-af6e-da431df00d2c null +PartsSupplier SYS VirtualDatabases Name 1 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:42fa1249-8b24-4aae-a252-0a347db6ec30 null +PartsSupplier SYS Columns NameInSource 6 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:fac72c6e-41dc-4a1b-8af3-f0796690d9cc null +PartsSupplier SYS Keys NameInSource 6 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:a52a6169-99e0-4b7e-9dc6-3a93ffa6094a null +PartsSupplier SYS Procedures NameInSource 4 null string 0 255 true true false false false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:a4e7a0fd-c340-49a9-9ac0-8328caaffda8 null +PartsSupplier SYS Tables NameInSource 5 null string 0 255 true true false true false false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:1f036fb0-b841-450c-8462-986cdd57e921 null +PartsSupplier SYS Columns NullType 17 null string 0 20 true true false true false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:4d83bdbb-a7ce-44cc-a201-021a517d3c1a null +PartsSupplier SYS DataTypes NullType 8 null string 0 20 true true false true false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:278b0534-1164-495e-a8c6-de45e0ff53a4 null +PartsSupplier SYS ProcedureParams NullType 13 null string 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.String 10 10 10 mmuuid:d887c203-6bf5-462b-b2f0-f5302e2f4bcd null +PartsSupplier SYS ProcedureParams Optional 8 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:4033f891-5ef5-4a75-8a50-bd1d021e43ad null PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_COLOR 3 PART_COLOR string 0 30 false true true true true false false Nullable null null Searchable null null java.lang.String 0 30 10 mmuuid:015c0d00-73ff-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID 1 PART_ID string 0 4 true true true true true false false No Nulls null null Searchable null null java.lang.String 0 4 10 mmuuid:fadcd7c0-73fe-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID 2 PART_ID string 0 4 true true true true true false false No Nulls null null Searchable null null java.lang.String 0 4 10 mmuuid:3fc400c0-73ff-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_NAME 2 PART_NAME string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:0067e900-73ff-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_WEIGHT 4 PART_WEIGHT string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:015c0d01-73ff-1edc-a81c-ecf397b10590 null -PartsSupplier System ReferenceKeyColumns PKCOLUMN_NAME 4 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:0125a80a-95f9-486f-aa90-debb21cb5f1b null -PartsSupplier System ReferenceKeyColumns PKTABLE_CAT 1 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 1 255 10 mmuuid:f615a661-2c36-4ab1-b72b-5e13e99e052c null -PartsSupplier System ReferenceKeyColumns PKTABLE_NAME 3 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:6d420bc2-0f85-4da9-833d-d71b428b0743 null -PartsSupplier System ReferenceKeyColumns PKTABLE_SCHEM 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:ef7b3b79-fb51-42ef-a723-080ed0a6e3bc null -PartsSupplier System ReferenceKeyColumns PK_NAME 13 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:ac210a6d-4de6-4d71-aa9b-e3d34baca81a null -PartsSupplier System Columns Position 5 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:dbc8cd09-1b47-43c5-82ec-aba525b85cc4 null -PartsSupplier System KeyColumns Position 9 null integer 0 10 true true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:92a4849c-ed0e-4f5f-a108-d7d71a5aba25 null -PartsSupplier System ProcedureParams Position 6 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:5fdefd17-65f4-4350-9ee0-0ed3c34d10ae null -PartsSupplier System Columns Precision 24 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:db3d49e2-fe1d-438b-8d07-847bf58506ab null -PartsSupplier System DataTypes Precision 12 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:8673c810-7162-4331-ba0b-6fc3530d2d1c null -PartsSupplier System ProcedureParams Precision 9 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:00fe7cad-0a83-42f0-90f2-d6a9584916b2 null -PartsSupplier System Schemas PrimaryMetamodelURI 6 null string 0 255 false true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:eadfaba5-ce44-4529-816f-6af94666baec null -PartsSupplier System ProcedureParams ProcedureName 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:8081b3a6-fc79-42fd-b7c9-a19d682a1658 null +PartsSupplier SYS ReferenceKeyColumns PKCOLUMN_NAME 4 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:0125a80a-95f9-486f-aa90-debb21cb5f1b null +PartsSupplier SYS ReferenceKeyColumns PKTABLE_CAT 1 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 1 255 10 mmuuid:f615a661-2c36-4ab1-b72b-5e13e99e052c null +PartsSupplier SYS ReferenceKeyColumns PKTABLE_NAME 3 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:6d420bc2-0f85-4da9-833d-d71b428b0743 null +PartsSupplier SYS ReferenceKeyColumns PKTABLE_SCHEM 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:ef7b3b79-fb51-42ef-a723-080ed0a6e3bc null +PartsSupplier SYS ReferenceKeyColumns PK_NAME 13 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 255 255 10 mmuuid:ac210a6d-4de6-4d71-aa9b-e3d34baca81a null +PartsSupplier SYS Columns Position 5 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:dbc8cd09-1b47-43c5-82ec-aba525b85cc4 null +PartsSupplier SYS KeyColumns Position 9 null integer 0 10 true true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:92a4849c-ed0e-4f5f-a108-d7d71a5aba25 null +PartsSupplier SYS ProcedureParams Position 6 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:5fdefd17-65f4-4350-9ee0-0ed3c34d10ae null +PartsSupplier SYS Columns Precision 24 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:db3d49e2-fe1d-438b-8d07-847bf58506ab null +PartsSupplier SYS DataTypes Precision 12 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:8673c810-7162-4331-ba0b-6fc3530d2d1c null +PartsSupplier SYS ProcedureParams Precision 9 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:00fe7cad-0a83-42f0-90f2-d6a9584916b2 null +PartsSupplier SYS Schemas PrimaryMetamodelURI 6 null string 0 255 false true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:eadfaba5-ce44-4529-816f-6af94666baec null +PartsSupplier SYS ProcedureParams ProcedureName 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:8081b3a6-fc79-42fd-b7c9-a19d682a1658 null PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS QUANTITY 3 QUANTITY short 0 0 true true true false true false false Nullable null null All Except Like null null java.lang.Short 3 0 10 mmuuid:3fc400c1-73ff-1edc-a81c-ecf397b10590 null -PartsSupplier System Columns Radix 26 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:43a6124c-972f-4c4c-af05-24080c2a8ad7 null -PartsSupplier System DataTypes Radix 13 null integer 0 10 true true false false false false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:967ab8fd-3226-4a78-8cf2-2eb7fbf2981a null -PartsSupplier System ProcedureParams Radix 12 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:8df37c99-3b12-4789-8128-4aa496f895c4 null -PartsSupplier System KeyColumns RefKeyUID 7 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:aafbdf50-25aa-427b-b322-7cb36094a1e2 null -PartsSupplier System Keys RefKeyUID 9 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:1cf4c5ad-5932-47ec-8593-385b75bfeba8 null -PartsSupplier System Procedures ReturnsResults 5 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:b01164c8-dd10-410d-a91b-fcb2fc0450ce null -PartsSupplier System DataTypes RuntimeType 16 null string 0 64 true true false true true false false Nullable null null Searchable null null java.lang.String 64 64 10 mmuuid:3c7bc9d0-b73f-49a0-b9ab-dc97a4d2a124 null +PartsSupplier SYS Columns Radix 26 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:43a6124c-972f-4c4c-af05-24080c2a8ad7 null +PartsSupplier SYS DataTypes Radix 13 null integer 0 10 true true false false false false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:967ab8fd-3226-4a78-8cf2-2eb7fbf2981a null +PartsSupplier SYS ProcedureParams Radix 12 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:8df37c99-3b12-4789-8128-4aa496f895c4 null +PartsSupplier SYS KeyColumns RefKeyUID 7 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:aafbdf50-25aa-427b-b322-7cb36094a1e2 null +PartsSupplier SYS Keys RefKeyUID 9 null string 0 50 true true false false false false false Nullable null null Searchable null null java.lang.String 50 50 10 mmuuid:1cf4c5ad-5932-47ec-8593-385b75bfeba8 null +PartsSupplier SYS Procedures ReturnsResults 5 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:b01164c8-dd10-410d-a91b-fcb2fc0450ce null +PartsSupplier SYS DataTypes RuntimeType 16 null string 0 64 true true false true true false false Nullable null null Searchable null null java.lang.String 64 64 10 mmuuid:3c7bc9d0-b73f-49a0-b9ab-dc97a4d2a124 null PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_ID 1 SHIPPER_ID short 0 0 true true true false true false false No Nulls null null All Except Like null null java.lang.Short 2 0 10 mmuuid:121bc540-73ff-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SHIPPER_ID 4 SHIPPER_ID short 0 0 true true true false true false false Nullable null null All Except Like null null java.lang.Short 2 0 10 mmuuid:3fc400c2-73ff-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_NAME 2 SHIPPER_NAME string 0 30 false true true true true false false Nullable null null Searchable null null java.lang.String 0 30 10 mmuuid:130fe940-73ff-1edc-a81c-ecf397b10590 null @@ -97,45 +97,45 @@ PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_NAME 2 SUPPLIER_NAME string 0 30 false true true true true false false Nullable null null Searchable null null java.lang.String 0 30 10 mmuuid:2f044881-73ff-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATE 5 SUPPLIER_STATE string 0 2 false true true true true false false Nullable null null Searchable null null java.lang.String 0 2 10 mmuuid:2fe92a41-73ff-1edc-a81c-ecf397b10590 null PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS 3 SUPPLIER_STATUS short 0 0 true true true false true false false Nullable null null All Except Like null null java.lang.Short 2 0 10 mmuuid:2f044882-73ff-1edc-a81c-ecf397b10590 null -PartsSupplier System Columns Scale 8 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:cc6c6113-8d70-40c8-84c0-94e17c14e22e null -PartsSupplier System DataTypes Scale 6 null integer 0 10 true true false false false false false Nullable null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:e8655204-e97a-45cd-909b-1e37731e9546 null -PartsSupplier System ProcedureParams Scale 11 null integer 0 10 true true true false false false false No Nulls null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:360c8b1d-4b3d-42fd-952c-bf5763cad69e null -PartsSupplier System Columns SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:859288c9-cd78-4407-90fc-61b5d310e2ab null -PartsSupplier System KeyColumns SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:787be966-cf12-4956-907f-a8e6dc1009dc null -PartsSupplier System Keys SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:4a7fc059-208e-4f98-b6ef-cb7c6102a327 null -PartsSupplier System ProcedureParams SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:88497911-619c-4ca8-b482-8885d940706a null -PartsSupplier System Procedures SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:53a84865-334e-4750-b343-de2411d56e3e null -PartsSupplier System Tables SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:95bd960c-fd84-44c9-9831-692376f69b46 null -PartsSupplier System Columns SearchType 20 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:3037138a-bb20-4485-ba01-75bc20b1a532 null -PartsSupplier System DataTypes SearchType 14 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:d8494fa3-40e4-44cd-b0d8-da5c83685a75 null -PartsSupplier System Columns SupportsSelect 11 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:c2a50f93-0040-41ec-ad7b-e8511296555f null -PartsSupplier System Columns SupportsUpdates 12 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:fab660d1-36bf-4a5b-bbe6-9a543e0ebd76 null -PartsSupplier System Tables SupportsUpdates 7 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:5144d230-2b0e-4255-b321-65b9f6f6f76c null -PartsSupplier System Columns TableName 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:2c09c9d1-2f25-45de-81cf-eeb2a5157d34 null -PartsSupplier System KeyColumns TableName 3 null string 0 2048 true true false true false false false No Nulls null null Searchable null null java.lang.String 2048 2048 10 mmuuid:c24fad72-0c0d-4260-96ae-f188ad77b137 null -PartsSupplier System Keys TableName 3 null string 0 2048 true true false true false false false No Nulls null null Searchable null null java.lang.String 2048 2048 10 mmuuid:7d9540bd-b51f-4206-8c33-b39c5ba8bb8b null -PartsSupplier System Keys Type 7 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:29e73c18-afec-43a9-81ab-7378d6daf20b null -PartsSupplier System ProcedureParams Type 7 null string 0 100 true true false false false false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:76a1981b-1226-4a55-9acf-82a061cc8642 null -PartsSupplier System Tables Type 4 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:4814a0af-4e8f-4f55-9b25-3148d90d3d9b null -PartsSupplier System DataTypes TypeLength 7 null integer 0 10 true true false false false false false No Nulls null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:0668382a-f9c3-4507-8b0f-df65a2ebbf2f null -PartsSupplier System ProcedureParams TypeLength 10 null integer 0 10 true true false false false false false No Nulls null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:791d7a29-8fc5-4735-9144-1accc114b58e null -PartsSupplier System DataTypes TypeName 4 null string 0 100 true true false false false false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:48081cdd-9e90-4440-a956-4a32af96d7f4 null -PartsSupplier System Columns UID 27 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:5f491c75-769b-4908-9f68-2a9a486607bb null -PartsSupplier System DataTypes UID 15 null string 0 50 true true false false true false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:dd57f577-ffc4-4b55-8f7f-355b9ea3ce37 null -PartsSupplier System KeyColumns UID 8 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:0d994a45-4f52-4b79-9b31-7ef22331fee2 null -PartsSupplier System Keys UID 10 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:782218d1-5337-48c6-9070-0aafd4c6cd20 null -PartsSupplier System ProcedureParams UID 14 null string 0 50 false true true true true false false Nullable null null Searchable null null java.lang.String 0 50 10 mmuuid:a278de2e-89f1-4281-9e63-54aebb6062ce null -PartsSupplier System Procedures UID 6 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:de9df25a-c886-46e0-ae3a-8eb6792e43f4 null -PartsSupplier System Properties UID 3 null string 0 50 true true false false true false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:b333969a-83e0-4010-9463-9a0088da6c83 null -PartsSupplier System Schemas UID 4 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:ad232e4d-9c01-4d0c-bc57-0459d9db918a null -PartsSupplier System Tables UID 8 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:6afe3737-26f9-43a8-88db-86531b5dc66c null -PartsSupplier System ReferenceKeyColumns UPDATE_RULE 10 null integer 0 10 false true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:30d5ae74-b19e-4186-97e1-aeff5801e44f null -PartsSupplier System Columns VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:83f19a81-1243-4751-8c99-daddbf37b1d7 null -PartsSupplier System KeyColumns VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:f062eb9c-4854-47fb-b7bd-a4e23c782b62 null -PartsSupplier System Keys VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:5785b523-7da3-42c1-8920-66daa1f7fa1d null -PartsSupplier System ProcedureParams VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:f832f316-2403-43fa-9ccc-c3ab9d38acca null -PartsSupplier System Procedures VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:1d664747-4a95-4605-8b28-381bed3121f1 null -PartsSupplier System Schemas VDBName 1 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:73dbf95b-a283-4f0a-81b9-9b98e09c2906 null -PartsSupplier System Tables VDBName 1 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:58de905f-9d64-4831-a985-da6d082ff709 null -PartsSupplier System Properties Value 2 null string 0 255 true true false true true false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:c917257d-06b7-41dd-a6cb-44c0ff0f897e null -PartsSupplier System VirtualDatabases Version 2 null string 0 50 true true false true false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:c876d749-a512-4810-9910-3034ca524c45 null +PartsSupplier SYS Columns Scale 8 null integer 0 10 true true false false false false false No Nulls null null Searchable null null java.lang.Integer 10 10 10 mmuuid:cc6c6113-8d70-40c8-84c0-94e17c14e22e null +PartsSupplier SYS DataTypes Scale 6 null integer 0 10 true true false false false false false Nullable null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:e8655204-e97a-45cd-909b-1e37731e9546 null +PartsSupplier SYS ProcedureParams Scale 11 null integer 0 10 true true true false false false false No Nulls null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:360c8b1d-4b3d-42fd-952c-bf5763cad69e null +PartsSupplier SYS Columns SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:859288c9-cd78-4407-90fc-61b5d310e2ab null +PartsSupplier SYS KeyColumns SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:787be966-cf12-4956-907f-a8e6dc1009dc null +PartsSupplier SYS Keys SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:4a7fc059-208e-4f98-b6ef-cb7c6102a327 null +PartsSupplier SYS ProcedureParams SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:88497911-619c-4ca8-b482-8885d940706a null +PartsSupplier SYS Procedures SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:53a84865-334e-4750-b343-de2411d56e3e null +PartsSupplier SYS Tables SchemaName 2 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:95bd960c-fd84-44c9-9831-692376f69b46 null +PartsSupplier SYS Columns SearchType 20 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:3037138a-bb20-4485-ba01-75bc20b1a532 null +PartsSupplier SYS DataTypes SearchType 14 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:d8494fa3-40e4-44cd-b0d8-da5c83685a75 null +PartsSupplier SYS Columns SupportsSelect 11 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:c2a50f93-0040-41ec-ad7b-e8511296555f null +PartsSupplier SYS Columns SupportsUpdates 12 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:fab660d1-36bf-4a5b-bbe6-9a543e0ebd76 null +PartsSupplier SYS Tables SupportsUpdates 7 null boolean 0 1 true true false false false false false No Nulls null null Searchable null null java.lang.Boolean 1 1 10 mmuuid:5144d230-2b0e-4255-b321-65b9f6f6f76c null +PartsSupplier SYS Columns TableName 3 null string 0 255 true true false true false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:2c09c9d1-2f25-45de-81cf-eeb2a5157d34 null +PartsSupplier SYS KeyColumns TableName 3 null string 0 2048 true true false true false false false No Nulls null null Searchable null null java.lang.String 2048 2048 10 mmuuid:c24fad72-0c0d-4260-96ae-f188ad77b137 null +PartsSupplier SYS Keys TableName 3 null string 0 2048 true true false true false false false No Nulls null null Searchable null null java.lang.String 2048 2048 10 mmuuid:7d9540bd-b51f-4206-8c33-b39c5ba8bb8b null +PartsSupplier SYS Keys Type 7 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:29e73c18-afec-43a9-81ab-7378d6daf20b null +PartsSupplier SYS ProcedureParams Type 7 null string 0 100 true true false false false false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:76a1981b-1226-4a55-9acf-82a061cc8642 null +PartsSupplier SYS Tables Type 4 null string 0 20 true true false false false false false No Nulls null null Searchable null null java.lang.String 20 20 10 mmuuid:4814a0af-4e8f-4f55-9b25-3148d90d3d9b null +PartsSupplier SYS DataTypes TypeLength 7 null integer 0 10 true true false false false false false No Nulls null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:0668382a-f9c3-4507-8b0f-df65a2ebbf2f null +PartsSupplier SYS ProcedureParams TypeLength 10 null integer 0 10 true true false false false false false No Nulls null null Searchable null (0) java.lang.Integer 10 10 10 mmuuid:791d7a29-8fc5-4735-9144-1accc114b58e null +PartsSupplier SYS DataTypes TypeName 4 null string 0 100 true true false false false false false No Nulls null null Searchable null null java.lang.String 100 100 10 mmuuid:48081cdd-9e90-4440-a956-4a32af96d7f4 null +PartsSupplier SYS Columns UID 27 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:5f491c75-769b-4908-9f68-2a9a486607bb null +PartsSupplier SYS DataTypes UID 15 null string 0 50 true true false false true false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:dd57f577-ffc4-4b55-8f7f-355b9ea3ce37 null +PartsSupplier SYS KeyColumns UID 8 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:0d994a45-4f52-4b79-9b31-7ef22331fee2 null +PartsSupplier SYS Keys UID 10 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:782218d1-5337-48c6-9070-0aafd4c6cd20 null +PartsSupplier SYS ProcedureParams UID 14 null string 0 50 false true true true true false false Nullable null null Searchable null null java.lang.String 0 50 10 mmuuid:a278de2e-89f1-4281-9e63-54aebb6062ce null +PartsSupplier SYS Procedures UID 6 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:de9df25a-c886-46e0-ae3a-8eb6792e43f4 null +PartsSupplier SYS Properties UID 3 null string 0 50 true true false false true false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:b333969a-83e0-4010-9463-9a0088da6c83 null +PartsSupplier SYS Schemas UID 4 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:ad232e4d-9c01-4d0c-bc57-0459d9db918a null +PartsSupplier SYS Tables UID 8 null string 0 50 true true false false false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:6afe3737-26f9-43a8-88db-86531b5dc66c null +PartsSupplier SYS ReferenceKeyColumns UPDATE_RULE 10 null integer 0 10 false true true true true false false Nullable null null Searchable null null java.lang.Integer 10 10 10 mmuuid:30d5ae74-b19e-4186-97e1-aeff5801e44f null +PartsSupplier SYS Columns VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:83f19a81-1243-4751-8c99-daddbf37b1d7 null +PartsSupplier SYS KeyColumns VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:f062eb9c-4854-47fb-b7bd-a4e23c782b62 null +PartsSupplier SYS Keys VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:5785b523-7da3-42c1-8920-66daa1f7fa1d null +PartsSupplier SYS ProcedureParams VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:f832f316-2403-43fa-9ccc-c3ab9d38acca null +PartsSupplier SYS Procedures VDBName 1 null string 0 255 true true false false false false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:1d664747-4a95-4605-8b28-381bed3121f1 null +PartsSupplier SYS Schemas VDBName 1 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:73dbf95b-a283-4f0a-81b9-9b98e09c2906 null +PartsSupplier SYS Tables VDBName 1 null string 0 255 false true true true true false false Nullable null null Searchable null null java.lang.String 0 255 10 mmuuid:58de905f-9d64-4831-a985-da6d082ff709 null +PartsSupplier SYS Properties Value 2 null string 0 255 true true false true true false false No Nulls null null Searchable null null java.lang.String 255 255 10 mmuuid:c917257d-06b7-41dd-a6cb-44c0ff0f897e null +PartsSupplier SYS VirtualDatabases Version 2 null string 0 50 true true false true false false false No Nulls null null Searchable null null java.lang.String 50 50 10 mmuuid:c876d749-a512-4810-9910-3034ca524c45 null Modified: trunk/test-integration/common/src/test/resources/system/expected/DataTypes.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/DataTypes.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/DataTypes.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,19 +1,19 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -Name 12 string java.lang.String 0 DataTypes System PartsSupplier -IsStandard -7 boolean java.lang.Boolean 1 DataTypes System PartsSupplier -IsPhysical -7 boolean java.lang.Boolean 1 DataTypes System PartsSupplier -TypeName 12 string java.lang.String 0 DataTypes System PartsSupplier -JavaClass 12 string java.lang.String 0 DataTypes System PartsSupplier -Scale 4 integer java.lang.Integer 1 DataTypes System PartsSupplier -TypeLength 4 integer java.lang.Integer 0 DataTypes System PartsSupplier -NullType 12 string java.lang.String 0 DataTypes System PartsSupplier -IsSigned -7 boolean java.lang.Boolean 0 DataTypes System PartsSupplier -IsAutoIncremented -7 boolean java.lang.Boolean 0 DataTypes System PartsSupplier -IsCaseSensitive -7 boolean java.lang.Boolean 0 DataTypes System PartsSupplier -Precision 4 integer java.lang.Integer 0 DataTypes System PartsSupplier -Radix 4 integer java.lang.Integer 1 DataTypes System PartsSupplier -SearchType 12 string java.lang.String 0 DataTypes System PartsSupplier -UID 12 string java.lang.String 0 DataTypes System PartsSupplier -RuntimeType 12 string java.lang.String 1 DataTypes System PartsSupplier -BaseType 12 string java.lang.String 1 DataTypes System PartsSupplier -Description 12 string java.lang.String 1 DataTypes System PartsSupplier +Name 12 string java.lang.String 0 DataTypes SYS PartsSupplier +IsStandard -7 boolean java.lang.Boolean 1 DataTypes SYS PartsSupplier +IsPhysical -7 boolean java.lang.Boolean 1 DataTypes SYS PartsSupplier +TypeName 12 string java.lang.String 0 DataTypes SYS PartsSupplier +JavaClass 12 string java.lang.String 0 DataTypes SYS PartsSupplier +Scale 4 integer java.lang.Integer 1 DataTypes SYS PartsSupplier +TypeLength 4 integer java.lang.Integer 0 DataTypes SYS PartsSupplier +NullType 12 string java.lang.String 0 DataTypes SYS PartsSupplier +IsSigned -7 boolean java.lang.Boolean 0 DataTypes SYS PartsSupplier +IsAutoIncremented -7 boolean java.lang.Boolean 0 DataTypes SYS PartsSupplier +IsCaseSensitive -7 boolean java.lang.Boolean 0 DataTypes SYS PartsSupplier +Precision 4 integer java.lang.Integer 0 DataTypes SYS PartsSupplier +Radix 4 integer java.lang.Integer 1 DataTypes SYS PartsSupplier +SearchType 12 string java.lang.String 0 DataTypes SYS PartsSupplier +UID 12 string java.lang.String 0 DataTypes SYS PartsSupplier +RuntimeType 12 string java.lang.String 1 DataTypes SYS PartsSupplier +BaseType 12 string java.lang.String 1 DataTypes SYS PartsSupplier +Description 12 string java.lang.String 1 DataTypes SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/KeyColumns.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/KeyColumns.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/KeyColumns.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,10 +1,10 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -VDBName 12 string java.lang.String 0 KeyColumns System PartsSupplier -SchemaName 12 string java.lang.String 1 KeyColumns System PartsSupplier -TableName 12 string java.lang.String 0 KeyColumns System PartsSupplier -Name 12 string java.lang.String 0 KeyColumns System PartsSupplier -KeyName 12 string java.lang.String 1 KeyColumns System PartsSupplier -KeyType 12 string java.lang.String 0 KeyColumns System PartsSupplier -RefKeyUID 12 string java.lang.String 1 KeyColumns System PartsSupplier -UID 12 string java.lang.String 0 KeyColumns System PartsSupplier -Position 4 integer java.lang.Integer 1 KeyColumns System PartsSupplier +VDBName 12 string java.lang.String 0 KeyColumns SYS PartsSupplier +SchemaName 12 string java.lang.String 1 KeyColumns SYS PartsSupplier +TableName 12 string java.lang.String 0 KeyColumns SYS PartsSupplier +Name 12 string java.lang.String 0 KeyColumns SYS PartsSupplier +KeyName 12 string java.lang.String 1 KeyColumns SYS PartsSupplier +KeyType 12 string java.lang.String 0 KeyColumns SYS PartsSupplier +RefKeyUID 12 string java.lang.String 1 KeyColumns SYS PartsSupplier +UID 12 string java.lang.String 0 KeyColumns SYS PartsSupplier +Position 4 integer java.lang.Integer 1 KeyColumns SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/Keys.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Keys.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Keys.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,11 +1,11 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -VDBName 12 string java.lang.String 0 Keys System PartsSupplier -SchemaName 12 string java.lang.String 1 Keys System PartsSupplier -TableName 12 string java.lang.String 0 Keys System PartsSupplier -Name 12 string java.lang.String 0 Keys System PartsSupplier -Description 12 string java.lang.String 1 Keys System PartsSupplier -NameInSource 12 string java.lang.String 1 Keys System PartsSupplier -Type 12 string java.lang.String 0 Keys System PartsSupplier -IsIndexed -7 boolean java.lang.Boolean 0 Keys System PartsSupplier -RefKeyUID 12 string java.lang.String 1 Keys System PartsSupplier -UID 12 string java.lang.String 0 Keys System PartsSupplier +VDBName 12 string java.lang.String 0 Keys SYS PartsSupplier +SchemaName 12 string java.lang.String 1 Keys SYS PartsSupplier +TableName 12 string java.lang.String 0 Keys SYS PartsSupplier +Name 12 string java.lang.String 0 Keys SYS PartsSupplier +Description 12 string java.lang.String 1 Keys SYS PartsSupplier +NameInSource 12 string java.lang.String 1 Keys SYS PartsSupplier +Type 12 string java.lang.String 0 Keys SYS PartsSupplier +IsIndexed -7 boolean java.lang.Boolean 0 Keys SYS PartsSupplier +RefKeyUID 12 string java.lang.String 1 Keys SYS PartsSupplier +UID 12 string java.lang.String 0 Keys SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,15 +1,15 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -VDBName 12 string java.lang.String 0 ProcedureParams System PartsSupplier -SchemaName 12 string java.lang.String 1 ProcedureParams System PartsSupplier -ProcedureName 12 string java.lang.String 0 ProcedureParams System PartsSupplier -Name 12 string java.lang.String 0 ProcedureParams System PartsSupplier -DataType 12 string java.lang.String 0 ProcedureParams System PartsSupplier -Position 4 integer java.lang.Integer 0 ProcedureParams System PartsSupplier -Type 12 string java.lang.String 0 ProcedureParams System PartsSupplier -Optional -7 boolean java.lang.Boolean 0 ProcedureParams System PartsSupplier -Precision 4 integer java.lang.Integer 0 ProcedureParams System PartsSupplier -TypeLength 4 integer java.lang.Integer 0 ProcedureParams System PartsSupplier -Scale 4 integer java.lang.Integer 0 ProcedureParams System PartsSupplier -Radix 4 integer java.lang.Integer 0 ProcedureParams System PartsSupplier -NullType 12 string java.lang.String 0 ProcedureParams System PartsSupplier -UID 12 string java.lang.String 1 ProcedureParams System PartsSupplier +VDBName 12 string java.lang.String 0 ProcedureParams SYS PartsSupplier +SchemaName 12 string java.lang.String 1 ProcedureParams SYS PartsSupplier +ProcedureName 12 string java.lang.String 0 ProcedureParams SYS PartsSupplier +Name 12 string java.lang.String 0 ProcedureParams SYS PartsSupplier +DataType 12 string java.lang.String 0 ProcedureParams SYS PartsSupplier +Position 4 integer java.lang.Integer 0 ProcedureParams SYS PartsSupplier +Type 12 string java.lang.String 0 ProcedureParams SYS PartsSupplier +Optional -7 boolean java.lang.Boolean 0 ProcedureParams SYS PartsSupplier +Precision 4 integer java.lang.Integer 0 ProcedureParams SYS PartsSupplier +TypeLength 4 integer java.lang.Integer 0 ProcedureParams SYS PartsSupplier +Scale 4 integer java.lang.Integer 0 ProcedureParams SYS PartsSupplier +Radix 4 integer java.lang.Integer 0 ProcedureParams SYS PartsSupplier +NullType 12 string java.lang.String 0 ProcedureParams SYS PartsSupplier +UID 12 string java.lang.String 1 ProcedureParams SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/ProcedureParams.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,7 +1,9 @@ VDBName[string] SchemaName[string] ProcedureName[string] Name[string] DataType[string] Position[integer] Type[string] Optional[boolean] Precision[integer] TypeLength[integer] Scale[integer] Radix[integer] NullType[string] UID[string] -PartsSupplier System getVDBResourcePaths ResourcePath string 1 ResultSet false 50 50 0 10 Nullable mmuuid:ebbffdab-ac7e-41ab-974f-62785b3086f9 -PartsSupplier System getBinaryVDBResource VdbResource blob 1 ResultSet false 0 0 0 10 Nullable mmuuid:90d1f79d-bd98-46f4-ae8f-adacc329cf0b -PartsSupplier System getCharacterVDBResource VdbResource clob 1 ResultSet false 0 0 0 10 Nullable mmuuid:111f9fa8-74c9-479a-a184-8db64a1eab3c -PartsSupplier System getVDBResourcePaths isBinary boolean 2 ResultSet false 1 1 0 10 Nullable mmuuid:e8d087da-9833-4422-a255-f0e0fea2cb61 -PartsSupplier System getBinaryVDBResource resourcePath string 1 In false 50 50 0 10 No Nulls mmuuid:25e5065a-454e-4a87-bf71-b6f71b98319f -PartsSupplier System getCharacterVDBResource resourcePath string 1 In false 50 50 0 10 No Nulls mmuuid:c54e777f-3cd0-45ad-a18b-e4e93532984f +PartsSupplier SYS getVDBResourcePaths ResourcePath string 1 ResultSet false 50 50 0 10 Nullable mmuuid:ebbffdab-ac7e-41ab-974f-62785b3086f9 +PartsSupplier SYS getBinaryVDBResource VdbResource blob 1 ResultSet false 0 0 0 10 Nullable mmuuid:90d1f79d-bd98-46f4-ae8f-adacc329cf0b +PartsSupplier SYS getCharacterVDBResource VdbResource clob 1 ResultSet false 0 0 0 10 Nullable mmuuid:111f9fa8-74c9-479a-a184-8db64a1eab3c +PartsSupplier SYS getXMLSchemas document string 1 In false 0 0 0 10 No Nulls mmuuid:41f00dca-7bc1-4593-b2a7-a7d64936c2d4 +PartsSupplier SYS getVDBResourcePaths isBinary boolean 2 ResultSet false 1 1 0 10 Nullable mmuuid:e8d087da-9833-4422-a255-f0e0fea2cb61 +PartsSupplier SYS getBinaryVDBResource resourcePath string 1 In false 50 50 0 10 No Nulls mmuuid:25e5065a-454e-4a87-bf71-b6f71b98319f +PartsSupplier SYS getCharacterVDBResource resourcePath string 1 In false 50 50 0 10 No Nulls mmuuid:c54e777f-3cd0-45ad-a18b-e4e93532984f +PartsSupplier SYS getXMLSchemas schema xml 1 ResultSet false 0 0 0 10 Nullable mmuuid:f0cb82f2-111e-4433-ae77-59a27fa93991 Modified: trunk/test-integration/common/src/test/resources/system/expected/Procedures.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Procedures.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Procedures.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,8 +1,8 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -VDBName 12 string java.lang.String 0 Procedures System PartsSupplier -SchemaName 12 string java.lang.String 1 Procedures System PartsSupplier -Name 12 string java.lang.String 0 Procedures System PartsSupplier -NameInSource 12 string java.lang.String 1 Procedures System PartsSupplier -ReturnsResults -7 boolean java.lang.Boolean 0 Procedures System PartsSupplier -UID 12 string java.lang.String 0 Procedures System PartsSupplier -Description 12 string java.lang.String 1 Procedures System PartsSupplier +VDBName 12 string java.lang.String 0 Procedures SYS PartsSupplier +SchemaName 12 string java.lang.String 1 Procedures SYS PartsSupplier +Name 12 string java.lang.String 0 Procedures SYS PartsSupplier +NameInSource 12 string java.lang.String 1 Procedures SYS PartsSupplier +ReturnsResults -7 boolean java.lang.Boolean 0 Procedures SYS PartsSupplier +UID 12 string java.lang.String 0 Procedures SYS PartsSupplier +Description 12 string java.lang.String 1 Procedures SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/Procedures.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Procedures.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Procedures.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,4 +1,5 @@ VDBName[string] SchemaName[string] Name[string] NameInSource[string] ReturnsResults[boolean] UID[string] Description[string] -PartsSupplier System getBinaryVDBResource null true mmuuid:9bc0b701-b36e-4209-a986-9d38420d2c20 null -PartsSupplier System getCharacterVDBResource null true mmuuid:72464082-00fc-44f0-98b9-8c8f637c6570 null -PartsSupplier System getVDBResourcePaths null true mmuuid:1204d4b2-6f92-428d-bcc5-7b3a0da9a113 null +PartsSupplier SYS getBinaryVDBResource null true mmuuid:9bc0b701-b36e-4209-a986-9d38420d2c20 null +PartsSupplier SYS getCharacterVDBResource null true mmuuid:72464082-00fc-44f0-98b9-8c8f637c6570 null +PartsSupplier SYS getVDBResourcePaths null true mmuuid:1204d4b2-6f92-428d-bcc5-7b3a0da9a113 null +PartsSupplier SYS getXMLSchemas null true mmuuid:2d51a2a4-9966-4bd8-861d-9c0ae8e4b869 null Modified: trunk/test-integration/common/src/test/resources/system/expected/ReferenceKeyColumns.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/ReferenceKeyColumns.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/ReferenceKeyColumns.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,15 +1,15 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -PKTABLE_CAT 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -PKTABLE_SCHEM 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -PKTABLE_NAME 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -PKCOLUMN_NAME 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -FKTABLE_CAT 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -FKTABLE_SCHEM 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -FKTABLE_NAME 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -FKCOLUMN_NAME 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -KEY_SEQ 5 short java.lang.Short 1 ReferenceKeyColumns System PartsSupplier -UPDATE_RULE 4 integer java.lang.Integer 1 ReferenceKeyColumns System PartsSupplier -DELETE_RULE 4 integer java.lang.Integer 1 ReferenceKeyColumns System PartsSupplier -FK_NAME 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -PK_NAME 12 string java.lang.String 1 ReferenceKeyColumns System PartsSupplier -DEFERRABILITY 4 integer java.lang.Integer 1 ReferenceKeyColumns System PartsSupplier +PKTABLE_CAT 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +PKTABLE_SCHEM 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +PKTABLE_NAME 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +PKCOLUMN_NAME 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +FKTABLE_CAT 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +FKTABLE_SCHEM 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +FKTABLE_NAME 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +FKCOLUMN_NAME 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +KEY_SEQ 5 short java.lang.Short 1 ReferenceKeyColumns SYS PartsSupplier +UPDATE_RULE 4 integer java.lang.Integer 1 ReferenceKeyColumns SYS PartsSupplier +DELETE_RULE 4 integer java.lang.Integer 1 ReferenceKeyColumns SYS PartsSupplier +FK_NAME 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +PK_NAME 12 string java.lang.String 1 ReferenceKeyColumns SYS PartsSupplier +DEFERRABILITY 4 integer java.lang.Integer 1 ReferenceKeyColumns SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/Schemas.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Schemas.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Schemas.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,7 +1,7 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -VDBName 12 string java.lang.String 1 Schemas System PartsSupplier -Name 12 string java.lang.String 1 Schemas System PartsSupplier -IsPhysical -7 boolean java.lang.Boolean 0 Schemas System PartsSupplier -UID 12 string java.lang.String 0 Schemas System PartsSupplier -Description 12 string java.lang.String 1 Schemas System PartsSupplier -PrimaryMetamodelURI 12 string java.lang.String 0 Schemas System PartsSupplier +VDBName 12 string java.lang.String 1 Schemas SYS PartsSupplier +Name 12 string java.lang.String 1 Schemas SYS PartsSupplier +IsPhysical -7 boolean java.lang.Boolean 0 Schemas SYS PartsSupplier +UID 12 string java.lang.String 0 Schemas SYS PartsSupplier +Description 12 string java.lang.String 1 Schemas SYS PartsSupplier +PrimaryMetamodelURI 12 string java.lang.String 0 Schemas SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/Schemas.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Schemas.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Schemas.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,3 +1,3 @@ VDBName[string] Name[string] IsPhysical[boolean] UID[string] Description[string] PrimaryMetamodelURI[string] +PartsSupplier SYS true mmuuid:49b9c0f9-2c4c-42d3-9409-2d847d29a1de System http://www.metamatrix.com/metamodels/Relational PartsSupplier PartsSupplier true mmuuid:19c7f380-73d8-1edc-a81c-ecf397b10590 null http://www.metamatrix.com/metamodels/Relational -PartsSupplier System true mmuuid:49b9c0f9-2c4c-42d3-9409-2d847d29a1de System http://www.metamatrix.com/metamodels/Relational Modified: trunk/test-integration/common/src/test/resources/system/expected/TableIsSystem.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/TableIsSystem.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/TableIsSystem.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,2 +1,2 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -Name 12 string java.lang.String 0 Tables System PartsSupplier +Name 12 string java.lang.String 0 Tables SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/Tables.metadata.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Tables.metadata.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Tables.metadata.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,13 +1,13 @@ ColumnName ColumnType ColumnTypeName ColumnClassName isNullable TableName SchemaName CatalogName -VDBName 12 string java.lang.String 1 Tables System PartsSupplier -SchemaName 12 string java.lang.String 1 Tables System PartsSupplier -Name 12 string java.lang.String 0 Tables System PartsSupplier -Type 12 string java.lang.String 0 Tables System PartsSupplier -NameInSource 12 string java.lang.String 1 Tables System PartsSupplier -IsPhysical -7 boolean java.lang.Boolean 0 Tables System PartsSupplier -SupportsUpdates -7 boolean java.lang.Boolean 0 Tables System PartsSupplier -UID 12 string java.lang.String 0 Tables System PartsSupplier -Cardinality 4 integer java.lang.Integer 0 Tables System PartsSupplier -Description 12 string java.lang.String 1 Tables System PartsSupplier -IsSystem -7 boolean java.lang.Boolean 1 Tables System PartsSupplier -IsMaterialized -7 boolean java.lang.Boolean 0 Tables System PartsSupplier +VDBName 12 string java.lang.String 1 Tables SYS PartsSupplier +SchemaName 12 string java.lang.String 1 Tables SYS PartsSupplier +Name 12 string java.lang.String 0 Tables SYS PartsSupplier +Type 12 string java.lang.String 0 Tables SYS PartsSupplier +NameInSource 12 string java.lang.String 1 Tables SYS PartsSupplier +IsPhysical -7 boolean java.lang.Boolean 0 Tables SYS PartsSupplier +SupportsUpdates -7 boolean java.lang.Boolean 0 Tables SYS PartsSupplier +UID 12 string java.lang.String 0 Tables SYS PartsSupplier +Cardinality 4 integer java.lang.Integer 0 Tables SYS PartsSupplier +Description 12 string java.lang.String 1 Tables SYS PartsSupplier +IsSystem -7 boolean java.lang.Boolean 1 Tables SYS PartsSupplier +IsMaterialized -7 boolean java.lang.Boolean 0 Tables SYS PartsSupplier Modified: trunk/test-integration/common/src/test/resources/system/expected/Tables.txt =================================================================== --- trunk/test-integration/common/src/test/resources/system/expected/Tables.txt 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/common/src/test/resources/system/expected/Tables.txt 2010-03-23 19:22:07 UTC (rev 1991) @@ -1,17 +1,17 @@ VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] -PartsSupplier System Columns Table null true false mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 0 null true false -PartsSupplier System DataTypes Table null true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 0 null true false -PartsSupplier System KeyColumns Table null true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 0 null true false -PartsSupplier System Keys Table null true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 0 null true false +PartsSupplier SYS Columns Table null true false mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 0 null true false +PartsSupplier SYS DataTypes Table null true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 0 null true false +PartsSupplier SYS KeyColumns Table null true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 0 null true false +PartsSupplier SYS Keys Table null true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 0 null true false PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 null false false PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 null false false PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 null false false PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 null false false PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 null false false -PartsSupplier System ProcedureParams Table null true false mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 0 null true false -PartsSupplier System Procedures Table null true false mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 0 null true false -PartsSupplier System Properties Table null true false mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 0 null true false -PartsSupplier System ReferenceKeyColumns Table null true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 0 null true false -PartsSupplier System Schemas Table null true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 0 null true false -PartsSupplier System Tables Table null true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 0 null true false -PartsSupplier System VirtualDatabases Table null true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 0 null true false +PartsSupplier SYS ProcedureParams Table null true false mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 0 null true false +PartsSupplier SYS Procedures Table null true false mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 0 null true false +PartsSupplier SYS Properties Table null true false mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 0 null true false +PartsSupplier SYS ReferenceKeyColumns Table null true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 0 null true false +PartsSupplier SYS Schemas Table null true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 0 null true false +PartsSupplier SYS Tables Table null true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 0 null true false +PartsSupplier SYS VirtualDatabases Table null true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 0 null true false Copied: trunk/test-integration/common/src/test/resources/xml-vp/xmlvp_1.vdb (from rev 1988, trunk/test-integration/db/src/test/resources/xml-vp/xmlvp_1.vdb) =================================================================== (Binary files differ) Property changes on: trunk/test-integration/common/src/test/resources/xml-vp/xmlvp_1.vdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/pom.xml 2010-03-23 19:22:07 UTC (rev 1991) @@ -56,6 +56,14 @@ <type>test-jar</type> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>test-integration-common</artifactId> + <type>test-jar</type> + <scope>compile</scope> + <version>${project.version}</version> + </dependency> <dependency> <groupId>ant-contrib</groupId> Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionQueryTestCase.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionQueryTestCase.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionQueryTestCase.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -5,7 +5,7 @@ import javax.sql.XAConnection; -import org.teiid.jdbc.api.AbstractQueryTest; +import org.teiid.jdbc.AbstractQueryTest; import org.teiid.test.framework.connection.ConnectionStrategy; import org.teiid.test.framework.exception.QueryTestFailedException; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -46,7 +46,7 @@ * validate the results of the testcase. * */ -public abstract class AbstractQueryTransactionTest extends org.teiid.jdbc.api.AbstractQueryTest +public abstract class AbstractQueryTransactionTest extends org.teiid.jdbc.AbstractQueryTest implements TransactionQueryTestCase { private static String initialized = null; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/QueryExecution.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/QueryExecution.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/QueryExecution.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -2,7 +2,7 @@ import java.sql.Connection; -import org.teiid.jdbc.api.AbstractQueryTest; +import org.teiid.jdbc.AbstractQueryTest; /** * The QueryExecution class can be used to query the source directly. The intended use Modified: trunk/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -26,7 +26,7 @@ import java.sql.DatabaseMetaData; import org.junit.Test; -import org.teiid.jdbc.api.AbstractMMQueryTestCase; +import org.teiid.jdbc.AbstractMMQueryTestCase; import com.metamatrix.core.util.UnitTestUtil; Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -6,7 +6,7 @@ import java.util.ArrayList; -import org.teiid.jdbc.api.AbstractQueryTest; +import org.teiid.jdbc.AbstractQueryTest; import org.teiid.test.framework.ConfigPropertyNames; import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.query.AbstractQueryTransactionTest; Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.concurrent.TimeoutException; +import org.teiid.jdbc.AbstractQueryTest; import org.teiid.jdbc.TeiidSQLException; -import org.teiid.jdbc.api.AbstractQueryTest; import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.query.AbstractQueryTransactionTest; import org.teiid.test.framework.query.QueryExecution; Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -4,7 +4,7 @@ */ package org.teiid.test.testcases; -import org.teiid.jdbc.api.AbstractQueryTest; +import org.teiid.jdbc.AbstractQueryTest; import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.query.AbstractQueryTransactionTest; import org.teiid.test.framework.query.QueryExecution; Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -6,7 +6,7 @@ import java.util.ArrayList; -import org.teiid.jdbc.api.AbstractQueryTest; +import org.teiid.jdbc.AbstractQueryTest; import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.ConfigPropertyNames.TXN_AUTO_WRAP_OPTIONS; import org.teiid.test.framework.query.AbstractQueryTransactionTest; Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2010-03-23 19:22:07 UTC (rev 1991) @@ -23,7 +23,7 @@ import java.util.ArrayList; -import org.teiid.jdbc.api.AbstractQueryTest; +import org.teiid.jdbc.AbstractQueryTest; import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.ConfigPropertyNames.TXN_AUTO_WRAP_OPTIONS; import org.teiid.test.framework.query.AbstractQueryTransactionTest; Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-03-23 18:25:30 UTC (rev 1990) +++ trunk/test-integration/pom.xml 2010-03-23 19:22:07 UTC (rev 1991) @@ -69,6 +69,10 @@ <artifactId>teiid-adminshell</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + </dependency> <!-- external dependencies --> <dependency> @@ -83,6 +87,11 @@ <artifactId>connector-api</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> <dependency> <groupId>org.jboss.deployers</groupId>