[teiid-commits] teiid SVN: r4245 - in trunk: engine/src/main/java/org/teiid and 21 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Thu Jul 19 11:47:36 EDT 2012


Author: shawkins
Date: 2012-07-19 11:47:33 -0400 (Thu, 19 Jul 2012)
New Revision: 4245

Added:
   trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java
Removed:
   trunk/engine/src/main/java/org/teiid/datatypes/
   trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java
   trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java
   trunk/metadata/src/main/resources/System.vdb
Modified:
   trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
   trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java
   trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
   trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql
   trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
   trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java
   trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
   trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
   trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java
   trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
   trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
   trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
   trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java
   trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
   trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
   trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
   trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java
   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/TestJDBCSocketTransport/testSelect.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/testGetCrossReferenceWithEscape.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected
   trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.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/testGetProceduresWithEscape.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/TestODBCSchema/test_PG_ATTRDEF.expected
   trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
   trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
   trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
   trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
   trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.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/TestSystemVirtualModel/testColumns.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
   trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
Log:
TEIID-2103 fully switching over to ddl based system metadata

Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -482,9 +482,7 @@
 		
 		writeAttribute(writer, Element.NAME.getLocalName(), translator.getName());
 		writeAttribute(writer, Element.TYPE.getLocalName(), translator.getType());
-		if (translator.getDescription() != null) {
-			writeAttribute(writer, Element.DESCRIPTION.getLocalName(), translator.getDescription());
-		}
+		writeAttribute(writer, Element.DESCRIPTION.getLocalName(), translator.getDescription());
 		
 		writeProperties(writer, translator.getProperties());
 		
@@ -497,9 +495,7 @@
 		writeAttribute(writer, Element.TYPE.getLocalName(), model.getModelType().name());
 
 		writeAttribute(writer, Element.VISIBLE.getLocalName(), String.valueOf(model.isVisible()));
-		if (model.getPath() != null) {
-			writeAttribute(writer, Element.PATH.getLocalName(), model.getPath());
-		}
+		writeAttribute(writer, Element.PATH.getLocalName(), model.getPath());
 
 		if (model.getDescription() != null) {
 			writeElement(writer, Element.DESCRIPTION, model.getDescription());
@@ -526,9 +522,7 @@
 		for (Message ve:model.getMessages(false)) {
 			writer.writeStartElement(Element.VALIDATION_ERROR.getLocalName());
 			writeAttribute(writer, Element.VALIDATION_SEVERITY_ATTR.getLocalName(), ve.getSeverity().name());
-			if (ve.getPath() != null) {
-				writeAttribute(writer, Element.PATH.getLocalName(), ve.getPath());
-			}
+			writeAttribute(writer, Element.PATH.getLocalName(), ve.getPath());
 			writer.writeCharacters(ve.getValue());
 			writer.writeEndElement();
 		}

Modified: trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -140,7 +140,8 @@
 			buffer.append(VIEW);
 		}
 		buffer.append(SPACE);
-		buffer.append(table.getName());
+		String name = SQLStringVisitor.escapeSinglePart(table.getName());
+		buffer.append(name);
 		
 		if (table.getColumns() != null) {
 			buffer.append(SPACE);
@@ -179,15 +180,15 @@
 		buffer.append(SQLConstants.Tokens.SEMICOLON);
 		
 		if (table.isInsertPlanEnabled()) {
-			buildTrigger(table.getName(), INSERT, table.getInsertPlan());
+			buildTrigger(name, INSERT, table.getInsertPlan());
 		}
 		
 		if (table.isUpdatePlanEnabled()) {
-			buildTrigger(table.getName(), UPDATE, table.getUpdatePlan());
+			buildTrigger(name, UPDATE, table.getUpdatePlan());
 		}	
 		
 		if (table.isDeletePlanEnabled()) {
-			buildTrigger(table.getName(), DELETE, table.getDeletePlan());
+			buildTrigger(name, DELETE, table.getDeletePlan());
 		}			
 	}
 
@@ -379,17 +380,21 @@
 			}
 		}		
 		
-		if (column.getDefaultValue() != null) {
-			buffer.append(SPACE).append(DEFAULT).append(SPACE).append(TICK).append(StringUtil.replaceAll(column.getDefaultValue(), TICK, TICK + TICK)).append(TICK);
-		}
+		appendDefault(column);
 		
 		// options
 		appendColumnOptions(buffer, column);
 	}
 
+	private void appendDefault(BaseColumn column) {
+		if (column.getDefaultValue() != null) {
+			buffer.append(SPACE).append(DEFAULT).append(SPACE).append(TICK).append(StringUtil.replaceAll(column.getDefaultValue(), TICK, TICK + TICK)).append(TICK);
+		}
+	}
+
 	private void appendColumn(StringBuilder builder, BaseColumn column, boolean includeName, boolean includeType) {
 		if (includeName) {
-			builder.append(column.getName());
+			builder.append(SQLStringVisitor.escapeSinglePart(column.getName()));
 		}
 		if (includeType) {
 			String runtimeTypeName = column.getDatatype().getRuntimeTypeName();
@@ -521,7 +526,7 @@
 		else {
 			buffer.append(FOREIGN);
 		}
-		buffer.append(SPACE).append(PROCEDURE).append(SPACE).append(procedure.getName());
+		buffer.append(SPACE).append(PROCEDURE).append(SPACE).append(SQLStringVisitor.escapeSinglePart(procedure.getName()));
 		buffer.append(LPAREN);
 		
 		boolean first = true;
@@ -590,6 +595,7 @@
 		if (type == Type.ReturnValue) {
 			buffer.append(SPACE).append(NonReserved.RESULT);
 		}
+		appendDefault(param);
 		appendColumnOptions(buffer, param);
 	}	
 
@@ -604,7 +610,7 @@
 		else {
 			buffer.append(VIRTUAL);
 		}
-		buffer.append(SPACE).append(FUNCTION).append(SPACE).append(function.getName());
+		buffer.append(SPACE).append(FUNCTION).append(SPACE).append(SQLStringVisitor.escapeSinglePart(function.getName()));
 		buffer.append(LPAREN);
 		
 		boolean first = true;
@@ -660,7 +666,7 @@
 	}
 
 	private void visit(FunctionParameter param) {
-		buffer.append(param.getName()).append(SPACE).append(param.getType());
+		buffer.append(SQLStringVisitor.escapeSinglePart(param.getName())).append(SPACE).append(param.getType());
 	}
 
     public String toString() {

Copied: trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java (from rev 4243, trunk/engine/src/main/java/org/teiid/datatypes/SystemDataTypes.java)
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java	                        (rev 0)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -0,0 +1,175 @@
+/*
+ * 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.query.metadata;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.teiid.adminapi.impl.ModelMetaData;
+import org.teiid.adminapi.impl.VDBMetaData;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.types.DataTypeManager.DefaultDataTypes;
+import org.teiid.core.util.Assertion;
+import org.teiid.core.util.PropertiesUtils;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Table;
+import org.teiid.query.parser.ParseException;
+import org.teiid.query.parser.QueryParser;
+import org.teiid.query.validator.ValidatorReport;
+import org.teiid.translator.TranslatorException;
+
+public class SystemMetadata {
+	
+	private static SystemMetadata INSTANCE = new SystemMetadata();
+	
+	public static SystemMetadata getInstance() {
+		return INSTANCE;
+	}
+	
+	private List<Datatype> dataTypes = new ArrayList<Datatype>();
+	private Map<String, Datatype> typeMap = new HashMap<String, Datatype>();
+	private MetadataStore systemStore;
+	
+	public SystemMetadata() {
+		InputStream is = SystemMetadata.class.getClassLoader().getResourceAsStream("org/teiid/metadata/types.dat"); //$NON-NLS-1$
+		try {
+			InputStreamReader isr = new InputStreamReader(is, Charset.forName("UTF-8")); //$NON-NLS-1$
+			BufferedReader br = new BufferedReader(isr);
+			String s = br.readLine();
+			String[] props = s.split("\\|"); //$NON-NLS-1$
+			while ((s = br.readLine()) != null) {
+				Datatype dt = new Datatype();
+				String[] vals = s.split("\\|"); //$NON-NLS-1$
+				Properties p = new Properties();
+				for (int i = 0; i < props.length; i++) {
+					if (vals[i].length() != 0) {
+						p.setProperty(props[i], new String(vals[i]));
+					}
+				}
+				PropertiesUtils.setBeanProperties(dt, p, null);
+				dataTypes.add(dt);
+				if (dt.isBuiltin()) {
+					typeMap.put(dt.getRuntimeTypeName(), dt);
+				}
+			}
+			is.close();
+		} catch (IOException e) {
+			throw new TeiidRuntimeException(e);
+		} finally {
+			try {
+				is.close();
+			} catch (IOException e) {
+				throw new TeiidRuntimeException(e);
+			}
+		}
+		addAliasType(DataTypeManager.DataTypeAliases.BIGINT);
+		addAliasType(DataTypeManager.DataTypeAliases.DECIMAL);
+		addAliasType(DataTypeManager.DataTypeAliases.REAL);
+		addAliasType(DataTypeManager.DataTypeAliases.SMALLINT);
+		addAliasType(DataTypeManager.DataTypeAliases.TINYINT);
+		addAliasType(DataTypeManager.DataTypeAliases.VARCHAR);
+		for (String name : DataTypeManager.getAllDataTypeNames()) {
+			if (!name.equals(DefaultDataTypes.NULL)) {
+				Assertion.isNotNull(typeMap.get(name), name);
+			}
+		}
+		
+		VDBMetaData vdb = new VDBMetaData();
+		vdb.setName("System");  //$NON-NLS-1$
+		vdb.setVersion(1);
+		Properties p = new Properties();
+		systemStore = loadSchema(vdb, p, "SYS").asMetadataStore(); //$NON-NLS-1$
+		systemStore.addDataTypes(dataTypes);
+		loadSchema(vdb, p, "SYSADMIN").mergeInto(systemStore); //$NON-NLS-1$
+		MetadataValidator validator = new MetadataValidator();
+		ValidatorReport report = validator.validate(vdb, systemStore);
+		if (report.hasItems()) {
+			throw new TeiidRuntimeException(report.getFailureMessage());
+		}
+	}
+
+	private MetadataFactory loadSchema(VDBMetaData vdb, Properties p, String name) {
+		ModelMetaData mmd = new ModelMetaData();
+		mmd.setName(name);
+		vdb.addModel(mmd);
+		InputStream is = SystemMetadata.class.getClassLoader().getResourceAsStream("org/teiid/metadata/"+name+".sql"); //$NON-NLS-1$ //$NON-NLS-2$
+		try {
+			MetadataFactory factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), name, typeMap, p, null) {
+				@Override
+				public Table addTable(String name) throws TranslatorException {
+					Table t = super.addTable(name);
+					t.setSystem(true);
+					return t;
+				}
+			};
+			QueryParser.getQueryParser().parseDDL(factory, new InputStreamReader(is, Charset.forName("UTF-8"))); //$NON-NLS-1$
+			return factory;
+		} catch (ParseException e) {
+			throw new TeiidRuntimeException(e);
+		} finally {
+			try {
+				is.close();
+			} catch (IOException e) {
+				throw new TeiidRuntimeException(e);
+			}
+		}
+	}
+	
+	private void addAliasType(String alias) {
+		Class<?> typeClass = DataTypeManager.getDataTypeClass(alias);
+		String primaryType = DataTypeManager.getDataTypeName(typeClass);
+		Datatype dt = typeMap.get(primaryType);
+		Assertion.isNotNull(dt, alias);
+		typeMap.put(alias, dt);
+	}
+	
+	/**
+	 * List of all "built-in" datatypes.  Note that the datatype names do not necessarily match the corresponding runtime type names i.e. int vs. integer
+	 * @return
+	 */
+	public List<Datatype> getDataTypes() {
+		return dataTypes;
+	}
+	
+	/**
+	 * Map of runtime types and aliases to built-in datatypes
+	 * @return
+	 */
+	public Map<String, Datatype> getBuiltinTypeMap() {
+		return typeMap;
+	}
+	
+	public MetadataStore getSystemStore() {
+		return systemStore;
+	}
+}


Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
===================================================================
--- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj	2012-07-19 15:47:33 UTC (rev 4245)
@@ -3938,8 +3938,8 @@
 		typeToken = <TIME> |
 		typeToken = <TIMESTAMP> |
 		typeToken = <OBJECT> |
-		typeToken = <BLOB> |
-		typeToken = <CLOB> |
+		(typeToken = <BLOB> ([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} )|
+		(typeToken = <CLOB> ([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} )|
 		(typeToken = <VARBINARY> ([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} ) |
 		typeToken = <XML>
 		
@@ -4179,6 +4179,8 @@
 	ParsedDataType type = null;
 	ProcedureParameter.Type ppType = ProcedureParameter.Type.In;
 	ProcedureParameter param = null;
+	String defaultValue = null;
+	Boolean notNull = null;
 }
 {
 	[((<IN> {ppType = ProcedureParameter.Type.In ;})
@@ -4186,6 +4188,7 @@
 	 |(<INOUT> {ppType = ProcedureParameter.Type.InOut;}))]
 	name = id()
 	type = parseDataType()
+	[<NOT> <NULL> {notNull = true;}]
 	[nonReserved("RESULT")
 	  {
 	    if (ppType != ProcedureParameter.Type.Out) {
@@ -4198,10 +4201,14 @@
 		try {
 			param = factory.addProcedureParameter(validateElementName(name), type.type, ppType, proc);
 			setTypeInfo(type, param);
+			if (notNull != null) {
+				param.setNullType(Column.NullType.No_Nulls);
+			}
 		} catch (TranslatorException e){
 			throw new ParseException(e.getMessage());
 		}
 	}
+	[<DEFAULT_KEYWORD> defaultValue = stringVal() {param.setDefaultValue(defaultValue);}]
 	[optionsClause(param, factory)
 	   {
 	      setColumnOptions(param);
@@ -4229,7 +4236,7 @@
 	  {
 	  	column = addProcColumn(factory, proc, name, type, rs);
 	  }
-	  [<NOT> <NULL> { notNull = true; }]	  
+	  [<NOT> <NULL> {column.setNullType(Column.NullType.No_Nulls);}]	  
 	  [optionsClause(column, factory)
 	   {
 	      setColumnOptions(column);
@@ -4449,7 +4456,7 @@
 	    })+	 
 	  |(<PRIMARY> nonReserved("KEY") { pk = true; })	 
 	  ])
-	 [<DEFAULT_KEYWORD> defalt = stringVal()]
+	 [<DEFAULT_KEYWORD> defalt = stringVal() {column.setDefaultValue(defalt);}]
 	 [optionsClause(column, factory)
 	   {
 	      setColumnOptions(column);
@@ -4477,9 +4484,6 @@
 	     	 	
 	    column.setAutoIncremented(autoIncrement);
 	    column.setNullType(notNull?Column.NullType.No_Nulls:Column.NullType.Nullable);
-	    if (defalt != null){
-	    	column.setDefaultValue(defalt);
-	    }	    
 	 }
 }
 

Modified: trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql
===================================================================
--- trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql	2012-07-19 15:47:33 UTC (rev 4245)
@@ -24,7 +24,7 @@
 	Format string(255),
 	DefaultValue string(255),
 	JavaClass string(500) NOT NULL,
-	Precision integer NOT NULL,
+	"Precision" integer NOT NULL,
 	CharOctetLength integer,
 	Radix integer NOT NULL,
 	UID string(50) NOT NULL,
@@ -44,7 +44,7 @@
 	IsSigned boolean NOT NULL,
 	IsAutoIncremented boolean NOT NULL,
 	IsCaseSensitive boolean NOT NULL,
-	Precision integer NOT NULL,
+	"Precision" integer NOT NULL,
 	Radix integer,
 	SearchType string(20) NOT NULL,
 	UID string(50) NOT NULL,
@@ -90,7 +90,7 @@
 	Position integer NOT NULL,
 	Type string(100) NOT NULL,
 	Optional boolean NOT NULL,
-	Precision integer NOT NULL,
+	"Precision" integer NOT NULL,
 	TypeLength integer NOT NULL,
 	Scale integer NOT NULL,
 	Radix integer NOT NULL,
@@ -113,7 +113,7 @@
 
 CREATE FOREIGN TABLE Properties (
 	Name string(255) NOT NULL,
-	Value string(255) NOT NULL,
+	"Value" string(255) NOT NULL,
 	UID string(50) NOT NULL,
 	OID integer NOT NULL,
 	ClobValue clob(2097152)

Modified: trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
===================================================================
--- trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql	2012-07-19 15:47:33 UTC (rev 4245)
@@ -15,13 +15,13 @@
 	contents blob
 );
 
-CREATE FOREIGN PROCEDURE isLoggable(OUT loggable boolean NOT NULL RESULT, IN level string NOT NULL, IN context string NOT NULL)
+CREATE FOREIGN PROCEDURE isLoggable(OUT loggable boolean NOT NULL RESULT, IN level string NOT NULL DEFAULT 'DEBUG', IN context string NOT NULL DEFAULT 'org.teiid.PROCESSOR')
 OPTIONS (UPDATECOUNT 0)
 
-CREATE FOREIGN PROCEDURE logMsg(OUT logged boolean NOT NULL RESULT, IN level string NOT NULL, IN context string NOT NULL, IN msg object NOT NULL)
+CREATE FOREIGN PROCEDURE logMsg(OUT logged boolean NOT NULL RESULT, IN level string NOT NULL DEFAULT 'DEBUG', IN context string NOT NULL DEFAULT 'org.teiid.PROCESSOR', IN msg object NOT NULL)
 OPTIONS (UPDATECOUNT 0)
 
-CREATE FOREIGN PROCEDURE refreshMatView(IN ViewName string NOT NULL, IN Invalidate boolean NOT NULL, OUT RowsUpdated integer NOT NULL RESULT)
+CREATE FOREIGN PROCEDURE refreshMatView(IN ViewName string NOT NULL, IN Invalidate boolean NOT NULL DEFAULT 'false', OUT RowsUpdated integer NOT NULL RESULT)
 OPTIONS (UPDATECOUNT 0)
 
 CREATE FOREIGN PROCEDURE refreshMatViewRow(IN ViewName string NOT NULL, IN Key object NOT NULL, OUT RowsUpdated integer NOT NULL RESULT)
@@ -30,7 +30,7 @@
 CREATE FOREIGN PROCEDURE setColumnStats(IN tableName string NOT NULL, IN columnName string NOT NULL, IN distinctCount integer, IN nullCount integer, IN max string, IN min string)
 OPTIONS (UPDATECOUNT 0)
 
-CREATE FOREIGN PROCEDURE setProperty(OUT OldValue clob(2097152) NOT NULL RESULT, IN UID string(50) NOT NULL, IN Name string NOT NULL, IN Value clob(2097152))
+CREATE FOREIGN PROCEDURE setProperty(OUT OldValue clob(2097152) NOT NULL RESULT, IN UID string(50) NOT NULL, IN Name string NOT NULL, IN "Value" clob(2097152))
 OPTIONS (UPDATECOUNT 0)
 
 CREATE FOREIGN PROCEDURE setTableStats(IN tableName string NOT NULL, IN cardinality integer NOT NULL)

Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -122,14 +122,14 @@
 	
 	@Test
 	public void testFK() throws Exception {
-		String ddl = "CREATE FOREIGN TABLE G1(g1e1 integer, g1e2 varchar CONSTRAINT PRIMARY KEY(g1e1, g1e2));\n" +
+		String ddl = "CREATE FOREIGN TABLE G1(\"g1-e1\" integer, g1e2 varchar CONSTRAINT PRIMARY KEY(\"g1-e1\", g1e2));\n" +
 				"CREATE FOREIGN TABLE G2( g2e1 integer, g2e2 varchar CONSTRAINT " +
 				"FOREIGN KEY (g2e1, g2e2) REFERENCES G1 (g1e1, g1e2))";
 		
 		String expected = "CREATE FOREIGN TABLE G1 (\n" + 
-				"	g1e1 integer,\n" + 
+				"	\"g1-e1\" integer,\n" + 
 				"	g1e2 string\n" + 
-				"	CONSTRAINT PRIMARY KEY(g1e1, g1e2)\n" + 
+				"	CONSTRAINT PRIMARY KEY(\"g1-e1\", g1e2)\n" + 
 				");\n" + 
 				"\n" + 
 				"CREATE FOREIGN TABLE G2 (\n" + 
@@ -143,10 +143,10 @@
 	
 	@Test
 	public void testOptionalFK() throws Exception {
-		String ddl = "CREATE FOREIGN TABLE G1(g1e1 integer, g1e2 varchar CONSTRAINT PRIMARY KEY(g1e1, g1e2));\n" +
+		String ddl = "CREATE FOREIGN TABLE \"G1+\"(g1e1 integer, g1e2 varchar CONSTRAINT PRIMARY KEY(g1e1, g1e2));\n" +
 				"CREATE FOREIGN TABLE G2( g2e1 integer, g2e2 varchar CONSTRAINT PRIMARY KEY(g2e1, g2e2)," +
 				"FOREIGN KEY (g2e1, g2e2) REFERENCES G1)";
-		String expected = "CREATE FOREIGN TABLE G1 (\n" + 
+		String expected = "CREATE FOREIGN TABLE \"G1+\" (\n" + 
 				"	g1e1 integer,\n" + 
 				"	g1e2 string\n" + 
 				"	CONSTRAINT PRIMARY KEY(g1e1, g1e2)\n" + 

Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -32,10 +32,10 @@
 import org.teiid.adminapi.impl.ModelMetaData;
 import org.teiid.adminapi.impl.VDBMetaData;
 import org.teiid.core.util.ObjectConverterUtil;
-import org.teiid.datatypes.SystemDataTypes;
 import org.teiid.metadata.*;
 import org.teiid.metadata.BaseColumn.NullType;
 import org.teiid.query.metadata.MetadataValidator;
+import org.teiid.query.metadata.SystemMetadata;
 import org.teiid.query.validator.ValidatorReport;
 
 //import static org.junit.Assert.*;
@@ -630,7 +630,7 @@
 	}
 	
 	public static Map<String, Datatype> getDataTypes() {
-		return SystemDataTypes.getInstance().getBuiltinTypeMap();
+		return SystemMetadata.getInstance().getBuiltinTypeMap();
 	}
 	
 	@Test public void testKeyResolve() {

Deleted: trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,91 +0,0 @@
-/*
- * 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.jboss;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.util.concurrent.Executors;
-
-import org.jboss.vfs.TempFileProvider;
-import org.jboss.vfs.VFS;
-import org.jboss.vfs.VirtualFile;
-import org.teiid.core.CoreConstants;
-import org.teiid.core.TeiidRuntimeException;
-import org.teiid.deployers.VDBRepository;
-import org.teiid.metadata.index.IndexMetadataStore;
-import org.teiid.metadata.index.RuntimeMetadataPlugin;
-import org.teiid.runtime.RuntimePlugin;
-
-
-public class SystemVDBDeployer {
-	private VDBRepository vdbRepository;
-	private Closeable file;
-    
-	private static final TempFileProvider PROVIDER;
-    static {
-       try {
-          PROVIDER = TempFileProvider.create("teiid-deployment", Executors.newScheduledThreadPool(2)); //$NON-NLS-1$
-       }
-       catch (final IOException ioe) {
-          throw new RuntimeException("Failed to create temp file provider");//$NON-NLS-1$
-       }
-    }	
-
-	public void start() {
-		try {
-			VirtualFile mountPoint = VFS.getChild("content/" + CoreConstants.SYSTEM_VDB); //$NON-NLS-1$
-			if (!mountPoint.exists()) {
-				InputStream contents = Thread.currentThread().getContextClassLoader().getResourceAsStream(CoreConstants.SYSTEM_VDB);
-				if (contents == null) {
-					 throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40021, RuntimeMetadataPlugin.Util.gs(RuntimePlugin.Event.TEIID40021));
-				}
-				this.file = VFS.mountZip(contents, CoreConstants.SYSTEM_VDB, mountPoint, PROVIDER);
-			}
-			
-			IndexMetadataStore idxStore = new IndexMetadataStore(mountPoint);
-			idxStore.load(null, null);
-			
-			// uri conversion is only to remove the spaces in URL, note this only with above kind situation  
-			this.vdbRepository.setSystemStore(idxStore);
-		} catch (URISyntaxException e) {
-			 throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40022, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40022));
-		} catch (IOException e) {
-			 throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40022, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40022));
-		}
-	}
-
-	public void setVDBRepository(VDBRepository repo) {
-		this.vdbRepository = repo;
-	}	
-	
-	public void stop() {
-		try {
-			if (file != null) {
-				file.close();
-			}
-		} catch (IOException e) {
-			//ignore
-		}
-	}
-}

Deleted: trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,51 +0,0 @@
-/*
- * 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.jboss;
-
-import org.jboss.msc.service.Service;
-import org.jboss.msc.service.StartContext;
-import org.jboss.msc.service.StartException;
-import org.jboss.msc.service.StopContext;
-
-class SystemVDBService implements Service<SystemVDBDeployer> {
-	private SystemVDBDeployer deployer;
-	
-	public SystemVDBService(SystemVDBDeployer deployer){
-		this.deployer = deployer;
-	}
-	
-	@Override
-	public void start(StartContext context) throws StartException {
-		deployer.start();
-	}
-
-	@Override
-	public void stop(StopContext context) {
-		deployer.stop();
-	}
-
-	@Override
-	public SystemVDBDeployer getValue() throws IllegalStateException, IllegalArgumentException {
-		return deployer;
-	}
-
-}

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -233,12 +233,6 @@
     	statusBuilder.addDependency(TeiidServiceNames.VDB_REPO, VDBRepository.class,  statusChecker.vdbRepoInjector);
     	newControllers.add(statusBuilder.install());    	
     	
-    	// System VDB Service
-    	SystemVDBDeployer systemVDB = new SystemVDBDeployer();
-    	systemVDB.setVDBRepository(vdbRepository);
-    	SystemVDBService systemVDBService = new SystemVDBService(systemVDB);
-    	newControllers.add(target.addService(TeiidServiceNames.SYSTEM_VDB, systemVDBService).install());
-    	
     	newControllers.add(RelativePathService.addService(TeiidServiceNames.DATA_DIR, "teiid-data", "jboss.server.data.dir", target)); //$NON-NLS-1$ //$NON-NLS-2$
     	final ObjectsSerializerService serializer = new ObjectsSerializerService();
     	ServiceBuilder<ObjectSerializer> objectSerializerService = target.addService(TeiidServiceNames.OBJECT_SERIALIZER, serializer);
@@ -356,7 +350,6 @@
         engineBuilder.addDependency(ServiceName.JBOSS.append("txn", "XATerminator"), XATerminator.class, engine.getXaTerminatorInjector()); //$NON-NLS-1$ //$NON-NLS-2$
         engineBuilder.addDependency(ServiceName.JBOSS.append("txn", "TransactionManager"), TransactionManager.class, engine.getTxnManagerInjector()); //$NON-NLS-1$ //$NON-NLS-2$
         engineBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferManager.class, engine.getBufferManagerInjector());
-        engineBuilder.addDependency(TeiidServiceNames.SYSTEM_VDB, SystemVDBDeployer.class,  new InjectedValue<SystemVDBDeployer>());
         engineBuilder.addDependency(TeiidServiceNames.TRANSLATOR_REPO, TranslatorRepository.class, engine.getTranslatorRepositoryInjector());
         engineBuilder.addDependency(TeiidServiceNames.VDB_REPO, VDBRepository.class, engine.getVdbRepositoryInjector());
         engineBuilder.addDependency(TeiidServiceNames.AUTHORIZATION_VALIDATOR, AuthorizationValidator.class, engine.getAuthorizationValidatorInjector());

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -34,7 +34,6 @@
 	public static ServiceName DATA_DIR = ServiceName.JBOSS.append("teiid", "data.dir");//$NON-NLS-1$ //$NON-NLS-2$
 	public static ServiceName BUFFER_MGR = ServiceName.JBOSS.append("teiid", "buffer-mgr");//$NON-NLS-1$ //$NON-NLS-2$
 	public static ServiceName TUPLE_BUFFER = ServiceName.JBOSS.append("teiid", "tuple_buffer");//$NON-NLS-1$ //$NON-NLS-2$
-	public static ServiceName SYSTEM_VDB = ServiceName.JBOSS.append("teiid", "system.vdb");//$NON-NLS-1$ //$NON-NLS-2$
 	public static ServiceName AUTHORIZATION_VALIDATOR = ServiceName.JBOSS.append("teiid", "authorization-validator");//$NON-NLS-1$ //$NON-NLS-2$
 	private static ServiceName VDB_SVC_BASE = ServiceName.JBOSS.append("teiid", "vdb"); //$NON-NLS-1$ //$NON-NLS-2$
 	private static ServiceName VDB_FINISHED_SVC_BASE = ServiceName.JBOSS.append("teiid", "vdb-finished"); //$NON-NLS-1$ //$NON-NLS-2$

Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -41,7 +41,6 @@
 import org.teiid.core.TeiidRuntimeException;
 import org.teiid.core.index.IEntryResult;
 import org.teiid.core.util.StringUtil;
-import org.teiid.datatypes.SystemDataTypes;
 import org.teiid.internal.core.index.Index;
 import org.teiid.metadata.*;
 import org.teiid.metadata.FunctionMethod.Determinism;
@@ -238,10 +237,6 @@
 					for (Datatype datatype : systemDatatypes) {
 						uuidToRecord.put(datatype.getUUID(), datatype);
 					}
-				} else {
-					for (Datatype datatype : SystemDataTypes.getInstance().getDataTypes()) {
-						uuidToRecord.put(datatype.getUUID(), datatype);
-					}
 				}
 				for (AbstractMetadataRecord datatypeRecordImpl : uuidToRecord.values()) {
 					addDatatype((Datatype) datatypeRecordImpl);

Deleted: trunk/metadata/src/main/resources/System.vdb
===================================================================
(Binary files differ)

Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
===================================================================
--- trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -36,18 +36,16 @@
 import org.jboss.vfs.TempFileProvider;
 import org.jboss.vfs.VFS;
 import org.jboss.vfs.VirtualFile;
-import org.teiid.core.CoreConstants;
 import org.teiid.core.TeiidRuntimeException;
 import org.teiid.core.util.FileUtils;
 import org.teiid.core.util.LRUCache;
-import org.teiid.metadata.Datatype;
 import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.MetadataStore;
 import org.teiid.query.function.FunctionTree;
 import org.teiid.query.function.SystemFunctionManager;
 import org.teiid.query.function.UDFSource;
 import org.teiid.query.function.metadata.FunctionMetadataReader;
 import org.teiid.query.metadata.CompositeMetadataStore;
+import org.teiid.query.metadata.SystemMetadata;
 import org.teiid.query.metadata.TransformationMetadata;
 
 
@@ -55,7 +53,6 @@
 public class VDBMetadataFactory {
 	
 	public static LRUCache<URL, TransformationMetadata> VDB_CACHE = new LRUCache<URL, TransformationMetadata>(10);
-	private static MetadataStore system;
 	
 	public static TransformationMetadata getVDBMetadata(String vdbFile) {
 		try {
@@ -66,17 +63,6 @@
 		}
     }
 	
-	public static MetadataStore getSystem() {
-		try {
-			if (system == null) {
-				system=  loadMetadata( CoreConstants.SYSTEM_VDB, Thread.currentThread().getContextClassLoader().getResource(CoreConstants.SYSTEM_VDB));
-			}
-			return system;
-		} catch (Exception e) {
-			throw new TeiidRuntimeException(e, "System VDB load error");
-		}
-    }
-	
 	public static TransformationMetadata getVDBMetadata(String vdbName, URL vdbURL, URL udfFile) throws IOException {
 		TransformationMetadata vdbmetadata = VDB_CACHE.get(vdbURL);
 		if (vdbmetadata != null) {
@@ -84,7 +70,7 @@
 		}
 
 		try {
-			IndexMetadataStore imf = loadMetadata(vdbName, vdbURL, getSystem().getDatatypes().values());
+			IndexMetadataStore imf = loadMetadata(vdbName, vdbURL);
 			
 			Collection <FunctionMethod> methods = null;
 			Collection<FunctionTree> trees = null;
@@ -94,7 +80,7 @@
 				trees = Arrays.asList(new FunctionTree(schema, new UDFSource(methods), true));
 			}
 			SystemFunctionManager sfm = new SystemFunctionManager();
-			vdbmetadata = new TransformationMetadata(null, new CompositeMetadataStore(Arrays.asList(getSystem(), imf)), imf.getEntriesPlusVisibilities(), sfm.getSystemFunctions(), trees); 
+			vdbmetadata = new TransformationMetadata(null, new CompositeMetadataStore(Arrays.asList(SystemMetadata.getInstance().getSystemStore(), imf)), imf.getEntriesPlusVisibilities(), sfm.getSystemFunctions(), trees); 
 			VDB_CACHE.put(vdbURL, vdbmetadata);
 			return vdbmetadata;
 		} catch (URISyntaxException e) {
@@ -104,20 +90,15 @@
 		}
     }
 
-	public static IndexMetadataStore loadMetadata(String vdbName, URL url, Collection<Datatype> dataTypes) throws IOException, MalformedURLException, URISyntaxException {
-    	VirtualFile root = VFS.getChild(vdbName);
+	public static IndexMetadataStore loadMetadata(String vdbName, URL url) throws IOException, MalformedURLException, URISyntaxException {
+		VirtualFile root = VFS.getChild(vdbName);
     	if (!root.exists()) {
     		VFS.mountZip(url.openStream(), vdbName, root, TempFileProvider.create("vdbs", Executors.newScheduledThreadPool(2)));
     		// once done this mount should be closed, since this class is only used testing
     		// it is hard to event when the test is done, otherwise we need to elevate the VFS to top
     	}
     	IndexMetadataStore store =  new IndexMetadataStore(root);
-    	store.load(null, dataTypes);
+    	store.load(null, SystemMetadata.getInstance().getDataTypes());
     	return store;
-
-	}	
-	
-	public static IndexMetadataStore loadMetadata(String vdbName, URL url) throws IOException, MalformedURLException, URISyntaxException {
-		return loadMetadata(vdbName, url, null);
 	}
 }

Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -39,7 +39,6 @@
 import org.teiid.adminapi.impl.VDBMetaData;
 import org.teiid.core.CoreConstants;
 import org.teiid.core.util.PropertiesUtils;
-import org.teiid.datatypes.SystemDataTypes;
 import org.teiid.dqp.internal.datamgr.ConnectorManager;
 import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
 import org.teiid.logging.LogConstants;
@@ -49,6 +48,7 @@
 import org.teiid.net.ConnectionException;
 import org.teiid.query.function.SystemFunctionManager;
 import org.teiid.query.metadata.MetadataValidator;
+import org.teiid.query.metadata.SystemMetadata;
 import org.teiid.query.metadata.TransformationMetadata.Resource;
 import org.teiid.query.validator.ValidatorReport;
 import org.teiid.runtime.RuntimePlugin;
@@ -64,12 +64,12 @@
 	private static final int DEFAULT_TIMEOUT_MILLIS = PropertiesUtils.getIntProperty(System.getProperties(), "org.teiid.clientVdbLoadTimeoutMillis", 300000); //$NON-NLS-1$
 	
 	private NavigableMap<VDBKey, CompositeVDB> vdbRepo = new ConcurrentSkipListMap<VDBKey, CompositeVDB>();
-	private MetadataStore systemStore;
+	private MetadataStore systemStore = SystemMetadata.getInstance().getSystemStore();
 	private MetadataStore odbcStore;
 	private boolean odbcEnabled = false;
 	private List<VDBLifeCycleListener> listeners = new CopyOnWriteArrayList<VDBLifeCycleListener>();
 	private SystemFunctionManager systemFunctionManager;
-	private Map<String, Datatype> datatypeMap = SystemDataTypes.getInstance().getBuiltinTypeMap();
+	private Map<String, Datatype> datatypeMap = SystemMetadata.getInstance().getBuiltinTypeMap();
 	private ReentrantLock lock = new ReentrantLock();
 	private Condition vdbAdded = lock.newCondition();
 	

Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -30,7 +30,6 @@
 import org.teiid.dqp.internal.process.DQPConfiguration;
 import org.teiid.dqp.internal.process.TeiidExecutor;
 import org.teiid.dqp.internal.process.ThreadReuseExecutor;
-import org.teiid.metadata.MetadataStore;
 import org.teiid.query.ObjectReplicator;
 import org.teiid.security.SecurityHelper;
 
@@ -39,7 +38,6 @@
 	private SecurityHelper securityHelper;
 	private List<String> securityDomains;
 	private TransactionManager transactionManager;
-	private MetadataStore systemStore;
 	private ObjectReplicator objectReplicator;
 	private WorkManager workManager;
 	private boolean useDisk = true;
@@ -70,12 +68,6 @@
 	public void setTransactionManager(TransactionManager transactionManager) {
 		this.transactionManager = transactionManager;
 	}
-	public MetadataStore getSystemStore() {
-		return systemStore;
-	}
-	public void setSystemStore(MetadataStore systemStore) {
-		this.systemStore = systemStore;
-	}
 	public ObjectReplicator getObjectReplicator() {
 		return objectReplicator;
 	}

Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -54,7 +54,6 @@
 import org.teiid.common.buffer.TupleBufferCache;
 import org.teiid.core.TeiidRuntimeException;
 import org.teiid.core.BundleUtil.Event;
-import org.teiid.datatypes.SystemDataTypes;
 import org.teiid.deployers.CompositeVDB;
 import org.teiid.deployers.UDFMetaData;
 import org.teiid.deployers.VDBLifeCycleListener;
@@ -305,13 +304,6 @@
 		this.eventDistributorFactoryService.start();
 		this.dqp.setEventDistributor(this.eventDistributorFactoryService.getReplicatedEventDistributor());
 		this.replicator = dqpConfiguration.getObjectReplicator();
-		if (dqpConfiguration.getSystemStore() == null) {
-			MetadataStore ms = new MetadataStore();
-			ms.addDataTypes(SystemDataTypes.getInstance().getDataTypes());
-			this.repo.setSystemStore(ms);
-		} else {
-			this.repo.setSystemStore(dqpConfiguration.getSystemStore());
-		}
 		if (dqpConfiguration.getTransactionManager() == null) {
 			LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40089));
 			this.transactionService.setTransactionManager((TransactionManager) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[] {TransactionManager.class}, new InvocationHandler() {

Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -100,9 +100,6 @@
 	}
 
 	public void start(EmbeddedConfiguration config, boolean realBufferMangaer) {
-		if (config.getSystemStore() == null) {
-			config.setSystemStore(VDBMetadataFactory.getSystem());
-		}
 		if (config.getTransactionManager() == null) {
 			config.setTransactionManager(SimpleMock.createSimpleMock(TransactionManager.class));
 			this.transactionService.setXaTerminator(SimpleMock.createSimpleMock(XATerminator.class));

Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -41,7 +41,6 @@
 import org.teiid.metadata.Procedure;
 import org.teiid.metadata.ProcedureParameter;
 import org.teiid.metadata.Table;
-import org.teiid.metadata.index.VDBMetadataFactory;
 import org.teiid.query.parser.QueryParser;
 import org.teiid.translator.TranslatorException;
 import org.teiid.translator.jdbc.teiid.TeiidExecutionFactory;
@@ -73,7 +72,6 @@
 
 	private MetadataFactory createMetadataFactory(String schema, Properties importProperties) {
 		VDBRepository vdbRepository = new VDBRepository();
-    	vdbRepository.setSystemStore(VDBMetadataFactory.getSystem());
     	return new MetadataFactory("vdb", 1, schema, vdbRepository.getBuiltinDatatypes(), importProperties, null);
 	}
 	

Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java	2012-07-19 15:47:33 UTC (rev 4245)
@@ -38,7 +38,6 @@
 import org.teiid.metadata.MetadataFactory;
 import org.teiid.metadata.MetadataStore;
 import org.teiid.metadata.Table;
-import org.teiid.metadata.index.VDBMetadataFactory;
 
 @SuppressWarnings("nls")
 public class TestMatViewAliasing {
@@ -51,7 +50,6 @@
     	server = new FakeServer(true);
     	
     	VDBRepository vdbRepository = new VDBRepository();
-    	vdbRepository.setSystemStore(VDBMetadataFactory.getSystem());
     	MetadataFactory mf = new MetadataFactory(null, 1, "foo", vdbRepository.getBuiltinDatatypes(), new Properties(), null);
     	mf.getSchema().setPhysical(false);
     	Table mat = mf.addTable("mat");

Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -3,73 +3,73 @@
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -3,53 +3,53 @@
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -3,53 +3,53 @@
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             test            java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             test            java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             test            java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             test            java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             test            java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             test            java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             test            java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             test            java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              test            java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              test            java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              test            java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             test            java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             test            java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              test            java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -3,29 +3,29 @@
 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  
-VDBName        12             test            java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             test            java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             test            java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             test            java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             test            java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             test            java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             test            java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             test            java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             test            java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName        12             test            java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             test            java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             test            java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             test            java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             test            java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             test            java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             test            java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             test            java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             test            java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName        12             test            java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             test            java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             test            java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             test            java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             test            java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             test            java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             test            java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             test            java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             test            java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -31,44 +31,44 @@
 test                                                               test                                                               all_tables                                                         TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 Row Count : 29
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName                    12             test            java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             test            java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             test            java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             test            java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             test            java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             test            java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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       
+IsPhysical                 -7             test            java.lang.Boolean   ISPHYSICAL                 boolean            SYS            Tables        5                     1             0         false            false            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  
-VDBName                    12             test            java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             test            java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             test            java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             test            java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             test            java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             test            java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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       
+IsPhysical                 -7             test            java.lang.Boolean   ISPHYSICAL                 boolean            SYS            Tables        5                     1             0         false            false            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  
-VDBName                    12             test            java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             test            java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             test            java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             test            java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             test            java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             test            java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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       
+IsPhysical                 -7             test            java.lang.Boolean   ISPHYSICAL                 boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,23 +1,23 @@
 string                                                             string                                                             string                                                             string                string                                                             boolean     boolean          string                                              integer      string                                                             boolean   boolean         integer    
 VDBName                                                            SchemaName                                                         Name                                                               Type                  NameInSource                                                       IsPhysical  SupportsUpdates  UID                                                 Cardinality  Description                                                        IsSystem  IsMaterialized  OID        
-parts                                                              SYS                                                                Columns                                                            Table                 <null>                                                             true        false            mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509         -1           <null>                                                             true      false           8          
-parts                                                              SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957         -1           <null>                                                             true      false           9          
-parts                                                              SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            mmuuid:14946083-3bd5-42d5-8283-1c0694347c29         -1           <null>                                                             true      false           10         
-parts                                                              SYS                                                                Keys                                                               Table                 <null>                                                             true        false            mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108         -1           <null>                                                             true      false           11         
-parts                                                              SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256         -1           <null>                                                             true      false           6          
+parts                                                              SYS                                                                Columns                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-9bd42fbd-00000001                  -1           <null>                                                             true      false           6          
+parts                                                              SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6130d2cf-00000021                  -1           <null>                                                             true      false           7          
+parts                                                              SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-c5c6549e-00000035                  -1           <null>                                                             true      false           8          
+parts                                                              SYS                                                                Keys                                                               Table                 <null>                                                             true        false            tid:2cb59cfd55db-0023a214-00000040                  -1           <null>                                                             true      false           9          
+parts                                                              SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            tid:60b87e792634-14d6450e-00000001                  -1           <null>                                                             true      false           17         
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                Table                 PARTS                                                              true        true             mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           1          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             Table                 SHIP_VIA                                                           true        true             mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590         4            <null>                                                             false     false           2          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               Table                 STATUS                                                             true        true             mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         3            <null>                                                             false     false           3          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             Table                 SUPPLIER                                                           true        true             mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           4          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       Table                 SUPPLIER_PARTS                                                     true        true             mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         227          <null>                                                             false     false           5          
-parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626         -1           <null>                                                             true      false           12         
-parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962         -1           <null>                                                             true      false           13         
-parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85         -1           <null>                                                             true      false           14         
-parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29         -1           <null>                                                             true      false           15         
-parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9         -1           <null>                                                             true      false           16         
-parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7         -1           <null>                                                             true      false           17         
-parts                                                              SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            mmuuid:1785804d-beaf-4831-9531-e59164fedd49         -1           <null>                                                             true      false           7          
-parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489         -1           <null>                                                             true      false           18         
+parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-0000004c                  -1           <null>                                                             true      false           10         
+parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000005d                  -1           <null>                                                             true      false           11         
+parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000066                  -1           <null>                                                             true      false           12         
+parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000006c                  -1           <null>                                                             true      false           13         
+parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-0000007b                  -1           <null>                                                             true      false           14         
+parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-00000083                  -1           <null>                                                             true      false           15         
+parts                                                              SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            tid:60b87e792634-1e9b1131-0000000b                  -1           <null>                                                             true      false           18         
+parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-00000091                  -1           <null>                                                             true      false           16         
 parts                                                              pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-00000068                  -1           <null>                                                             true      true            19         
 parts                                                              pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-0000005e                  -1           <null>                                                             true      true            20         
 parts                                                              pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-00000031                  -1           <null>                                                             true      false           21         
@@ -33,16 +33,16 @@
 parts                                                              pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-00000059                  -1           <null>                                                             true      false           31         
 Row Count : 31
 getColumnName    getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName          12             parts           java.lang.String    VDBName          string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName       12             parts           java.lang.String    SchemaName       string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName          12             parts           java.lang.String    VDBName          string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName       12             parts           java.lang.String    SchemaName       string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 Name             12             parts           java.lang.String    Name             string             SYS            Tables        255                   255           0         false            true             false       false                 0           true        true          false     false       
-Type             12             parts           java.lang.String    Type             string             SYS            Tables        20                    20            0         false            false            false       false                 0           true        true          false     false       
+Type             12             parts           java.lang.String    Type             string             SYS            Tables        20                    20            0         false            true             false       false                 0           true        true          false     false       
 NameInSource     12             parts           java.lang.String    NameInSource     string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
-IsPhysical       -7             parts           java.lang.Boolean   IsPhysical       boolean            SYS            Tables        5                     1             0         false            true             false       false                 0           true        true          false     false       
+IsPhysical       -7             parts           java.lang.Boolean   IsPhysical       boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       
 SupportsUpdates  -7             parts           java.lang.Boolean   SupportsUpdates  boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       
-UID              12             parts           java.lang.String    UID              string             SYS            Tables        50                    50            0         false            false            false       false                 0           true        true          false     false       
-Cardinality      4              parts           java.lang.Integer   Cardinality      integer            SYS            Tables        11                    10            0         false            true             false       false                 0           true        true          true      false       
-Description      12             parts           java.lang.String    Description      string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-IsSystem         -7             parts           java.lang.Boolean   IsSystem         boolean            SYS            Tables        5                     1             0         false            true             false       true                  1           false       true          true      true        
-IsMaterialized   -7             parts           java.lang.Boolean   IsMaterialized   boolean            SYS            Tables        5                     1             0         false            false            false       true                  0           false       true          false     true        
-OID              4              parts           java.lang.Integer   OID              integer            SYS            Tables        11                    10            0         false            false            false       false                 0           true        true          false     false       
+UID              12             parts           java.lang.String    UID              string             SYS            Tables        50                    50            0         false            true             false       false                 0           true        true          false     false       
+Cardinality      4              parts           java.lang.Integer   Cardinality      integer            SYS            Tables        11                    10            0         false            false            false       false                 0           true        true          true      false       
+Description      12             parts           java.lang.String    Description      string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+IsSystem         -7             parts           java.lang.Boolean   IsSystem         boolean            SYS            Tables        5                     1             0         false            false            false       false                 1           true        true          false     false       
+IsMaterialized   -7             parts           java.lang.Boolean   IsMaterialized   boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       
+OID              4              parts           java.lang.Integer   OID              integer            SYS            Tables        11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -158,56 +158,56 @@
 QT_Ora9DS                                                          VQT                                                                Base.Order3                                                        E                                                                  12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          VQT                                                                Base.Order4                                                        StringNum                                                          12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          VQT                                                                Base.Order5                                                        StringNum                                                          12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            TableName                                                          12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            DataType                                                           12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Length                                                             4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            IsLengthFixed                                                      -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            SupportsSelect                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            IsCurrency                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            NullType                                                           12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 17                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            MinRange                                                           12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            MaxRange                                                           12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 19                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            DistinctCount                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 20                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            NullCount                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 21                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            SearchType                                                         12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 22                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Format                                                             12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                23                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            DefaultValue                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                24                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            JavaClass                                                          12           string                                                             500          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             500                25                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 26                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            CharOctetLength                                                    4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 27                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 28                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 29                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                30                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Columns                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 31                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Name                                                               12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsStandard                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          TypeName                                                           12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          JavaClass                                                          12           string                                                             500          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             500                5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Scale                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          NullType                                                           12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             ('0')                                                              <null>                                                             <null>                                                             1                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             ('0')                                                              <null>                                                             <null>                                                             1                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             ('0')                                                              <null>                                                             <null>                                                             1                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Radix                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          SearchType                                                         12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          RuntimeType                                                        12           string                                                             64           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             64                 16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          BaseType                                                           12           string                                                             64           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             64                 17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                DataTypes                                                          OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 19                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            TableName                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            DataType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Length                                                             4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            IsLengthFixed                                                      -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            SupportsSelect                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            IsCurrency                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            NullType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  17                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            MinRange                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            MaxRange                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  19                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            DistinctCount                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  20                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            NullCount                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  21                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            SearchType                                                         12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  22                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Format                                                             12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  23                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            DefaultValue                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  24                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            JavaClass                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  25                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  26                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            CharOctetLength                                                    4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  27                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  28                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  29                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  30                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Columns                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  31                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsStandard                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          TypeName                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          JavaClass                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Scale                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          NullType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Radix                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          SearchType                                                         12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          RuntimeType                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          BaseType                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                DataTypes                                                          OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  19                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               HugeA                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               HugeA                                                              StringKey                                                          12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -276,27 +276,27 @@
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              BigDecimalValue                                                    2            bigdecimal                                                         20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               HugeB                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         TableName                                                          12           string                                                             2048         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         KeyName                                                            12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         KeyType                                                            12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         RefKeyUID                                                          12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         Position                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               TableName                                                          12           string                                                             2048         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               Type                                                               12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               IsIndexed                                                          -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               RefKeyUID                                                          12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         TableName                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         KeyName                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         KeyType                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         RefKeyUID                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         Position                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               TableName                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               Type                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               IsIndexed                                                          -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               RefKeyUID                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               LargeA                                                             IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               LargeA                                                             IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               LargeA                                                             StringKey                                                          12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -365,15 +365,15 @@
 QT_Ora9DS                                                          BQT2                                                               LargeB                                                             BigDecimalValue                                                    2            bigdecimal                                                         20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               LargeB                                                             ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               LargeB                                                             ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           VDBName                                                            12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           Name                                                               12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                   12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           TargetName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             4000               5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                   12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           TargetName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           Valid                                                              -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           LoadState                                                          12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           Updated                                                            93           timestamp                                                          29           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           LoadState                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           Updated                                                            93           timestamp                                                          12           <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           MatViews                                                           Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               MediumA                                                            IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               MediumA                                                            IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               MediumA                                                            StringKey                                                          12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -442,56 +442,56 @@
 QT_Ora9DS                                                          BQT2                                                               MediumB                                                            BigDecimalValue                                                    2            bigdecimal                                                         20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               MediumB                                                            ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               MediumB                                                            ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    ProcedureName                                                      12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    DataType                                                           12           string                                                             25           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             25                 5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Type                                                               12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Optional                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    NullType                                                           12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    UID                                                                12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Description                                                        12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                15                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         ReturnsResults                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         Description                                                        12           string                                                             225          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Procedures                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Properties                                                         Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Properties                                                         Value                                                              12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Properties                                                         UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Properties                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Properties                                                         ClobValue                                                          2005         clob                                                               2097152      <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2097152            5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        12           string                                                             1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        12           string                                                             1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             5                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                12                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Schemas                                                            VDBName                                                            12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Schemas                                                            Name                                                               12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Schemas                                                            IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Schemas                                                            UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Schemas                                                            Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Schemas                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    ProcedureName                                                      12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    DataType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Type                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Optional                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    NullType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    UID                                                                12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ProcedureParams                                                    OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         ReturnsResults                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Procedures                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Properties                                                         Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Properties                                                         Value                                                              12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Properties                                                         UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Properties                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Properties                                                         ClobValue                                                          2005         clob                                                               2097152      <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Schemas                                                            VDBName                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Schemas                                                            Name                                                               12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Schemas                                                            IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Schemas                                                            UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Schemas                                                            Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Schemas                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               SmallA                                                             IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               SmallA                                                             IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               SmallA                                                             StringKey                                                          12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -560,19 +560,19 @@
 QT_Ora9DS                                                          BQT2                                                               SmallB                                                             BigDecimalValue                                                    2            bigdecimal                                                         20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               SmallB                                                             ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               SmallB                                                             ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             VDBName                                                            12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             Type                                                               12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             IsSystem                                                           -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             VDBName                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             Type                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             IsSystem                                                           -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                Tables                                                             IsMaterialized                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Tables                                                             OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Tables                                                             OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          VQT                                                                Union.U1                                                           IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          VQT                                                                Union.U1                                                           StringKey                                                          12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          VQT                                                                Union.U1                                                           IntNum                                                             4            integer                                                            22           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -688,10 +688,10 @@
 QT_Ora9DS                                                          VQT                                                                Union.U9                                                           A                                                                  4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          VQT                                                                Union.U9                                                           B                                                                  12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          VQT                                                                Union.U9                                                           C                                                                  7            float                                                              20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           VDBResources                                                       resourcePath                                                       12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYSADMIN                                                           VDBResources                                                       contents                                                           2004         blob                                                               2147483647   <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  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                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                VirtualDatabases                                                   Version                                                            12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           VDBResources                                                       resourcePath                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYSADMIN                                                           VDBResources                                                       contents                                                           2004         blob                                                               2147483647   <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                VirtualDatabases                                                   Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                VirtualDatabases                                                   Version                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTDoc                                                             choiceTestDocument                                                 choiceTest.data1.wrapper1.data1                                    12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTDoc                                                             choiceTestDocument                                                 choiceTest.data1.wrapper1.key1                                     12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTDoc                                                             choiceTestDocument                                                 choiceTest.data1.wrapper1                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -1088,23 +1088,23 @@
 QT_Ora9DS                                                          XQT                                                                xqtFullData                                                        ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 Row Count : 1086
 getColumnName     getColumnType  getCatalogName  getColumnClassName  getColumnLabel     getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         12             QT_Ora9DS       java.lang.String    TABLE_NAME         string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          true      false       
-Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          false     false       
+Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 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        
-Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-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       
+Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix             4              QT_Ora9DS       java.lang.Integer   NUM_PREC_RADIX     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 NULLABLE          4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>        11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
-DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
+Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            true             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        
-CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          false     false       
-Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -2,23 +2,23 @@
 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_TAB!
 LE                                                        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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         12             QT_Ora9DS       java.lang.String    TABLE_NAME         string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          true      false       
-Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          false     false       
+Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 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        
-Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-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       
+Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix             4              QT_Ora9DS       java.lang.Integer   NUM_PREC_RADIX     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 NULLABLE          4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>        11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
-DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
+Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            true             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        
-CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          false     false       
-Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -2,23 +2,23 @@
 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_TAB!
 LE                                                        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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         12             QT_Ora9DS       java.lang.String    TABLE_NAME         string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          true      false       
-Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          false     false       
+Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 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        
-Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-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       
+Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix             4              QT_Ora9DS       java.lang.Integer   NUM_PREC_RADIX     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 NULLABLE          4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>        11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
-DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
+Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            true             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        
-CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          false     false       
-Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -2,23 +2,23 @@
 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_TAB!
 LE                                                        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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         12             QT_Ora9DS       java.lang.String    TABLE_NAME         string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          true      false       
-Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          false     false       
+Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 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        
-Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-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       
+Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix             4              QT_Ora9DS       java.lang.Integer   NUM_PREC_RADIX     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 NULLABLE          4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>        11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
-DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
+Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            true             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        
-CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          false     false       
-Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -2,23 +2,23 @@
 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_TAB!
 LE                                                        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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         12             QT_Ora9DS       java.lang.String    TABLE_NAME         string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          true      false       
-Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+Length            4              QT_Ora9DS       java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+DataType          12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          false     false       
+Precision         4              QT_Ora9DS       java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 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        
-Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-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       
+Scale             4              QT_Ora9DS       java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix             4              QT_Ora9DS       java.lang.Integer   NUM_PREC_RADIX     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 NULLABLE          4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>        11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
-DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
+Description       12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DefaultValue      12             QT_Ora9DS       java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            true             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        
-CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          false     false       
-Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+CharOctetLength   4              QT_Ora9DS       java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+Position          4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      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/testGetCrossReference.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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             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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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             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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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             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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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             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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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             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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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             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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
 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        
+PKTABLE_CAT    12             QT_Ora9DS       java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             QT_Ora9DS       java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             QT_Ora9DS       java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             QT_Ora9DS       java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             QT_Ora9DS       java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             QT_Ora9DS       java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              QT_Ora9DS       java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              QT_Ora9DS       java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              QT_Ora9DS       java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             QT_Ora9DS       java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              QT_Ora9DS       java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         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        
-KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            true             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        
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         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        
-KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            true             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        
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         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        
-KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            true             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        
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            true             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        

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         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        
-KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            true             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        
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         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        
-KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            true             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        
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             QT_Ora9DS       java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         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        
-KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName           12             QT_Ora9DS       java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            true             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        
-Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name              12             QT_Ora9DS       java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            true             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        

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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  
-VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             QT_Ora9DS       java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             QT_Ora9DS       java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             QT_Ora9DS       java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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  
-VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             QT_Ora9DS       java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             QT_Ora9DS       java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             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  
-VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             QT_Ora9DS       java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             QT_Ora9DS       java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             QT_Ora9DS       java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -41,100 +41,100 @@
 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                                                          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                                                    
-QT_Ora9DS                                                          SYSADMIN                                                           isLoggable                                                         level                                                              1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 isLoggable                                                       
-QT_Ora9DS                                                          SYSADMIN                                                           isLoggable                                                         context                                                            1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 isLoggable                                                       
+QT_Ora9DS                                                          SYS                                                                getXMLSchemas                                                      document                                                           1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 getXMLSchemas                                                    
+QT_Ora9DS                                                          SYS                                                                getXMLSchemas                                                      schema                                                             3            2009         xml                        2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 YES                                                                getXMLSchemas                                                    
+QT_Ora9DS                                                          SYSADMIN                                                           isLoggable                                                         level                                                              1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 isLoggable                                                       
+QT_Ora9DS                                                          SYSADMIN                                                           isLoggable                                                         context                                                            1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 isLoggable                                                       
 QT_Ora9DS                                                          SYSADMIN                                                           isLoggable                                                         loggable                                                           5            -7           boolean                    1            1            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 isLoggable                                                       
-QT_Ora9DS                                                          SYSADMIN                                                           logMsg                                                             level                                                              1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 logMsg                                                           
-QT_Ora9DS                                                          SYSADMIN                                                           logMsg                                                             context                                                            1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 logMsg                                                           
-QT_Ora9DS                                                          SYSADMIN                                                           logMsg                                                             msg                                                                1            2000         object                     2147483647   2147483647   0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 NO                                                                 logMsg                                                           
+QT_Ora9DS                                                          SYSADMIN                                                           logMsg                                                             level                                                              1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 logMsg                                                           
+QT_Ora9DS                                                          SYSADMIN                                                           logMsg                                                             context                                                            1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 logMsg                                                           
+QT_Ora9DS                                                          SYSADMIN                                                           logMsg                                                             msg                                                                1            2000         object                     2147483647   2147483647   0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 NO                                                                 logMsg                                                           
 QT_Ora9DS                                                          SYSADMIN                                                           logMsg                                                             logged                                                             5            -7           boolean                    1            1            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 logMsg                                                           
-QT_Ora9DS                                                          SYSADMIN                                                           refreshMatView                                                     ViewName                                                           1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatView                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           refreshMatView                                                     ViewName                                                           1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatView                                                   
 QT_Ora9DS                                                          SYSADMIN                                                           refreshMatView                                                     Invalidate                                                         1            -7           boolean                    1            1            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 refreshMatView                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           refreshMatView                                                     RowsUpdated                                                        5            4            integer                    10           10           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatView                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           refreshMatViewRow                                                  ViewName                                                           1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatViewRow                                                
-QT_Ora9DS                                                          SYSADMIN                                                           refreshMatViewRow                                                  Key                                                                1            2000         object                     2147483647   2147483647   0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 refreshMatViewRow                                                
-QT_Ora9DS                                                          SYSADMIN                                                           refreshMatViewRow                                                  RowsUpdated                                                        5            4            integer                    10           10           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatViewRow                                                
-QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     tableName                                                          1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setColumnStats                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     columnName                                                         1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setColumnStats                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     distinctCount                                                      1            4            integer                    10           10           0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 YES                                                                setColumnStats                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     nullCount                                                          1            4            integer                    10           10           0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setColumnStats                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     max                                                                1            12           string                     4000         4000         0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             5                 YES                                                                setColumnStats                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     min                                                                1            12           string                     4000         4000         0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             6                 YES                                                                setColumnStats                                                   
-QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        UID                                                                1            12           string                     4000         50           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setProperty                                                      
-QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        Name                                                               1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 setProperty                                                      
-QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        Value                                                              1            2005         clob                       2147483647   2097152      0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setProperty                                                      
-QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        OldValue                                                           5            2005         clob                       2147483647   2097152      0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setProperty                                                      
-QT_Ora9DS                                                          SYSADMIN                                                           setTableStats                                                      tableName                                                          1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setTableStats                                                    
-QT_Ora9DS                                                          SYSADMIN                                                           setTableStats                                                      cardinality                                                        1            4            integer                    10           10           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setTableStats                                                    
+QT_Ora9DS                                                          SYSADMIN                                                           refreshMatView                                                     RowsUpdated                                                        5            4            integer                    10           4            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatView                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           refreshMatViewRow                                                  ViewName                                                           1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatViewRow                                                
+QT_Ora9DS                                                          SYSADMIN                                                           refreshMatViewRow                                                  Key                                                                1            2000         object                     2147483647   2147483647   0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 refreshMatViewRow                                                
+QT_Ora9DS                                                          SYSADMIN                                                           refreshMatViewRow                                                  RowsUpdated                                                        5            4            integer                    10           4            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatViewRow                                                
+QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     tableName                                                          1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setColumnStats                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     columnName                                                         1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setColumnStats                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     distinctCount                                                      1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 YES                                                                setColumnStats                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     nullCount                                                          1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setColumnStats                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     max                                                                1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             5                 YES                                                                setColumnStats                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           setColumnStats                                                     min                                                                1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             6                 YES                                                                setColumnStats                                                   
+QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        UID                                                                1            12           string                     4000         50           0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setProperty                                                      
+QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        Name                                                               1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 setProperty                                                      
+QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        Value                                                              1            2005         clob                       2147483647   2097152      0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setProperty                                                      
+QT_Ora9DS                                                          SYSADMIN                                                           setProperty                                                        OldValue                                                           5            2005         clob                       2147483647   2097152      0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setProperty                                                      
+QT_Ora9DS                                                          SYSADMIN                                                           setTableStats                                                      tableName                                                          1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setTableStats                                                    
+QT_Ora9DS                                                          SYSADMIN                                                           setTableStats                                                      cardinality                                                        1            4            integer                    10           4            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setTableStats                                                    
 Row Count : 68
 getColumnName      getColumnType  getCatalogName  getColumnClassName  getColumnLabel     getColumnTypeName  getSchemaName  getTableName     getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName            12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName         12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName            12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName         12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 ProcedureName      12             QT_Ora9DS       java.lang.String    PROCEDURE_NAME     string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name               12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name               12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            true             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        
-DataType           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            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-TypeLength         4              QT_Ora9DS       java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+DataType           12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            ProcedureParams  25                    25            0         false            true             false       false                 0           true        true          false     false       
+Precision          4              QT_Ora9DS       java.lang.Integer   PRECISION          integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+TypeLength         4              QT_Ora9DS       java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
 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            SYS            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          true      false       
 NULLABLE           4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>           11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description        12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description        12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Position           4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+Position           4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      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        
 ProcedureName      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  
-VDBName            12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName         12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName            12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName         12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 ProcedureName      12             QT_Ora9DS       java.lang.String    PROCEDURE_NAME     string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name               12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name               12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            true             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        
-DataType           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            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-TypeLength         4              QT_Ora9DS       java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+DataType           12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            ProcedureParams  25                    25            0         false            true             false       false                 0           true        true          false     false       
+Precision          4              QT_Ora9DS       java.lang.Integer   PRECISION          integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+TypeLength         4              QT_Ora9DS       java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
 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            SYS            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          true      false       
 NULLABLE           4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>           11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description        12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description        12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Position           4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+Position           4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      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        
 ProcedureName      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  
-VDBName            12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName         12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName            12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName         12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 ProcedureName      12             QT_Ora9DS       java.lang.String    PROCEDURE_NAME     string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name               12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name               12             QT_Ora9DS       java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            true             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        
-DataType           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            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-TypeLength         4              QT_Ora9DS       java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+DataType           12             QT_Ora9DS       java.lang.String    TYPE_NAME          string             SYS            ProcedureParams  25                    25            0         false            true             false       false                 0           true        true          false     false       
+Precision          4              QT_Ora9DS       java.lang.Integer   PRECISION          integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+TypeLength         4              QT_Ora9DS       java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
 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            SYS            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          true      false       
 NULLABLE           4              QT_Ora9DS       java.lang.Integer   NULLABLE           integer            <null>         <null>           11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description        12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description        12             QT_Ora9DS       java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Position           4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+Position           4              QT_Ora9DS       java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      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        
 ProcedureName      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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -14,38 +14,38 @@
 QT_Ora9DS                                                          SYSADMIN                                                           setTableStats                                                      <null>                                                             <null>                                                             <null>                                                             <null>                                                             1               setTableStats                                                    
 Row Count : 12
 getColumnName   getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
 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  
-VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
 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  
-VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
 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/testGetProceduresWithEscape.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -14,38 +14,38 @@
 QT_Ora9DS                                                          SYSADMIN                                                           setTableStats                                                      <null>                                                             <null>                                                             <null>                                                             <null>                                                             1               setTableStats                                                    
 Row Count : 12
 getColumnName   getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
 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  
-VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
 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  
-VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             QT_Ora9DS       java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             QT_Ora9DS       java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description     12             QT_Ora9DS       java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
 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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSchemas.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -13,5 +13,5 @@
 pg_catalog                                                         QT_Ora9DS                                                        
 Row Count : 11
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-Name           12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            Schemas       255                   255           0         false            true             false       true                  1           false       true          true      true        
-VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CATALOG   string             SYS            Schemas       255                   255           0         false            true             false       true                  1           false       true          true      true        
+Name           12             QT_Ora9DS       java.lang.String    TABLE_SCHEM     string             SYS            Schemas       255                   255           0         false            true             false       false                 1           true        true          false     false       
+VDBName        12             QT_Ora9DS       java.lang.String    TABLE_CATALOG   string             SYS            Schemas       255                   255           0         false            true             false       false                 1           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -138,44 +138,44 @@
 QT_Ora9DS                                                          XQTRecursiveDoc                                                    testSimpleTempTable.MappingClasses.TemporaryTable1                 XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 Row Count : 136
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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            SYS            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            false            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  
-VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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            SYS            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            false            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  
-VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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            SYS            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            false            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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -138,14 +138,14 @@
 QT_Ora9DS                                                          XQTRecursiveDoc                                                    testSimpleTempTable.MappingClasses.TemporaryTable1                 XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 Row Count : 136
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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            SYS            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            false            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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTable.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -2,14 +2,14 @@
 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  
-VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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            SYS            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            false            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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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  
-VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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            SYS            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            false            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	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -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  
-VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             QT_Ora9DS       java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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            SYS            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            false            false       false                 0           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,5 +1,55 @@
 integer      short   string                                                             string                                                           
 adrelid      adnum   adbin                                                              adsrc                                                            
+6            1       <null>                                                             <null>                                                           
+6            2       <null>                                                             <null>                                                           
+6            3       <null>                                                             <null>                                                           
+6            4       <null>                                                             <null>                                                           
+6            5       <null>                                                             <null>                                                           
+6            6       <null>                                                             <null>                                                           
+6            7       <null>                                                             <null>                                                           
+6            8       <null>                                                             <null>                                                           
+6            9       <null>                                                             <null>                                                           
+6            10      <null>                                                             <null>                                                           
+6            11      <null>                                                             <null>                                                           
+6            12      <null>                                                             <null>                                                           
+6            13      <null>                                                             <null>                                                           
+6            14      <null>                                                             <null>                                                           
+6            15      <null>                                                             <null>                                                           
+6            16      <null>                                                             <null>                                                           
+6            17      <null>                                                             <null>                                                           
+6            18      <null>                                                             <null>                                                           
+6            19      <null>                                                             <null>                                                           
+6            20      <null>                                                             <null>                                                           
+6            21      <null>                                                             <null>                                                           
+6            22      <null>                                                             <null>                                                           
+6            23      <null>                                                             <null>                                                           
+6            24      <null>                                                             <null>                                                           
+6            25      <null>                                                             <null>                                                           
+6            26      <null>                                                             <null>                                                           
+6            27      <null>                                                             <null>                                                           
+6            28      <null>                                                             <null>                                                           
+6            29      <null>                                                             <null>                                                           
+6            30      <null>                                                             <null>                                                           
+6            31      <null>                                                             <null>                                                           
+7            1       <null>                                                             <null>                                                           
+7            2       <null>                                                             <null>                                                           
+7            3       <null>                                                             <null>                                                           
+7            4       <null>                                                             <null>                                                           
+7            5       <null>                                                             <null>                                                           
+7            6       <null>                                                             <null>                                                           
+7            7       <null>                                                             <null>                                                           
+7            8       <null>                                                             <null>                                                           
+7            9       <null>                                                             <null>                                                           
+7            10      <null>                                                             <null>                                                           
+7            11      <null>                                                             <null>                                                           
+7            12      <null>                                                             <null>                                                           
+7            13      <null>                                                             <null>                                                           
+7            14      <null>                                                             <null>                                                           
+7            15      <null>                                                             <null>                                                           
+7            16      <null>                                                             <null>                                                           
+7            17      <null>                                                             <null>                                                           
+7            18      <null>                                                             <null>                                                           
+7            19      <null>                                                             <null>                                                           
 8            1       <null>                                                             <null>                                                           
 8            2       <null>                                                             <null>                                                           
 8            3       <null>                                                             <null>                                                           
@@ -10,46 +60,43 @@
 8            8       <null>                                                             <null>                                                           
 8            9       <null>                                                             <null>                                                           
 8            10      <null>                                                             <null>                                                           
-8            11      <null>                                                             <null>                                                           
-8            12      <null>                                                             <null>                                                           
-8            13      <null>                                                             <null>                                                           
-8            14      <null>                                                             <null>                                                           
-8            15      <null>                                                             <null>                                                           
-8            16      <null>                                                             <null>                                                           
-8            17      <null>                                                             <null>                                                           
-8            18      <null>                                                             <null>                                                           
-8            19      <null>                                                             <null>                                                           
-8            20      <null>                                                             <null>                                                           
-8            21      <null>                                                             <null>                                                           
-8            22      <null>                                                             <null>                                                           
-8            23      <null>                                                             <null>                                                           
-8            24      <null>                                                             <null>                                                           
-8            25      <null>                                                             <null>                                                           
-8            26      <null>                                                             <null>                                                           
-8            27      <null>                                                             <null>                                                           
-8            28      <null>                                                             <null>                                                           
-8            29      <null>                                                             <null>                                                           
-8            30      <null>                                                             <null>                                                           
-8            31      <null>                                                             <null>                                                           
 9            1       <null>                                                             <null>                                                           
 9            2       <null>                                                             <null>                                                           
 9            3       <null>                                                             <null>                                                           
 9            4       <null>                                                             <null>                                                           
 9            5       <null>                                                             <null>                                                           
-9            6       (0)                                                                (0)                                                              
-9            7       (0)                                                                (0)                                                              
+9            6       <null>                                                             <null>                                                           
+9            7       <null>                                                             <null>                                                           
 9            8       <null>                                                             <null>                                                           
-9            9       ('0')                                                              ('0')                                                            
-9            10      ('0')                                                              ('0')                                                            
-9            11      ('0')                                                              ('0')                                                            
-9            12      <null>                                                             <null>                                                           
-9            13      <null>                                                             <null>                                                           
-9            14      <null>                                                             <null>                                                           
-9            15      <null>                                                             <null>                                                           
-9            16      <null>                                                             <null>                                                           
-9            17      <null>                                                             <null>                                                           
-9            18      <null>                                                             <null>                                                           
-9            19      <null>                                                             <null>                                                           
+9            9       <null>                                                             <null>                                                           
+9            10      <null>                                                             <null>                                                           
+9            11      <null>                                                             <null>                                                           
+17           1       <null>                                                             <null>                                                           
+17           2       <null>                                                             <null>                                                           
+17           3       <null>                                                             <null>                                                           
+17           4       <null>                                                             <null>                                                           
+17           5       <null>                                                             <null>                                                           
+17           6       <null>                                                             <null>                                                           
+17           7       <null>                                                             <null>                                                           
+17           8       <null>                                                             <null>                                                           
+17           9       <null>                                                             <null>                                                           
+1            1       <null>                                                             <null>                                                           
+1            2       <null>                                                             <null>                                                           
+1            3       <null>                                                             <null>                                                           
+1            4       <null>                                                             <null>                                                           
+2            1       <null>                                                             <null>                                                           
+2            2       <null>                                                             <null>                                                           
+3            1       <null>                                                             <null>                                                           
+3            2       <null>                                                             <null>                                                           
+4            1       <null>                                                             <null>                                                           
+4            2       <null>                                                             <null>                                                           
+4            3       <null>                                                             <null>                                                           
+4            4       <null>                                                             <null>                                                           
+4            5       <null>                                                             <null>                                                           
+5            1       <null>                                                             <null>                                                           
+5            2       <null>                                                             <null>                                                           
+5            3       <null>                                                             <null>                                                           
+5            4       <null>                                                             <null>                                                           
 10           1       <null>                                                             <null>                                                           
 10           2       <null>                                                             <null>                                                           
 10           3       <null>                                                             <null>                                                           
@@ -60,6 +107,12 @@
 10           8       <null>                                                             <null>                                                           
 10           9       <null>                                                             <null>                                                           
 10           10      <null>                                                             <null>                                                           
+10           11      <null>                                                             <null>                                                           
+10           12      <null>                                                             <null>                                                           
+10           13      <null>                                                             <null>                                                           
+10           14      <null>                                                             <null>                                                           
+10           15      <null>                                                             <null>                                                           
+10           16      <null>                                                             <null>                                                           
 11           1       <null>                                                             <null>                                                           
 11           2       <null>                                                             <null>                                                           
 11           3       <null>                                                             <null>                                                           
@@ -68,51 +121,11 @@
 11           6       <null>                                                             <null>                                                           
 11           7       <null>                                                             <null>                                                           
 11           8       <null>                                                             <null>                                                           
-11           9       <null>                                                             <null>                                                           
-11           10      <null>                                                             <null>                                                           
-11           11      <null>                                                             <null>                                                           
-6            1       <null>                                                             <null>                                                           
-6            2       <null>                                                             <null>                                                           
-6            3       <null>                                                             <null>                                                           
-6            4       <null>                                                             <null>                                                           
-6            5       <null>                                                             <null>                                                           
-6            6       <null>                                                             <null>                                                           
-6            7       <null>                                                             <null>                                                           
-6            8       <null>                                                             <null>                                                           
-6            9       <null>                                                             <null>                                                           
-1            1       <null>                                                             <null>                                                           
-1            2       <null>                                                             <null>                                                           
-1            3       <null>                                                             <null>                                                           
-1            4       <null>                                                             <null>                                                           
-2            1       <null>                                                             <null>                                                           
-2            2       <null>                                                             <null>                                                           
-3            1       <null>                                                             <null>                                                           
-3            2       <null>                                                             <null>                                                           
-4            1       <null>                                                             <null>                                                           
-4            2       <null>                                                             <null>                                                           
-4            3       <null>                                                             <null>                                                           
-4            4       <null>                                                             <null>                                                           
-4            5       <null>                                                             <null>                                                           
-5            1       <null>                                                             <null>                                                           
-5            2       <null>                                                             <null>                                                           
-5            3       <null>                                                             <null>                                                           
-5            4       <null>                                                             <null>                                                           
 12           1       <null>                                                             <null>                                                           
 12           2       <null>                                                             <null>                                                           
 12           3       <null>                                                             <null>                                                           
 12           4       <null>                                                             <null>                                                           
 12           5       <null>                                                             <null>                                                           
-12           6       <null>                                                             <null>                                                           
-12           7       <null>                                                             <null>                                                           
-12           8       <null>                                                             <null>                                                           
-12           9       <null>                                                             <null>                                                           
-12           10      (0)                                                                (0)                                                              
-12           11      (0)                                                                (0)                                                              
-12           12      <null>                                                             <null>                                                           
-12           13      <null>                                                             <null>                                                           
-12           14      <null>                                                             <null>                                                           
-12           15      <null>                                                             <null>                                                           
-12           16      <null>                                                             <null>                                                           
 13           1       <null>                                                             <null>                                                           
 13           2       <null>                                                             <null>                                                           
 13           3       <null>                                                             <null>                                                           
@@ -121,11 +134,19 @@
 13           6       <null>                                                             <null>                                                           
 13           7       <null>                                                             <null>                                                           
 13           8       <null>                                                             <null>                                                           
+13           9       <null>                                                             <null>                                                           
+13           10      <null>                                                             <null>                                                           
+13           11      <null>                                                             <null>                                                           
+13           12      <null>                                                             <null>                                                           
+13           13      <null>                                                             <null>                                                           
+13           14      <null>                                                             <null>                                                           
 14           1       <null>                                                             <null>                                                           
 14           2       <null>                                                             <null>                                                           
 14           3       <null>                                                             <null>                                                           
 14           4       <null>                                                             <null>                                                           
 14           5       <null>                                                             <null>                                                           
+14           6       <null>                                                             <null>                                                           
+14           7       <null>                                                             <null>                                                           
 15           1       <null>                                                             <null>                                                           
 15           2       <null>                                                             <null>                                                           
 15           3       <null>                                                             <null>                                                           
@@ -139,31 +160,10 @@
 15           11      <null>                                                             <null>                                                           
 15           12      <null>                                                             <null>                                                           
 15           13      <null>                                                             <null>                                                           
-15           14      <null>                                                             <null>                                                           
+18           1       <null>                                                             <null>                                                           
+18           2       <null>                                                             <null>                                                           
 16           1       <null>                                                             <null>                                                           
 16           2       <null>                                                             <null>                                                           
-16           3       <null>                                                             <null>                                                           
-16           4       <null>                                                             <null>                                                           
-16           5       <null>                                                             <null>                                                           
-16           6       <null>                                                             <null>                                                           
-16           7       <null>                                                             <null>                                                           
-17           1       <null>                                                             <null>                                                           
-17           2       <null>                                                             <null>                                                           
-17           3       <null>                                                             <null>                                                           
-17           4       <null>                                                             <null>                                                           
-17           5       <null>                                                             <null>                                                           
-17           6       <null>                                                             <null>                                                           
-17           7       <null>                                                             <null>                                                           
-17           8       <null>                                                             <null>                                                           
-17           9       <null>                                                             <null>                                                           
-17           10      <null>                                                             <null>                                                           
-17           11      <null>                                                             <null>                                                           
-17           12      <null>                                                             <null>                                                           
-17           13      <null>                                                             <null>                                                           
-7            1       <null>                                                             <null>                                                           
-7            2       <null>                                                             <null>                                                           
-18           1       <null>                                                             <null>                                                           
-18           2       <null>                                                             <null>                                                           
 19           1       <null>                                                             <null>                                                           
 19           2       <null>                                                             <null>                                                           
 19           3       <null>                                                             <null>                                                           

Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -18,152 +18,152 @@
 16           5            QUANTITY                                                           21           2       3       4            false       false         false    
 17           5            SHIPPER_ID                                                         21           2       4       4            false       false         false    
 18           6            VDBName                                                            1043         -1      1       259          true        false         false    
-19           6            SchemaName                                                         1043         -1      2       259          true        false         false    
-20           6            Name                                                               1043         -1      3       259          true        false         false    
-21           6            TargetSchemaName                                                   1043         -1      4       259          false       false         false    
-22           6            TargetName                                                         1043         -1      5       4004         false       false         false    
-23           6            Valid                                                              16           1       6       4            false       false         false    
-24           6            LoadState                                                          1043         -1      7       259          false       false         false    
-25           6            Updated                                                            1114         8       8       4            false       false         false    
-26           6            Cardinality                                                        23           4       9       14           false       false         false    
-27           7            resourcePath                                                       1043         -1      1       259          false       false         false    
-28           7            contents                                                           14939        -1      2       4            false       false         false    
-29           8            VDBName                                                            1043         -1      1       259          true        false         false    
-30           8            SchemaName                                                         1043         -1      2       259          false       false         false    
-31           8            TableName                                                          1043         -1      3       259          true        false         false    
-32           8            Name                                                               1043         -1      4       259          true        false         false    
-33           8            Position                                                           23           4       5       14           true        false         false    
-34           8            NameInSource                                                       1043         -1      6       259          false       false         false    
-35           8            DataType                                                           1043         -1      7       104          true        false         false    
-36           8            Scale                                                              23           4       8       14           true        false         false    
-37           8            Length                                                             23           4       9       14           true        false         false    
-38           8            IsLengthFixed                                                      16           1       10      5            true        false         false    
-39           8            SupportsSelect                                                     16           1       11      5            true        false         false    
-40           8            SupportsUpdates                                                    16           1       12      5            true        false         false    
-41           8            IsCaseSensitive                                                    16           1       13      5            true        false         false    
-42           8            IsSigned                                                           16           1       14      5            true        false         false    
-43           8            IsCurrency                                                         16           1       15      5            true        false         false    
-44           8            IsAutoIncremented                                                  16           1       16      5            true        false         false    
-45           8            NullType                                                           1043         -1      17      24           true        false         false    
-46           8            MinRange                                                           1043         -1      18      54           false       false         false    
-47           8            MaxRange                                                           1043         -1      19      54           false       false         false    
-48           8            DistinctCount                                                      23           4       20      14           false       false         false    
-49           8            NullCount                                                          23           4       21      14           false       false         false    
-50           8            SearchType                                                         1043         -1      22      24           true        false         false    
-51           8            Format                                                             1043         -1      23      259          false       false         false    
-52           8            DefaultValue                                                       1043         -1      24      259          false       false         false    
-53           8            JavaClass                                                          1043         -1      25      504          true        false         false    
-54           8            Precision                                                          23           4       26      14           true        false         false    
-55           8            CharOctetLength                                                    23           4       27      14           false       false         false    
-56           8            Radix                                                              23           4       28      14           true        false         false    
-57           8            UID                                                                1043         -1      29      54           true        false         false    
-58           8            Description                                                        1043         -1      30      259          false       false         false    
-59           8            OID                                                                23           4       31      14           true        false         false    
-60           9            Name                                                               1043         -1      1       104          true        false         false    
-61           9            IsStandard                                                         16           1       2       5            false       false         false    
-62           9            IsPhysical                                                         16           1       3       5            false       false         false    
-63           9            TypeName                                                           1043         -1      4       104          true        false         false    
-64           9            JavaClass                                                          1043         -1      5       504          true        false         false    
-65           9            Scale                                                              23           4       6       14           false       false         false    
-66           9            TypeLength                                                         23           4       7       14           true        false         false    
-67           9            NullType                                                           1043         -1      8       24           true        false         false    
-68           9            IsSigned                                                           16           1       9       5            true        false         false    
-69           9            IsAutoIncremented                                                  16           1       10      5            true        false         false    
-70           9            IsCaseSensitive                                                    16           1       11      5            true        false         false    
-71           9            Precision                                                          23           4       12      14           true        false         false    
-72           9            Radix                                                              23           4       13      14           false       false         false    
-73           9            SearchType                                                         1043         -1      14      24           true        false         false    
-74           9            UID                                                                1043         -1      15      54           true        false         false    
-75           9            RuntimeType                                                        1043         -1      16      68           false       false         false    
-76           9            BaseType                                                           1043         -1      17      68           false       false         false    
-77           9            Description                                                        1043         -1      18      259          false       false         false    
-78           9            OID                                                                23           4       19      14           true        false         false    
-79           10           VDBName                                                            1043         -1      1       259          true        false         false    
-80           10           SchemaName                                                         1043         -1      2       259          false       false         false    
-81           10           TableName                                                          1043         -1      3       2052         true        false         false    
-82           10           Name                                                               1043         -1      4       259          true        false         false    
-83           10           KeyName                                                            1043         -1      5       259          false       false         false    
-84           10           KeyType                                                            1043         -1      6       24           true        false         false    
-85           10           RefKeyUID                                                          1043         -1      7       54           false       false         false    
-86           10           UID                                                                1043         -1      8       54           true        false         false    
-87           10           Position                                                           23           4       9       14           false       false         false    
-88           10           OID                                                                23           4       10      14           true        false         false    
-89           11           VDBName                                                            1043         -1      1       259          true        false         false    
-90           11           SchemaName                                                         1043         -1      2       259          false       false         false    
-91           11           TableName                                                          1043         -1      3       2052         true        false         false    
-92           11           Name                                                               1043         -1      4       259          true        false         false    
-93           11           Description                                                        1043         -1      5       259          false       false         false    
-94           11           NameInSource                                                       1043         -1      6       259          false       false         false    
-95           11           Type                                                               1043         -1      7       24           true        false         false    
-96           11           IsIndexed                                                          16           1       8       5            true        false         false    
-97           11           RefKeyUID                                                          1043         -1      9       54           false       false         false    
-98           11           UID                                                                1043         -1      10      54           true        false         false    
-99           11           OID                                                                23           4       11      14           true        false         false    
-100          12           VDBName                                                            1043         -1      1       259          true        false         false    
-101          12           SchemaName                                                         1043         -1      2       259          false       false         false    
-102          12           ProcedureName                                                      1043         -1      3       259          true        false         false    
-103          12           Name                                                               1043         -1      4       259          true        false         false    
-104          12           DataType                                                           1043         -1      5       29           true        false         false    
-105          12           Position                                                           23           4       6       14           true        false         false    
-106          12           Type                                                               1043         -1      7       104          true        false         false    
-107          12           Optional                                                           16           1       8       5            true        false         false    
-108          12           Precision                                                          23           4       9       14           true        false         false    
-109          12           TypeLength                                                         23           4       10      14           true        false         false    
-110          12           Scale                                                              23           4       11      14           true        false         false    
-111          12           Radix                                                              23           4       12      14           true        false         false    
-112          12           NullType                                                           1043         -1      13      14           true        false         false    
-113          12           UID                                                                1043         -1      14      54           false       false         false    
-114          12           Description                                                        1043         -1      15      259          false       false         false    
-115          12           OID                                                                23           4       16      14           true        false         false    
-116          13           VDBName                                                            1043         -1      1       259          true        false         false    
-117          13           SchemaName                                                         1043         -1      2       259          false       false         false    
-118          13           Name                                                               1043         -1      3       259          true        false         false    
-119          13           NameInSource                                                       1043         -1      4       259          false       false         false    
-120          13           ReturnsResults                                                     16           1       5       5            true        false         false    
-121          13           UID                                                                1043         -1      6       54           true        false         false    
-122          13           Description                                                        1043         -1      7       259          false       false         false    
-123          13           OID                                                                23           4       8       14           true        false         false    
-124          14           Name                                                               1043         -1      1       259          true        false         false    
-125          14           Value                                                              1043         -1      2       259          true        false         false    
-126          14           UID                                                                1043         -1      3       54           true        false         false    
-127          14           OID                                                                23           4       4       14           true        false         false    
-128          14           ClobValue                                                          14939        -1      5       2097156      false       false         false    
-129          15           PKTABLE_CAT                                                        1043         -1      1       259          false       false         false    
-130          15           PKTABLE_SCHEM                                                      1043         -1      2       259          false       false         false    
-131          15           PKTABLE_NAME                                                       1043         -1      3       259          false       false         false    
-132          15           PKCOLUMN_NAME                                                      1043         -1      4       259          false       false         false    
-133          15           FKTABLE_CAT                                                        1043         -1      5       259          false       false         false    
-134          15           FKTABLE_SCHEM                                                      1043         -1      6       259          false       false         false    
-135          15           FKTABLE_NAME                                                       1043         -1      7       259          false       false         false    
-136          15           FKCOLUMN_NAME                                                      1043         -1      8       259          false       false         false    
-137          15           KEY_SEQ                                                            21           2       9       9            false       false         false    
-138          15           UPDATE_RULE                                                        23           4       10      14           false       false         false    
-139          15           DELETE_RULE                                                        23           4       11      14           false       false         false    
-140          15           FK_NAME                                                            1043         -1      12      259          false       false         false    
-141          15           PK_NAME                                                            1043         -1      13      259          false       false         false    
-142          15           DEFERRABILITY                                                      23           4       14      14           false       false         false    
-143          16           VDBName                                                            1043         -1      1       259          false       false         false    
-144          16           Name                                                               1043         -1      2       259          false       false         false    
-145          16           IsPhysical                                                         16           1       3       5            true        false         false    
-146          16           UID                                                                1043         -1      4       54           true        false         false    
-147          16           Description                                                        1043         -1      5       259          false       false         false    
-148          16           PrimaryMetamodelURI                                                1043         -1      6       259          true        false         false    
-149          16           OID                                                                23           4       7       14           true        false         false    
-150          17           VDBName                                                            1043         -1      1       259          false       false         false    
-151          17           SchemaName                                                         1043         -1      2       259          false       false         false    
-152          17           Name                                                               1043         -1      3       259          true        false         false    
-153          17           Type                                                               1043         -1      4       24           true        false         false    
-154          17           NameInSource                                                       1043         -1      5       259          false       false         false    
-155          17           IsPhysical                                                         16           1       6       5            true        false         false    
-156          17           SupportsUpdates                                                    16           1       7       5            true        false         false    
-157          17           UID                                                                1043         -1      8       54           true        false         false    
-158          17           Cardinality                                                        23           4       9       14           true        false         false    
-159          17           Description                                                        1043         -1      10      259          false       false         false    
-160          17           IsSystem                                                           16           1       11      5            false       false         false    
-161          17           IsMaterialized                                                     16           1       12      4            true        false         false    
-162          17           OID                                                                23           4       13      14           true        false         false    
-163          18           Name                                                               1043         -1      1       259          true        false         false    
-164          18           Version                                                            1043         -1      2       54           true        false         false    
+19           6            SchemaName                                                         1043         -1      2       259          false       false         false    
+20           6            TableName                                                          1043         -1      3       259          true        false         false    
+21           6            Name                                                               1043         -1      4       259          true        false         false    
+22           6            Position                                                           23           4       5       8            true        false         false    
+23           6            NameInSource                                                       1043         -1      6       259          false       false         false    
+24           6            DataType                                                           1043         -1      7       104          true        false         false    
+25           6            Scale                                                              23           4       8       8            true        false         false    
+26           6            Length                                                             23           4       9       8            true        false         false    
+27           6            IsLengthFixed                                                      16           1       10      5            true        false         false    
+28           6            SupportsSelect                                                     16           1       11      5            true        false         false    
+29           6            SupportsUpdates                                                    16           1       12      5            true        false         false    
+30           6            IsCaseSensitive                                                    16           1       13      5            true        false         false    
+31           6            IsSigned                                                           16           1       14      5            true        false         false    
+32           6            IsCurrency                                                         16           1       15      5            true        false         false    
+33           6            IsAutoIncremented                                                  16           1       16      5            true        false         false    
+34           6            NullType                                                           1043         -1      17      24           true        false         false    
+35           6            MinRange                                                           1043         -1      18      54           false       false         false    
+36           6            MaxRange                                                           1043         -1      19      54           false       false         false    
+37           6            DistinctCount                                                      23           4       20      8            false       false         false    
+38           6            NullCount                                                          23           4       21      8            false       false         false    
+39           6            SearchType                                                         1043         -1      22      24           true        false         false    
+40           6            Format                                                             1043         -1      23      259          false       false         false    
+41           6            DefaultValue                                                       1043         -1      24      259          false       false         false    
+42           6            JavaClass                                                          1043         -1      25      504          true        false         false    
+43           6            Precision                                                          23           4       26      8            true        false         false    
+44           6            CharOctetLength                                                    23           4       27      8            false       false         false    
+45           6            Radix                                                              23           4       28      8            true        false         false    
+46           6            UID                                                                1043         -1      29      54           true        false         false    
+47           6            Description                                                        1043         -1      30      259          false       false         false    
+48           6            OID                                                                23           4       31      8            true        false         false    
+49           7            Name                                                               1043         -1      1       104          true        false         false    
+50           7            IsStandard                                                         16           1       2       5            false       false         false    
+51           7            IsPhysical                                                         16           1       3       5            false       false         false    
+52           7            TypeName                                                           1043         -1      4       104          true        false         false    
+53           7            JavaClass                                                          1043         -1      5       504          true        false         false    
+54           7            Scale                                                              23           4       6       8            false       false         false    
+55           7            TypeLength                                                         23           4       7       8            true        false         false    
+56           7            NullType                                                           1043         -1      8       24           true        false         false    
+57           7            IsSigned                                                           16           1       9       5            true        false         false    
+58           7            IsAutoIncremented                                                  16           1       10      5            true        false         false    
+59           7            IsCaseSensitive                                                    16           1       11      5            true        false         false    
+60           7            Precision                                                          23           4       12      8            true        false         false    
+61           7            Radix                                                              23           4       13      8            false       false         false    
+62           7            SearchType                                                         1043         -1      14      24           true        false         false    
+63           7            UID                                                                1043         -1      15      54           true        false         false    
+64           7            RuntimeType                                                        1043         -1      16      68           false       false         false    
+65           7            BaseType                                                           1043         -1      17      68           false       false         false    
+66           7            Description                                                        1043         -1      18      259          false       false         false    
+67           7            OID                                                                23           4       19      8            true        false         false    
+68           8            VDBName                                                            1043         -1      1       259          true        false         false    
+69           8            SchemaName                                                         1043         -1      2       259          false       false         false    
+70           8            TableName                                                          1043         -1      3       2052         true        false         false    
+71           8            Name                                                               1043         -1      4       259          true        false         false    
+72           8            KeyName                                                            1043         -1      5       259          false       false         false    
+73           8            KeyType                                                            1043         -1      6       24           true        false         false    
+74           8            RefKeyUID                                                          1043         -1      7       54           false       false         false    
+75           8            UID                                                                1043         -1      8       54           true        false         false    
+76           8            Position                                                           23           4       9       8            false       false         false    
+77           8            OID                                                                23           4       10      8            true        false         false    
+78           9            VDBName                                                            1043         -1      1       259          true        false         false    
+79           9            SchemaName                                                         1043         -1      2       259          false       false         false    
+80           9            TableName                                                          1043         -1      3       2052         true        false         false    
+81           9            Name                                                               1043         -1      4       259          true        false         false    
+82           9            Description                                                        1043         -1      5       259          false       false         false    
+83           9            NameInSource                                                       1043         -1      6       259          false       false         false    
+84           9            Type                                                               1043         -1      7       24           true        false         false    
+85           9            IsIndexed                                                          16           1       8       5            true        false         false    
+86           9            RefKeyUID                                                          1043         -1      9       54           false       false         false    
+87           9            UID                                                                1043         -1      10      54           true        false         false    
+88           9            OID                                                                23           4       11      8            true        false         false    
+89           10           VDBName                                                            1043         -1      1       259          true        false         false    
+90           10           SchemaName                                                         1043         -1      2       259          false       false         false    
+91           10           ProcedureName                                                      1043         -1      3       259          true        false         false    
+92           10           Name                                                               1043         -1      4       259          true        false         false    
+93           10           DataType                                                           1043         -1      5       29           true        false         false    
+94           10           Position                                                           23           4       6       8            true        false         false    
+95           10           Type                                                               1043         -1      7       104          true        false         false    
+96           10           Optional                                                           16           1       8       5            true        false         false    
+97           10           Precision                                                          23           4       9       8            true        false         false    
+98           10           TypeLength                                                         23           4       10      8            true        false         false    
+99           10           Scale                                                              23           4       11      8            true        false         false    
+100          10           Radix                                                              23           4       12      8            true        false         false    
+101          10           NullType                                                           1043         -1      13      14           true        false         false    
+102          10           UID                                                                1043         -1      14      54           false       false         false    
+103          10           Description                                                        1043         -1      15      259          false       false         false    
+104          10           OID                                                                23           4       16      8            true        false         false    
+105          11           VDBName                                                            1043         -1      1       259          true        false         false    
+106          11           SchemaName                                                         1043         -1      2       259          false       false         false    
+107          11           Name                                                               1043         -1      3       259          true        false         false    
+108          11           NameInSource                                                       1043         -1      4       259          false       false         false    
+109          11           ReturnsResults                                                     16           1       5       5            true        false         false    
+110          11           UID                                                                1043         -1      6       54           true        false         false    
+111          11           Description                                                        1043         -1      7       259          false       false         false    
+112          11           OID                                                                23           4       8       8            true        false         false    
+113          12           Name                                                               1043         -1      1       259          true        false         false    
+114          12           Value                                                              1043         -1      2       259          true        false         false    
+115          12           UID                                                                1043         -1      3       54           true        false         false    
+116          12           OID                                                                23           4       4       8            true        false         false    
+117          12           ClobValue                                                          14939        -1      5       2097156      false       false         false    
+118          13           PKTABLE_CAT                                                        1043         -1      1       259          false       false         false    
+119          13           PKTABLE_SCHEM                                                      1043         -1      2       259          false       false         false    
+120          13           PKTABLE_NAME                                                       1043         -1      3       259          false       false         false    
+121          13           PKCOLUMN_NAME                                                      1043         -1      4       259          false       false         false    
+122          13           FKTABLE_CAT                                                        1043         -1      5       259          false       false         false    
+123          13           FKTABLE_SCHEM                                                      1043         -1      6       259          false       false         false    
+124          13           FKTABLE_NAME                                                       1043         -1      7       259          false       false         false    
+125          13           FKCOLUMN_NAME                                                      1043         -1      8       259          false       false         false    
+126          13           KEY_SEQ                                                            21           2       9       6            false       false         false    
+127          13           UPDATE_RULE                                                        23           4       10      8            false       false         false    
+128          13           DELETE_RULE                                                        23           4       11      8            false       false         false    
+129          13           FK_NAME                                                            1043         -1      12      259          false       false         false    
+130          13           PK_NAME                                                            1043         -1      13      259          false       false         false    
+131          13           DEFERRABILITY                                                      23           4       14      8            false       false         false    
+132          14           VDBName                                                            1043         -1      1       259          false       false         false    
+133          14           Name                                                               1043         -1      2       259          false       false         false    
+134          14           IsPhysical                                                         16           1       3       5            true        false         false    
+135          14           UID                                                                1043         -1      4       54           true        false         false    
+136          14           Description                                                        1043         -1      5       259          false       false         false    
+137          14           PrimaryMetamodelURI                                                1043         -1      6       259          true        false         false    
+138          14           OID                                                                23           4       7       8            true        false         false    
+139          15           VDBName                                                            1043         -1      1       259          false       false         false    
+140          15           SchemaName                                                         1043         -1      2       259          false       false         false    
+141          15           Name                                                               1043         -1      3       259          true        false         false    
+142          15           Type                                                               1043         -1      4       24           true        false         false    
+143          15           NameInSource                                                       1043         -1      5       259          false       false         false    
+144          15           IsPhysical                                                         16           1       6       5            true        false         false    
+145          15           SupportsUpdates                                                    16           1       7       5            true        false         false    
+146          15           UID                                                                1043         -1      8       54           true        false         false    
+147          15           Cardinality                                                        23           4       9       8            true        false         false    
+148          15           Description                                                        1043         -1      10      259          false       false         false    
+149          15           IsSystem                                                           16           1       11      5            false       false         false    
+150          15           IsMaterialized                                                     16           1       12      5            true        false         false    
+151          15           OID                                                                23           4       13      8            true        false         false    
+152          16           Name                                                               1043         -1      1       259          true        false         false    
+153          16           Version                                                            1043         -1      2       54           true        false         false    
+154          17           VDBName                                                            1043         -1      1       259          true        false         false    
+155          17           SchemaName                                                         1043         -1      2       259          true        false         false    
+156          17           Name                                                               1043         -1      3       259          true        false         false    
+157          17           TargetSchemaName                                                   1043         -1      4       259          false       false         false    
+158          17           TargetName                                                         1043         -1      5       4004         false       false         false    
+159          17           Valid                                                              16           1       6       5            false       false         false    
+160          17           LoadState                                                          1043         -1      7       259          false       false         false    
+161          17           Updated                                                            1114         8       8       16           false       false         false    
+162          17           Cardinality                                                        23           4       9       8            false       false         false    
+163          18           resourcePath                                                       1043         -1      1       259          false       false         false    
+164          18           contents                                                           14939        -1      2       -2147483645  false       false         false    
 165          19           oid                                                                23           4       1       8            false       false         false    
 166          19           typname                                                            1043         -1      2       4004         false       false         false    
 167          19           name                                                               1043         -1      3       4004         false       false         false    

Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -5,19 +5,19 @@
 3            PARTSSUPPLIER.STATUS                                               1             r        0            0.0        0            false        false     
 4            PARTSSUPPLIER.SUPPLIER                                             1             r        0            0.0        0            false        false     
 5            PARTSSUPPLIER.SUPPLIER_PARTS                                       1             r        0            0.0        0            false        false     
-6            MatViews                                                           2             r        0            0.0        0            false        false     
-7            VDBResources                                                       2             r        0            0.0        0            false        false     
-8            Columns                                                            3             r        0            0.0        0            false        false     
-9            DataTypes                                                          3             r        0            0.0        0            false        false     
-10           KeyColumns                                                         3             r        0            0.0        0            false        false     
-11           Keys                                                               3             r        0            0.0        0            false        false     
-12           ProcedureParams                                                    3             r        0            0.0        0            false        false     
-13           Procedures                                                         3             r        0            0.0        0            false        false     
-14           Properties                                                         3             r        0            0.0        0            false        false     
-15           ReferenceKeyColumns                                                3             r        0            0.0        0            false        false     
-16           Schemas                                                            3             r        0            0.0        0            false        false     
-17           Tables                                                             3             r        0            0.0        0            false        false     
-18           VirtualDatabases                                                   3             r        0            0.0        0            false        false     
+6            Columns                                                            2             r        0            0.0        0            false        false     
+7            DataTypes                                                          2             r        0            0.0        0            false        false     
+8            KeyColumns                                                         2             r        0            0.0        0            false        false     
+9            Keys                                                               2             r        0            0.0        0            false        false     
+10           ProcedureParams                                                    2             r        0            0.0        0            false        false     
+11           Procedures                                                         2             r        0            0.0        0            false        false     
+12           Properties                                                         2             r        0            0.0        0            false        false     
+13           ReferenceKeyColumns                                                2             r        0            0.0        0            false        false     
+14           Schemas                                                            2             r        0            0.0        0            false        false     
+15           Tables                                                             2             r        0            0.0        0            false        false     
+16           VirtualDatabases                                                   2             r        0            0.0        0            false        false     
+17           MatViews                                                           3             r        0            0.0        0            false        false     
+18           VDBResources                                                       3             r        0            0.0        0            false        false     
 19           matpg_datatype                                                     4             v        0            0.0        0            false        false     
 20           matpg_relatt                                                       4             v        0            0.0        0            false        false     
 21           pg_am                                                              4             v        0            0.0        0            false        false     

Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,8 +1,8 @@
 integer      string                                                           
 oid          nspname                                                          
 1            PartsSupplier                                                    
-2            SYSADMIN                                                         
-3            SYS                                                              
+2            SYS                                                              
+3            SYSADMIN                                                         
 4            pg_catalog                                                       
 Row Count : 4
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  

Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,41 +1,41 @@
 integer      string                                                             integer       short   char     boolean     integer      integer      char      integer      integer    
 oid          typname                                                            typnamespace  typlen  typtype  typnotnull  typbasetype  typtypmod    typdelim  typrelid     typelem    
-16           boolean                                                            3             1       b        false       0            -1           ,         0            0          
-1043         string                                                             3             -1      b        false       0            -1           ,         0            0          
-25           text                                                               3             -1      b        false       0            -1           ,         0            0          
-1042         char                                                               3             1       b        false       0            -1           ,         0            0          
-21           short                                                              3             2       b        false       0            -1           ,         0            0          
-20           long                                                               3             8       b        false       0            -1           ,         0            0          
-23           integer                                                            3             4       b        false       0            -1           ,         0            0          
-26           oid                                                                3             4       b        false       0            -1           ,         0            0          
-700          float                                                              3             4       b        false       0            -1           ,         0            0          
-701          double                                                             3             8       b        false       0            -1           ,         0            0          
-705          unknown                                                            3             -2      b        false       0            -1           ,         0            0          
-1082         date                                                               3             4       b        false       0            -1           ,         0            0          
-1083         datetime                                                           3             8       b        false       0            -1           ,         0            0          
-1114         timestamp                                                          3             8       b        false       0            -1           ,         0            0          
-1700         decimal                                                            3             -1      b        false       0            -1           ,         0            0          
-142          xml                                                                3             -1      b        false       0            -1           ,         0            0          
-14939        lo                                                                 3             -1      b        false       0            -1           ,         0            0          
-2278         void                                                               3             4       p        false       0            -1           ,         0            0          
-2249         record                                                             3             -1      p        false       0            -1           ,         0            0          
-30           oidvector                                                          3             -1      b        false       0            -1           ,         0            26         
-1000         _bool                                                              3             -1      b        false       0            -1           ,         0            16         
-1002         _char                                                              3             -1      b        false       0            -1           ,         0            18         
-1005         _int2                                                              3             -1      b        false       0            -1           ,         0            21         
-1007         _int4                                                              3             -1      b        false       0            -1           ,         0            23         
-1009         _text                                                              3             -1      b        false       0            -1           ,         0            25         
-1028         _oid                                                               3             -1      b        false       0            -1           ,         0            26         
-1014         _bpchar                                                            3             -1      b        false       0            -1           ,         0            1042       
-1015         _varchar                                                           3             -1      b        false       0            -1           ,         0            1043       
-1016         _int8                                                              3             -1      b        false       0            -1           ,         0            20         
-1021         _float4                                                            3             -1      b        false       0            -1           ,         0            700        
-1022         _float8                                                            3             -1      b        false       0            -1           ,         0            701        
-1115         _timestamp                                                         3             -1      b        false       0            -1           ,         0            1114       
-1182         _date                                                              3             -1      b        false       0            -1           ,         0            1082       
-1183         _time                                                              3             -1      b        false       0            -1           ,         0            1083       
-2287         _record                                                            3             -1      b        false       0            -1           ,         0            2249       
-2283         anyelement                                                         3             4       p        false       0            -1           ,         0            0          
+16           boolean                                                            2             1       b        false       0            -1           ,         0            0          
+1043         string                                                             2             -1      b        false       0            -1           ,         0            0          
+25           text                                                               2             -1      b        false       0            -1           ,         0            0          
+1042         char                                                               2             1       b        false       0            -1           ,         0            0          
+21           short                                                              2             2       b        false       0            -1           ,         0            0          
+20           long                                                               2             8       b        false       0            -1           ,         0            0          
+23           integer                                                            2             4       b        false       0            -1           ,         0            0          
+26           oid                                                                2             4       b        false       0            -1           ,         0            0          
+700          float                                                              2             4       b        false       0            -1           ,         0            0          
+701          double                                                             2             8       b        false       0            -1           ,         0            0          
+705          unknown                                                            2             -2      b        false       0            -1           ,         0            0          
+1082         date                                                               2             4       b        false       0            -1           ,         0            0          
+1083         datetime                                                           2             8       b        false       0            -1           ,         0            0          
+1114         timestamp                                                          2             8       b        false       0            -1           ,         0            0          
+1700         decimal                                                            2             -1      b        false       0            -1           ,         0            0          
+142          xml                                                                2             -1      b        false       0            -1           ,         0            0          
+14939        lo                                                                 2             -1      b        false       0            -1           ,         0            0          
+2278         void                                                               2             4       p        false       0            -1           ,         0            0          
+2249         record                                                             2             -1      p        false       0            -1           ,         0            0          
+30           oidvector                                                          2             -1      b        false       0            -1           ,         0            26         
+1000         _bool                                                              2             -1      b        false       0            -1           ,         0            16         
+1002         _char                                                              2             -1      b        false       0            -1           ,         0            18         
+1005         _int2                                                              2             -1      b        false       0            -1           ,         0            21         
+1007         _int4                                                              2             -1      b        false       0            -1           ,         0            23         
+1009         _text                                                              2             -1      b        false       0            -1           ,         0            25         
+1028         _oid                                                               2             -1      b        false       0            -1           ,         0            26         
+1014         _bpchar                                                            2             -1      b        false       0            -1           ,         0            1042       
+1015         _varchar                                                           2             -1      b        false       0            -1           ,         0            1043       
+1016         _int8                                                              2             -1      b        false       0            -1           ,         0            20         
+1021         _float4                                                            2             -1      b        false       0            -1           ,         0            700        
+1022         _float8                                                            2             -1      b        false       0            -1           ,         0            701        
+1115         _timestamp                                                         2             -1      b        false       0            -1           ,         0            1114       
+1182         _date                                                              2             -1      b        false       0            -1           ,         0            1082       
+1183         _time                                                              2             -1      b        false       0            -1           ,         0            1083       
+2287         _record                                                            2             -1      b        false       0            -1           ,         0            2249       
+2283         anyelement                                                         2             4       p        false       0            -1           ,         0            0          
 Row Count : 36
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid            4              PartsSupplier   java.lang.Integer   oid             integer            pg_catalog     pg_type       11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,23 +1,23 @@
 varchar                                                            varchar                                                            varchar                                                            varchar               varchar                                                            bool        bool             varchar                                             int4         varchar                                                            bool      bool            int4       
 vdbname                                                            schemaname                                                         name                                                               type                  nameinsource                                                       isphysical  supportsupdates  uid                                                 cardinality  description                                                        issystem  ismaterialized  oid        
-parts                                                              SYS                                                                Columns                                                            Table                 <null>                                                             true        false            mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509         -1           <null>                                                             true      false           8          
-parts                                                              SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957         -1           <null>                                                             true      false           9          
-parts                                                              SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            mmuuid:14946083-3bd5-42d5-8283-1c0694347c29         -1           <null>                                                             true      false           10         
-parts                                                              SYS                                                                Keys                                                               Table                 <null>                                                             true        false            mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108         -1           <null>                                                             true      false           11         
-parts                                                              SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256         -1           <null>                                                             true      false           6          
+parts                                                              SYS                                                                Columns                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-9bd42fbd-00000001                  -1           <null>                                                             true      false           6          
+parts                                                              SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6130d2cf-00000021                  -1           <null>                                                             true      false           7          
+parts                                                              SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-c5c6549e-00000035                  -1           <null>                                                             true      false           8          
+parts                                                              SYS                                                                Keys                                                               Table                 <null>                                                             true        false            tid:2cb59cfd55db-0023a214-00000040                  -1           <null>                                                             true      false           9          
+parts                                                              SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            tid:60b87e792634-14d6450e-00000001                  -1           <null>                                                             true      false           17         
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                Table                 PARTS                                                              true        true             mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           1          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             Table                 SHIP_VIA                                                           true        true             mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590         4            <null>                                                             false     false           2          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               Table                 STATUS                                                             true        true             mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         3            <null>                                                             false     false           3          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             Table                 SUPPLIER                                                           true        true             mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           4          
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       Table                 SUPPLIER_PARTS                                                     true        true             mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         227          <null>                                                             false     false           5          
-parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626         -1           <null>                                                             true      false           12         
-parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962         -1           <null>                                                             true      false           13         
-parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85         -1           <null>                                                             true      false           14         
-parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29         -1           <null>                                                             true      false           15         
-parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9         -1           <null>                                                             true      false           16         
-parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7         -1           <null>                                                             true      false           17         
-parts                                                              SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            mmuuid:1785804d-beaf-4831-9531-e59164fedd49         -1           <null>                                                             true      false           7          
-parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489         -1           <null>                                                             true      false           18         
+parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-0000004c                  -1           <null>                                                             true      false           10         
+parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000005d                  -1           <null>                                                             true      false           11         
+parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000066                  -1           <null>                                                             true      false           12         
+parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000006c                  -1           <null>                                                             true      false           13         
+parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-0000007b                  -1           <null>                                                             true      false           14         
+parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-00000083                  -1           <null>                                                             true      false           15         
+parts                                                              SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            tid:60b87e792634-1e9b1131-0000000b                  -1           <null>                                                             true      false           18         
+parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-00000091                  -1           <null>                                                             true      false           16         
 parts                                                              pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-00000068                  -1           <null>                                                             true      true            19         
 parts                                                              pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-0000005e                  -1           <null>                                                             true      true            20         
 parts                                                              pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-00000031                  -1           <null>                                                             true      false           21         

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,85 +1,85 @@
 string                                                             string                                                             string                                                             string                                                             integer      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_TAB!
 LE                                                        SOURCE_DATA_TYPE                                                   IS_AUTOINCREMENT                                                 
-PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            DataType                                                           12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Length                                                             4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            IsLengthFixed                                                      -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            SupportsSelect                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            IsCurrency                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            NullType                                                           12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 17                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            MinRange                                                           12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            MaxRange                                                           12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 19                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            DistinctCount                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 20                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            NullCount                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 21                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            SearchType                                                         12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 22                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Format                                                             12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                23                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            DefaultValue                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                24                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            JavaClass                                                          12           string                                                             500          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             500                25                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 26                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            CharOctetLength                                                    4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 27                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 28                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 29                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                30                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Columns                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 31                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Name                                                               12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsStandard                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeName                                                           12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          JavaClass                                                          12           string                                                             500          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             500                5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Scale                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          NullType                                                           12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             ('0')                                                              <null>                                                             <null>                                                             1                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             ('0')                                                              <null>                                                             <null>                                                             1                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             ('0')                                                              <null>                                                             <null>                                                             1                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Radix                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          SearchType                                                         12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          RuntimeType                                                        12           string                                                             64           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             64                 16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          BaseType                                                           12           string                                                             64           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             64                 17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                DataTypes                                                          OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 19                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          12           string                                                             2048         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyName                                                            12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyType                                                            12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         RefKeyUID                                                          12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         Position                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          12           string                                                             2048         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               Type                                                               12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               IsIndexed                                                          -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               RefKeyUID                                                          12           string                                                             50           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           VDBName                                                            12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Name                                                               12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                   12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             4000               5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            DataType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Length                                                             4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            IsLengthFixed                                                      -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            SupportsSelect                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            IsCurrency                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            NullType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  17                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            MinRange                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            MaxRange                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  19                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            DistinctCount                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  20                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            NullCount                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  21                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            SearchType                                                         12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  22                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Format                                                             12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  23                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            DefaultValue                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  24                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            JavaClass                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  25                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  26                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            CharOctetLength                                                    4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  27                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  28                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  29                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  30                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Columns                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  31                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsStandard                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeName                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          JavaClass                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Scale                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          NullType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsSigned                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsAutoIncremented                                                  -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsCaseSensitive                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Radix                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          SearchType                                                         12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          RuntimeType                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  16                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          BaseType                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  17                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  18                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                DataTypes                                                          OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  19                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyName                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyType                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         RefKeyUID                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         Position                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               Type                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               IsIndexed                                                          -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               RefKeyUID                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                   12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Valid                                                              -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           LoadState                                                          12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Updated                                                            93           timestamp                                                          29           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           LoadState                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Updated                                                            93           timestamp                                                          12           <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_ID                                                            12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_NAME                                                          12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_COLOR                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             30                 3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -97,73 +97,73 @@
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PART_ID                                                            12           string                                                             4000         <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                  2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       QUANTITY                                                           5            short                                                              3            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <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                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    DataType                                                           12           string                                                             25           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             25                 5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Type                                                               12           string                                                             100          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             100                7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Optional                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             (0)                                                                <null>                                                             <null>                                                             10                 11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    NullType                                                           12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Description                                                        12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                15                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         ReturnsResults                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         Description                                                        12           string                                                             225          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Procedures                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Properties                                                         Value                                                              12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Properties                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Properties                                                         ClobValue                                                          2005         clob                                                               2097152      <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2097152            5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        12           string                                                             1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        12           string                                                             1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             5                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                12                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Schemas                                                            IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Schemas                                                            Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Schemas                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             Type                                                               12           string                                                             20           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             20                 4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             NameInSource                                                       12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             Description                                                        12           string                                                             255          <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             IsSystem                                                           -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    DataType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Position                                                           4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Type                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Optional                                                           -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Precision                                                          4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    TypeLength                                                         4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Scale                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Radix                                                              4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    NullType                                                           12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  16                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         ReturnsResults                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Procedures                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Properties                                                         Value                                                              12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Properties                                                         OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Properties                                                         ClobValue                                                          2005         clob                                                               2097152      <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Schemas                                                            IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Schemas                                                            Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Schemas                                                            OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             Type                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             NameInSource                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             SupportsUpdates                                                    -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             Cardinality                                                        4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             Description                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             IsSystem                                                           -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                Tables                                                             IsMaterialized                                                     -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Tables                                                             OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       resourcePath                                                       12           string                                                             4000         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       contents                                                           2004         blob                                                               2147483647   <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               12           string                                                             255          <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             255                1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            12           string                                                             50           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             50                 2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Tables                                                             OID                                                                4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       resourcePath                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       contents                                                           2004         blob                                                               2147483647   <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            12           string                                                             4000         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     name                                                               12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
@@ -256,23 +256,23 @@
 PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usesuper                                                           -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>   !
                                                           <null>                                                             NO                                                               
 Row Count : 254
 getColumnName     getColumnType  getCatalogName  getColumnClassName  getColumnLabel     getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName           12             PartsSupplier   java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             PartsSupplier   java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             PartsSupplier   java.lang.String    TABLE_CAT          string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             PartsSupplier   java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         12             PartsSupplier   java.lang.String    TABLE_NAME         string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name              12             PartsSupplier   java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-Length            4              PartsSupplier   java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-DataType          12             PartsSupplier   java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          true      false       
-Precision         4              PartsSupplier   java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name              12             PartsSupplier   java.lang.String    COLUMN_NAME        string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+Length            4              PartsSupplier   java.lang.Integer   DATA_TYPE          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+DataType          12             PartsSupplier   java.lang.String    TYPE_NAME          string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          false     false       
+Precision         4              PartsSupplier   java.lang.Integer   COLUMN_SIZE        integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 BUFFER_LENGTH     12             PartsSupplier   java.lang.String    BUFFER_LENGTH      string             <null>         <null>        4000                  4000          0         false            false            false       true                  1           false       true          true      true        
-Scale             4              PartsSupplier   java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-Radix             4              PartsSupplier   java.lang.Integer   NUM_PREC_RADIX     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Scale             4              PartsSupplier   java.lang.Integer   DECIMAL_DIGITS     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix             4              PartsSupplier   java.lang.Integer   NUM_PREC_RADIX     integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 NULLABLE          4              PartsSupplier   java.lang.Integer   NULLABLE           integer            <null>         <null>        11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description       12             PartsSupplier   java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
-DefaultValue      12             PartsSupplier   java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
+Description       12             PartsSupplier   java.lang.String    REMARKS            string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DefaultValue      12             PartsSupplier   java.lang.String    COLUMN_DEF         string             SYS            Columns       255                   255           0         false            true             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        
-CharOctetLength   4              PartsSupplier   java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          false     false       
-Position          4              PartsSupplier   java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+CharOctetLength   4              PartsSupplier   java.lang.Integer   CHAR_OCTET_LENGTH  integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+Position          4              PartsSupplier   java.lang.Integer   ORDINAL_POSITION   integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      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        

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -5,17 +5,17 @@
 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        
+PKTABLE_CAT    12             PartsSupplier   java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             PartsSupplier   java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             PartsSupplier   java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             PartsSupplier   java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             PartsSupplier   java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             PartsSupplier   java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             PartsSupplier   java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             PartsSupplier   java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              PartsSupplier   java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              PartsSupplier   java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              PartsSupplier   java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             PartsSupplier   java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             PartsSupplier   java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              PartsSupplier   java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -5,17 +5,17 @@
 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        
+PKTABLE_CAT    12             PartsSupplier   java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             PartsSupplier   java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             PartsSupplier   java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             PartsSupplier   java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             PartsSupplier   java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             PartsSupplier   java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             PartsSupplier   java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             PartsSupplier   java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              PartsSupplier   java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              PartsSupplier   java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              PartsSupplier   java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             PartsSupplier   java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             PartsSupplier   java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              PartsSupplier   java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -5,17 +5,17 @@
 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        
+PKTABLE_CAT    12             PartsSupplier   java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             PartsSupplier   java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             PartsSupplier   java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             PartsSupplier   java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             PartsSupplier   java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             PartsSupplier   java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             PartsSupplier   java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             PartsSupplier   java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              PartsSupplier   java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              PartsSupplier   java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              PartsSupplier   java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             PartsSupplier   java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             PartsSupplier   java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              PartsSupplier   java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -6,15 +6,15 @@
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     true        <null>                                                             matpg_datatype_ids                                                 0            2                 oid                                                                <null>                                                             0            1            <null>                                                           
 Row Count : 4
 getColumnName     getColumnType  getCatalogName  getColumnClassName  getColumnLabel    getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName           12             PartsSupplier   java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName        12             PartsSupplier   java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName           12             PartsSupplier   java.lang.String    TABLE_CAT         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName        12             PartsSupplier   java.lang.String    TABLE_SCHEM       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName         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        
-KeyName           12             PartsSupplier   java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName           12             PartsSupplier   java.lang.String    INDEX_NAME        string             SYS            KeyColumns    255                   255           0         false            true             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        
-Name              12             PartsSupplier   java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name              12             PartsSupplier   java.lang.String    COLUMN_NAME       string             SYS            KeyColumns    255                   255           0         false            true             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        

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -17,9 +17,9 @@
 PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       relname                                                            2        pk_matpg_relatt_names                                            
 Row Count : 15
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName        12             PartsSupplier   java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             PartsSupplier   java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             PartsSupplier   java.lang.String    TABLE_CAT       string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             PartsSupplier   java.lang.String    TABLE_SCHEM     string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             PartsSupplier   java.lang.String    TABLE_NAME      string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             PartsSupplier   java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name           12             PartsSupplier   java.lang.String    COLUMN_NAME     string             SYS            KeyColumns    255                   255           0         false            true             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        
-KeyName        12             PartsSupplier   java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
+KeyName        12             PartsSupplier   java.lang.String    PK_NAME         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,51 +1,51 @@
 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                                                                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                                                    
-PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         level                                                              1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 isLoggable                                                       
-PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         context                                                            1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 isLoggable                                                       
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      document                                                           1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 getXMLSchemas                                                    
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      schema                                                             3            2009         xml                        2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 YES                                                                getXMLSchemas                                                    
+PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         level                                                              1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 isLoggable                                                       
+PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         context                                                            1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 isLoggable                                                       
 PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         loggable                                                           5            -7           boolean                    1            1            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 isLoggable                                                       
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             level                                                              1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 logMsg                                                           
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             context                                                            1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 logMsg                                                           
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             msg                                                                1            2000         object                     2147483647   2147483647   0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 NO                                                                 logMsg                                                           
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             level                                                              1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 logMsg                                                           
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             context                                                            1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 logMsg                                                           
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             msg                                                                1            2000         object                     2147483647   2147483647   0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 NO                                                                 logMsg                                                           
 PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             logged                                                             5            -7           boolean                    1            1            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 logMsg                                                           
-PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     ViewName                                                           1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatView                                                   
+PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     ViewName                                                           1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatView                                                   
 PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     Invalidate                                                         1            -7           boolean                    1            1            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 refreshMatView                                                   
-PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     RowsUpdated                                                        5            4            integer                    10           10           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatView                                                   
-PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  ViewName                                                           1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatViewRow                                                
-PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  Key                                                                1            2000         object                     2147483647   2147483647   0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 refreshMatViewRow                                                
-PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  RowsUpdated                                                        5            4            integer                    10           10           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatViewRow                                                
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     tableName                                                          1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setColumnStats                                                   
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     columnName                                                         1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setColumnStats                                                   
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     distinctCount                                                      1            4            integer                    10           10           0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 YES                                                                setColumnStats                                                   
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     nullCount                                                          1            4            integer                    10           10           0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setColumnStats                                                   
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     max                                                                1            12           string                     4000         4000         0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             5                 YES                                                                setColumnStats                                                   
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     min                                                                1            12           string                     4000         4000         0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             6                 YES                                                                setColumnStats                                                   
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        UID                                                                1            12           string                     4000         50           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setProperty                                                      
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Name                                                               1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 setProperty                                                      
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Value                                                              1            2005         clob                       2147483647   2097152      0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setProperty                                                      
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        OldValue                                                           5            2005         clob                       2147483647   2097152      0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setProperty                                                      
-PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      tableName                                                          1            12           string                     4000         4000         0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setTableStats                                                    
-PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      cardinality                                                        1            4            integer                    10           10           0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setTableStats                                                    
+PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     RowsUpdated                                                        5            4            integer                    10           4            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatView                                                   
+PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  ViewName                                                           1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 refreshMatViewRow                                                
+PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  Key                                                                1            2000         object                     2147483647   2147483647   0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 refreshMatViewRow                                                
+PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  RowsUpdated                                                        5            4            integer                    10           4            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 refreshMatViewRow                                                
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     tableName                                                          1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setColumnStats                                                   
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     columnName                                                         1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setColumnStats                                                   
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     distinctCount                                                      1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 YES                                                                setColumnStats                                                   
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     nullCount                                                          1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setColumnStats                                                   
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     max                                                                1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             5                 YES                                                                setColumnStats                                                   
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     min                                                                1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             6                 YES                                                                setColumnStats                                                   
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        UID                                                                1            12           string                     4000         50           0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setProperty                                                      
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Name                                                               1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             3                 NO                                                                 setProperty                                                      
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Value                                                              1            2005         clob                       2147483647   2097152      0       0            1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             4                 YES                                                                setProperty                                                      
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        OldValue                                                           5            2005         clob                       2147483647   2097152      0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setProperty                                                      
+PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      tableName                                                          1            12           string                     4000         4000         0       0            0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                 NO                                                                 setTableStats                                                    
+PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      cardinality                                                        1            4            integer                    10           4            0       10           0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             2                 NO                                                                 setTableStats                                                    
 Row Count : 27
 getColumnName      getColumnType  getCatalogName  getColumnClassName  getColumnLabel     getColumnTypeName  getSchemaName  getTableName     getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName            12             PartsSupplier   java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName         12             PartsSupplier   java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName            12             PartsSupplier   java.lang.String    PROCEDURE_CAT      string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName         12             PartsSupplier   java.lang.String    PROCEDURE_SCHEM    string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 ProcedureName      12             PartsSupplier   java.lang.String    PROCEDURE_NAME     string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name               12             PartsSupplier   java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
+Name               12             PartsSupplier   java.lang.String    COLUMN_NAME        string             SYS            ProcedureParams  255                   255           0         false            true             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        
-DataType           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            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-TypeLength         4              PartsSupplier   java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+DataType           12             PartsSupplier   java.lang.String    TYPE_NAME          string             SYS            ProcedureParams  25                    25            0         false            true             false       false                 0           true        true          false     false       
+Precision          4              PartsSupplier   java.lang.Integer   PRECISION          integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+TypeLength         4              PartsSupplier   java.lang.Integer   LENGTH             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
 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       
+Radix              4              PartsSupplier   java.lang.Integer   RADIX              integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
 NULLABLE           4              PartsSupplier   java.lang.Integer   NULLABLE           integer            <null>         <null>           11                    10            0         false            false            false       true                  1           false       true          true      true        
-Description        12             PartsSupplier   java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description        12             PartsSupplier   java.lang.String    REMARKS            string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Position           4              PartsSupplier   java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+Position           4              PartsSupplier   java.lang.Integer   ORDINAL_POSITION   integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      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        
 ProcedureName      12             PartsSupplier   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/TestPartsDatabaseMetadata/testProcedures.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -10,12 +10,12 @@
 PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      <null>                                                             <null>                                                             <null>                                                             <null>                                                             1               setTableStats                                                    
 Row Count : 8
 getColumnName   getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName         12             PartsSupplier   java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             PartsSupplier   java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             PartsSupplier   java.lang.String    PROCEDURE_CAT    string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             PartsSupplier   java.lang.String    PROCEDURE_SCHEM  string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description     12             PartsSupplier   java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description     12             PartsSupplier   java.lang.String    REMARKS          string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 PROCEDURE_TYPE  5              PartsSupplier   java.lang.Short     PROCEDURE_TYPE   short              <null>         <null>        6                     5             0         false            false            false       true                  1           false       true          true      true        
 Name            12             PartsSupplier   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/TestPartsDatabaseMetadata/testSchemas.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testSchemas.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testSchemas.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -6,5 +6,5 @@
 pg_catalog                                                         PartsSupplier                                                    
 Row Count : 4
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-Name           12             PartsSupplier   java.lang.String    TABLE_SCHEM     string             SYS            Schemas       255                   255           0         false            true             false       true                  1           false       true          true      true        
-VDBName        12             PartsSupplier   java.lang.String    TABLE_CATALOG   string             SYS            Schemas       255                   255           0         false            true             false       true                  1           false       true          true      true        
+Name           12             PartsSupplier   java.lang.String    TABLE_SCHEM     string             SYS            Schemas       255                   255           0         false            true             false       false                 1           true        true          false     false       
+VDBName        12             PartsSupplier   java.lang.String    TABLE_CATALOG   string             SYS            Schemas       255                   255           0         false            true             false       false                 1           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -33,14 +33,14 @@
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 Row Count : 31
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName                    12             PartsSupplier   java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName                 12             PartsSupplier   java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName                    12             PartsSupplier   java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName                 12             PartsSupplier   java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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        
-Description                12             PartsSupplier   java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+Description                12             PartsSupplier   java.lang.String    REMARKS                    string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 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       
+IsPhysical                 -7             PartsSupplier   java.lang.Boolean   ISPHYSICAL                 boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,108 +1,108 @@
 string                                                             string                                                             string                                                             string                                                             integer      string                                                             string                                                             integer      integer      boolean        boolean         boolean          boolean          boolean   boolean     boolean            string                string                                              string                                              integer        integer      string                string                                                             string                                                             string                                                             integer      integer          integer      string               !
                                string                                                             integer    
 VDBName                                                            SchemaName                                                         TableName                                                          Name                                                               Position     NameInSource                                                       DataType                                                           Scale        Length       IsLengthFixed  SupportsSelect  SupportsUpdates  IsCaseSensitive  IsSigned  IsCurrency  IsAutoIncremented  NullType              MinRange                                            MaxRange                                            DistinctCount  NullCount    SearchType            Format                                                             DefaultValue                                                       JavaClass                                                          Precision    CharOctetLength  Radix        UID                  !
                                Description                                                        OID        
-PartsSupplier                                                      SYS                                                                DataTypes                                                          BaseType                                                           17           <null>                                                             string                                                             0            64           true           true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   64           64               10           mmuuid:03beb57c-968b-!
 4821-a6ae-cb1154cfadee         <null>                                                             76         
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Cardinality                                                        9            <null>                                                             integer                                                            0            10           false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:abe699b0-b6bc-!
 4413-9172-0a21ca9664d2         <null>                                                             26         
-PartsSupplier                                                      SYS                                                                Tables                                                             Cardinality                                                        9            <null>                                                             integer                                                            0            10           false          true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:24cdad3a-e8f7-!
 4376-bb32-79f8bc8eeed2         <null>                                                             158        
-PartsSupplier                                                      SYS                                                                Columns                                                            CharOctetLength                                                    27           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:de5def94-2804-!
 4c91-91ed-26d630ce8afe         <null>                                                             55         
-PartsSupplier                                                      SYS                                                                Properties                                                         ClobValue                                                          5            <null>                                                             clob                                                               0            2097152      false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             org.teiid.core.types.ClobType                                      0            2097152          10           mmuuid:c0b630b2-5f71-!
 4bee-8359-07c2629e355b         <null>                                                             128        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      14           <null>                                                             integer                                                            0            10           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:88380f55-2cbd-!
 4325-b9a3-9dcaa88a690e         <null>                                                             142        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        11           <null>                                                             integer                                                            0            10           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:9207f4df-a5ce-!
 43bd-b3b2-fee57e459849         <null>                                                             139        
-PartsSupplier                                                      SYS                                                                Columns                                                            DataType                                                           7            <null>                                                             string                                                             0            100          true           true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   100          100              10           mmuuid:9a8dc0d5-e65c-!
 4032-a066-187f8d2e73ea         <null>                                                             35         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    DataType                                                           5            <null>                                                             string                                                             0            25           true           true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   25           25               10           mmuuid:207a09af-65b8-!
 405f-b1cb-537bc8632fa4         <null>                                                             104        
-PartsSupplier                                                      SYS                                                                Columns                                                            DefaultValue                                                       24           <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:7e853988-356b-!
 4c7c-83d4-a9f015bff279         <null>                                                             52         
-PartsSupplier                                                      SYS                                                                Columns                                                            Description                                                        30           <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:74d73b53-b723-!
 419e-9fea-de56408409ee         <null>                                                             58         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Description                                                        18           <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:b7d95ef6-63a3-!
 441c-8de5-c98e2e577ea3         <null>                                                             77         
-PartsSupplier                                                      SYS                                                                Keys                                                               Description                                                        5            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:175e21b2-24c3-!
 4677-a253-6d7cdb513a9a         <null>                                                             93         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Description                                                        15           <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:05ac4703-5c2c-!
 4410-93b7-19b39d90c803         <null>                                                             114        
-PartsSupplier                                                      SYS                                                                Procedures                                                         Description                                                        7            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   225          255              10           mmuuid:fa0b5db7-acb1-!
 4975-8410-d5d27df46040         <null>                                                             122        
-PartsSupplier                                                      SYS                                                                Schemas                                                            Description                                                        5            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:1cb99300-a527-!
 4a26-b4e6-08ebd92a781d         <null>                                                             147        
-PartsSupplier                                                      SYS                                                                Tables                                                             Description                                                        10           <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:51605e41-5cb0-!
 40ca-8c4a-4eca52780afc         <null>                                                             159        
-PartsSupplier                                                      SYS                                                                Columns                                                            DistinctCount                                                      20           <null>                                                             integer                                                            0            10           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:0017cd41-d873-!
 4fcb-a2e7-15cdac7df3a5         <null>                                                             48         
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      8            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:f4b2b32c-e411-!
 45e6-a236-fec4718f0874         <null>                                                             136        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        5            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   1            255              10           mmuuid:a0095da3-1258-!
 44dc-bab9-33eacf886a28         <null>                                                             133        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       7            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:53284aaa-4c07-!
 4930-8a0e-5e2aaa2da5cb         <null>                                                             135        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      6            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:93a35adf-b6b1-!
 4d9c-bdef-d336a84f478e         <null>                                                             134        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:a9ca7516-6898-!
 419d-b1ad-7d174d946d07         <null>                                                             140        
-PartsSupplier                                                      SYS                                                                Columns                                                            Format                                                             23           <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:172b133e-5bf1-!
 4020-953c-de4446b1e64a         <null>                                                             51         
-PartsSupplier                                                      SYS                                                                Columns                                                            IsAutoIncremented                                                  16           <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:0d41e284-f274-!
 4fd1-8576-7696f4b758d0         <null>                                                             44         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsAutoIncremented                                                  10           <null>                                                             boolean                                                            0            1            true           true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             ('0')                                                              java.lang.Boolean                                                  1            1                10           mmuuid:2a1568e2-776a-!
 474b-981f-040a6ad63361         <null>                                                             69         
-PartsSupplier                                                      SYS                                                                Columns                                                            IsCaseSensitive                                                    13           <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:21ee166a-b462-!
 41a1-b88d-dc79f63d6e17         <null>                                                             41         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsCaseSensitive                                                    11           <null>                                                             boolean                                                            0            1            true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             ('0')                                                              java.lang.Boolean                                                  1            1                10           mmuuid:1468aaf2-6481-!
 4d10-9554-44d0363fe571         <null>                                                             70         
-PartsSupplier                                                      SYS                                                                Columns                                                            IsCurrency                                                         15           <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:b28a2963-36e0-!
 4b4a-a8f8-a2c06f2b440a         <null>                                                             43         
-PartsSupplier                                                      SYS                                                                Keys                                                               IsIndexed                                                          8            <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:ea96cb7c-2dcf-!
 453c-b83a-1aaa921d8f92         <null>                                                             96         
-PartsSupplier                                                      SYS                                                                Columns                                                            IsLengthFixed                                                      10           <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:571aa4ce-3254-!
 4a2b-aa48-1cb23a0c47ed         <null>                                                             38         
-PartsSupplier                                                      SYS                                                                Tables                                                             IsMaterialized                                                     12           <null>                                                             boolean                                                            0            0            false          true            true             false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  0            0                10           mmuuid:89265cba-ab85-!
 48c2-960a-a5a9594ba6d0         <null>                                                             161        
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsPhysical                                                         3            <null>                                                             boolean                                                            0            1            true           true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:983714a2-bd0b-!
 4fad-b4e8-dfb7832e9c4b         <null>                                                             62         
-PartsSupplier                                                      SYS                                                                Schemas                                                            IsPhysical                                                         3            <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:bab257d7-cced-!
 4605-9b40-8ca6c078aca7         <null>                                                             145        
-PartsSupplier                                                      SYS                                                                Tables                                                             IsPhysical                                                         6            <null>                                                             boolean                                                            0            1            true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:e27712f6-a0a6-!
 452e-848d-9de77691e939         <null>                                                             155        
-PartsSupplier                                                      SYS                                                                Columns                                                            IsSigned                                                           14           <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:36be2afa-8ebc-!
 4af8-acc5-a887cf2b5a86         <null>                                                             42         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsSigned                                                           9            <null>                                                             boolean                                                            0            1            true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             ('0')                                                              java.lang.Boolean                                                  1            1                10           mmuuid:235cea48-b2b9-!
 41d5-b296-8ab9c649b6e7         <null>                                                             68         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          IsStandard                                                         2            <null>                                                             boolean                                                            0            1            true           true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:02f27c5d-af55-!
 4677-b91b-8690793671b2         <null>                                                             61         
-PartsSupplier                                                      SYS                                                                Tables                                                             IsSystem                                                           11           <null>                                                             boolean                                                            0            1            false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:9fa7987c-7dc8-!
 4102-9cc0-5658d5b46382         <null>                                                             160        
-PartsSupplier                                                      SYS                                                                Columns                                                            JavaClass                                                          25           <null>                                                             string                                                             0            500          true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   500          500              10           mmuuid:6b8d5df5-7bd2-!
 425c-8b2b-e427e026ef66         <null>                                                             53         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          JavaClass                                                          5            <null>                                                             string                                                             0            500          true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   500          500              10           mmuuid:4c68ef90-8042-!
 44ab-896a-bb3890a8fe04         <null>                                                             64         
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            9            <null>                                                             short                                                              0            5            false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            5                10           mmuuid:4884ac83-84ed-!
 4b67-9f1a-bd79c0199269         <null>                                                             137        
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyName                                                            5            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:da4bef58-83f4-!
 4b88-8bb0-2dc8990be539         <null>                                                             83         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyType                                                            6            <null>                                                             string                                                             0            20           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   20           20               10           mmuuid:df9e15e6-ab77-!
 486d-bfe0-0adc378aa99d         <null>                                                             84         
-PartsSupplier                                                      SYS                                                                Columns                                                            Length                                                             9            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:b36ea0f6-cbff-!
 4049-bc9c-8ec9928be048         <null>                                                             37         
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           LoadState                                                          7            <null>                                                             string                                                             0            255          false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:c67365c3-f252-!
 40f4-aae6-8971d3b1b153         <null>                                                             24         
-PartsSupplier                                                      SYS                                                                Columns                                                            MaxRange                                                           19           <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:0b0df4a5-7de5-!
 4315-94f7-22c84958302e         <null>                                                             47         
-PartsSupplier                                                      SYS                                                                Columns                                                            MinRange                                                           18           <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:dba0f97d-fab5-!
 45f6-a1eb-3459ab3fcc74         <null>                                                             46         
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:0f56d35c-e450-!
 4b4f-86b0-bdb4f1015c57         <null>                                                             20         
-PartsSupplier                                                      SYS                                                                Columns                                                            Name                                                               4            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:d1f44a6d-3e39-!
 4251-b873-1280c2b035b3         <null>                                                             32         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Name                                                               1            <null>                                                             string                                                             0            100          true           true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   100          100              10           mmuuid:17f7de33-e6f0-!
 4b9c-b55e-a87f6b7bb9b3         <null>                                                             60         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         Name                                                               4            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:08bda0c7-5f66-!
 4fed-8285-d74b63eeb0e2         <null>                                                             82         
-PartsSupplier                                                      SYS                                                                Keys                                                               Name                                                               4            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:149de302-2107-!
 45ca-839d-fc0dd1e7d7f4         <null>                                                             92         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               4            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:2bf20c6f-5a95-!
 436d-8f30-a24d164e77a4         <null>                                                             103        
-PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               3            <null>                                                             string                                                             0            255          true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:bd17e98a-c40a-!
 43b1-93ac-88d62937c051         <null>                                                             118        
-PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               1            <null>                                                             string                                                             0            255          true           true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:ba007c56-04b6-!
 4981-ab89-3fdd33ff0de8         <null>                                                             124        
-PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:654112f8-bb4c-!
 4453-9e4d-f3a96fba61ec         <null>                                                             144        
-PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               3            <null>                                                             string                                                             0            255          true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:ef487cc2-1214-!
 439c-af6e-da431df00d2c         <null>                                                             152        
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               1            <null>                                                             string                                                             0            255          true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:42fa1249-8b24-!
 4aae-a252-0a347db6ec30         <null>                                                             163        
-PartsSupplier                                                      SYS                                                                Columns                                                            NameInSource                                                       6            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:fac72c6e-41dc-!
 4a1b-8af3-f0796690d9cc         <null>                                                             34         
-PartsSupplier                                                      SYS                                                                Keys                                                               NameInSource                                                       6            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:a52a6169-99e0-!
 4b7e-9dc6-3a93ffa6094a         <null>                                                             94         
-PartsSupplier                                                      SYS                                                                Procedures                                                         NameInSource                                                       4            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:a4e7a0fd-c340-!
 49a9-9ac0-8328caaffda8         <null>                                                             119        
-PartsSupplier                                                      SYS                                                                Tables                                                             NameInSource                                                       5            <null>                                                             string                                                             0            255          true           true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:1f036fb0-b841-!
 450c-8462-986cdd57e921         <null>                                                             154        
-PartsSupplier                                                      SYS                                                                Columns                                                            NullCount                                                          21           <null>                                                             integer                                                            0            10           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:d00d1104-40ba-!
 40be-b684-4c0c803615f8         <null>                                                             49         
-PartsSupplier                                                      SYS                                                                Columns                                                            NullType                                                           17           <null>                                                             string                                                             0            20           true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   20           20               10           mmuuid:4d83bdbb-a7ce-!
 44cc-a201-021a517d3c1a         <null>                                                             45         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          NullType                                                           8            <null>                                                             string                                                             0            20           true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   20           20               10           mmuuid:278b0534-1164-!
 495e-a8c6-de45e0ff53a4         <null>                                                             67         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    NullType                                                           13           <null>                                                             string                                                             0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   10           10               10           mmuuid:d887c203-6bf5-!
 462b-b2f0-f5302e2f4bcd         <null>                                                             112        
-PartsSupplier                                                      SYS                                                                Columns                                                            OID                                                                31           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:b9e5ba07-4a8d-!
 4589-8aa9-597ae70d18a4         <null>                                                             59         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          OID                                                                19           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:a3c41050-80b6-!
 4fb5-9c6b-5e20c0839cda         <null>                                                             78         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         OID                                                                10           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:207d123c-a3ff-!
 4e4e-85ae-6f3b0debfc06         <null>                                                             88         
-PartsSupplier                                                      SYS                                                                Keys                                                               OID                                                                11           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:d781f893-bdf3-!
 4dc1-956f-7e7b1a138c99         <null>                                                             99         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    OID                                                                16           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:72125f93-846f-!
 413c-82e1-fa3227fb043f         <null>                                                             115        
-PartsSupplier                                                      SYS                                                                Procedures                                                         OID                                                                8            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:c80c02d2-7174-!
 4cc4-b347-e921a80f568c         <null>                                                             123        
-PartsSupplier                                                      SYS                                                                Properties                                                         OID                                                                4            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:54c1a7dc-5ca8-!
 4d34-8672-e76d63fe3b95         <null>                                                             127        
-PartsSupplier                                                      SYS                                                                Schemas                                                            OID                                                                7            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:31746839-e019-!
 4321-90cb-a557e1d4754e         <null>                                                             149        
-PartsSupplier                                                      SYS                                                                Tables                                                             OID                                                                13           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:dae79c58-b381-!
 4275-8c1c-b299d732d355         <null>                                                             162        
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Optional                                                           8            <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:4033f891-5ef5-!
 4a75-8a50-bd1d021e43ad         <null>                                                             107        
+PartsSupplier                                                      SYS                                                                DataTypes                                                          BaseType                                                           17           <null>                                                             string                                                             0            64           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-20a5!
 8d00-00000032                  <null>                                                             65         
+PartsSupplier                                                      SYS                                                                Tables                                                             Cardinality                                                        9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-4ea6!
 5124-0000008c                  <null>                                                             147        
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Cardinality                                                        9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:60b87e792634-6c45!
 1768-0000000a                  <null>                                                             162        
+PartsSupplier                                                      SYS                                                                Columns                                                            CharOctetLength                                                    27           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-22aa!
 cf78-0000001c                  <null>                                                             44         
+PartsSupplier                                                      SYS                                                                Properties                                                         ClobValue                                                          5            <null>                                                             clob                                                               0            2097152      false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Like Only             <null>                                                             <null>                                                             org.teiid.core.types.ClobType                                      0            0                0            tid:2cb59cfd55db-47af!
 c5c1-0000006b                  <null>                                                             117        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      14           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-2162!
 e845-0000007a                  <null>                                                             131        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bd4e!
 2f8b-00000077                  <null>                                                             128        
+PartsSupplier                                                      SYS                                                                Columns                                                            DataType                                                           7            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-6847!
 855d-00000008                  <null>                                                             24         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    DataType                                                           5            <null>                                                             string                                                             0            25           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-2780!
 81e9-00000051                  <null>                                                             93         
+PartsSupplier                                                      SYS                                                                Columns                                                            DefaultValue                                                       24           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-dc4b!
 f309-00000019                  <null>                                                             41         
+PartsSupplier                                                      SYS                                                                Columns                                                            Description                                                        30           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f669!
 3f15-0000001f                  <null>                                                             47         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Description                                                        18           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8006!
 1b11-00000033                  <null>                                                             66         
+PartsSupplier                                                      SYS                                                                Keys                                                               Description                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-84fa!
 c580-00000045                  <null>                                                             82         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Description                                                        15           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b5a2!
 3ba1-0000005b                  <null>                                                             103        
+PartsSupplier                                                      SYS                                                                Procedures                                                         Description                                                        7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3b85!
 e33d-00000064                  <null>                                                             111        
+PartsSupplier                                                      SYS                                                                Schemas                                                            Description                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b9b3!
 09ce-00000080                  <null>                                                             136        
+PartsSupplier                                                      SYS                                                                Tables                                                             Description                                                        10           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b57a!
 e792-0000008d                  <null>                                                             148        
+PartsSupplier                                                      SYS                                                                Columns                                                            DistinctCount                                                      20           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-c22a!
 728c-00000015                  <null>                                                             37         
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      8            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4747!
 d26a-00000074                  <null>                                                             125        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f5c8!
 02fb-00000071                  <null>                                                             122        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fca7!
 a97c-00000073                  <null>                                                             124        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d1ff!
 1f65-00000072                  <null>                                                             123        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7a64!
 e440-00000078                  <null>                                                             129        
+PartsSupplier                                                      SYS                                                                Columns                                                            Format                                                             23           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-778e!
 f750-00000018                  <null>                                                             40         
+PartsSupplier                                                      SYS                                                                Columns                                                            IsAutoIncremented                                                  16           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-6754!
 f3ae-00000011                  <null>                                                             33         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsAutoIncremented                                                  10           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-f0f1!
 cfaa-0000002b                  <null>                                                             58         
+PartsSupplier                                                      SYS                                                                Columns                                                            IsCaseSensitive                                                    13           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-3d7c!
 ab55-0000000e                  <null>                                                             30         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsCaseSensitive                                                    11           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-c719!
 8751-0000002c                  <null>                                                             59         
+PartsSupplier                                                      SYS                                                                Columns                                                            IsCurrency                                                         15           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-639f!
 86b4-00000010                  <null>                                                             32         
+PartsSupplier                                                      SYS                                                                Keys                                                               IsIndexed                                                          8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-5113!
 49eb-00000048                  <null>                                                             85         
+PartsSupplier                                                      SYS                                                                Columns                                                            IsLengthFixed                                                      10           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-35aa!
 7bbd-0000000b                  <null>                                                             27         
+PartsSupplier                                                      SYS                                                                Tables                                                             IsMaterialized                                                     12           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-d1b1!
 8557-0000008f                  <null>                                                             150        
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsPhysical                                                         3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-8ffc!
 5376-00000024                  <null>                                                             51         
+PartsSupplier                                                      SYS                                                                Schemas                                                            IsPhysical                                                         3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-c9a9!
 4233-0000007e                  <null>                                                             134        
+PartsSupplier                                                      SYS                                                                Tables                                                             IsPhysical                                                         6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-c571!
 1ff7-00000089                  <null>                                                             144        
+PartsSupplier                                                      SYS                                                                Columns                                                            IsSigned                                                           14           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-f006!
 d83f-0000000f                  <null>                                                             31         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsSigned                                                           9            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-79a3!
 b43b-0000002a                  <null>                                                             57         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          IsStandard                                                         2            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-192d!
 915c-00000023                  <null>                                                             50         
+PartsSupplier                                                      SYS                                                                Tables                                                             IsSystem                                                           11           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-afff!
 83cf-0000008e                  <null>                                                             149        
+PartsSupplier                                                      SYS                                                                Columns                                                            JavaClass                                                          25           <null>                                                             string                                                             0            500          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3d6c!
 478f-0000001a                  <null>                                                             42         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          JavaClass                                                          5            <null>                                                             string                                                             0            500          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-c709!
 238b-00000026                  <null>                                                             53         
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            9            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:2cb59cfd55db-785a!
 68ba-00000075                  <null>                                                             126        
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyName                                                            5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7a10!
 5423-0000003a                  <null>                                                             72         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyType                                                            6            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7a13!
 68d2-0000003b                  <null>                                                             73         
+PartsSupplier                                                      SYS                                                                Columns                                                            Length                                                             9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-813d!
 3a3f-0000000a                  <null>                                                             26         
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           LoadState                                                          7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-a016!
 d125-00000008                  <null>                                                             160        
+PartsSupplier                                                      SYS                                                                Columns                                                            MaxRange                                                           19           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-1537!
 d992-00000014                  <null>                                                             36         
+PartsSupplier                                                      SYS                                                                Columns                                                            MinRange                                                           18           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-ab59!
 3d64-00000013                  <null>                                                             35         
+PartsSupplier                                                      SYS                                                                Columns                                                            Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f9ef!
 01e4-00000005                  <null>                                                             21         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Name                                                               1            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-838b!
 dde0-00000022                  <null>                                                             49         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-479a!
 6564-00000039                  <null>                                                             71         
+PartsSupplier                                                      SYS                                                                Keys                                                               Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8880!
 884f-00000044                  <null>                                                             81         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b927!
 fe70-00000050                  <null>                                                             92         
+PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3f0b!
 a60c-00000060                  <null>                                                             107        
+PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0af4!
 79b7-00000067                  <null>                                                             113        
+PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bd38!
 cc9d-0000007d                  <null>                                                             133        
+PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b900!
 aa61-00000086                  <null>                                                             141        
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-aff6!
 1a7a-00000092                  <null>                                                             152        
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-d69f!
 70a5-00000004                  <null>                                                             156        
+PartsSupplier                                                      SYS                                                                Columns                                                            NameInSource                                                       6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-2cef!
 bca4-00000007                  <null>                                                             23         
+PartsSupplier                                                      SYS                                                                Keys                                                               NameInSource                                                       6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bb81!
 430f-00000046                  <null>                                                             83         
+PartsSupplier                                                      SYS                                                                Procedures                                                         NameInSource                                                       4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-720c!
 60cc-00000061                  <null>                                                             108        
+PartsSupplier                                                      SYS                                                                Tables                                                             NameInSource                                                       5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-ec01!
 6521-00000088                  <null>                                                             143        
+PartsSupplier                                                      SYS                                                                Columns                                                            NullCount                                                          21           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-adde!
 2ae1-00000016                  <null>                                                             38         
+PartsSupplier                                                      SYS                                                                Columns                                                            NullType                                                           17           <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8c04!
 24ba-00000012                  <null>                                                             34         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          NullType                                                           8            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-15a1!
 00b6-00000029                  <null>                                                             56         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    NullType                                                           13           <null>                                                             string                                                             0            10           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4b3d!
 2146-00000059                  <null>                                                             101        
+PartsSupplier                                                      SYS                                                                Columns                                                            OID                                                                31           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-f9cb!
 44e3-00000020                  <null>                                                             48         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          OID                                                                19           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-8368!
 20df-00000034                  <null>                                                             67         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         OID                                                                10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-4776!
 a863-0000003f                  <null>                                                             77         
+PartsSupplier                                                      SYS                                                                Keys                                                               OID                                                                11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-885c!
 cb4e-0000004b                  <null>                                                             88         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    OID                                                                16           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b904!
 416f-0000005c                  <null>                                                             104        
+PartsSupplier                                                      SYS                                                                Procedures                                                         OID                                                                8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-3ee7!
 e90b-00000065                  <null>                                                             112        
+PartsSupplier                                                      SYS                                                                Properties                                                         OID                                                                4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-0ad0!
 bcb6-0000006a                  <null>                                                             116        
+PartsSupplier                                                      SYS                                                                Schemas                                                            OID                                                                7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bd15!
 0f9c-00000082                  <null>                                                             138        
+PartsSupplier                                                      SYS                                                                Tables                                                             OID                                                                13           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b8dc!
 ed60-00000090                  <null>                                                             151        
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Optional                                                           8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-b827!
 bf45-00000054                  <null>                                                             96         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_COLOR                                                         3            PART_COLOR                                                         string                                                             0            30           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            30               10           mmuuid:015c0d00-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             3          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_ID                                                            1            PART_ID                                                            string                                                             0            4            true           true            true             true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            4                10           mmuuid:fadcd7c0-73fe-!
 1edc-a81c-ecf397b10590         <null>                                                             1          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PART_ID                                                            2            PART_ID                                                            string                                                             0            4            true           true            true             true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            4                10           mmuuid:3fc400c0-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             15         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_NAME                                                          2            PART_NAME                                                          string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:0067e900-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             2          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_WEIGHT                                                        4            PART_WEIGHT                                                        string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:015c0d01-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             4          
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      4            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:0125a80a-95f9-!
 486f-aa90-debb21cb5f1b         <null>                                                             132        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        1            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   1            255              10           mmuuid:f615a661-2c36-!
 4ab1-b72b-5e13e99e052c         <null>                                                             129        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       3            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:6d420bc2-0f85-!
 4da9-833d-d71b428b0743         <null>                                                             131        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:ef7b3b79-fb51-!
 42ef-a723-080ed0a6e3bc         <null>                                                             130        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            13           <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:ac210a6d-4de6-!
 4d71-aa9b-e3d34baca81a         <null>                                                             141        
-PartsSupplier                                                      SYS                                                                Columns                                                            Position                                                           5            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:dbc8cd09-1b47-!
 43c5-82ec-aba525b85cc4         <null>                                                             33         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         Position                                                           9            <null>                                                             integer                                                            0            10           true           true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:92a4849c-ed0e-!
 4f5f-a108-d7d71a5aba25         <null>                                                             87         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Position                                                           6            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:5fdefd17-65f4-!
 4350-9ee0-0ed3c34d10ae         <null>                                                             105        
-PartsSupplier                                                      SYS                                                                Columns                                                            Precision                                                          26           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:db3d49e2-fe1d-!
 438b-8d07-847bf58506ab         <null>                                                             54         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Precision                                                          12           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:8673c810-7162-!
 4331-ba0b-6fc3530d2d1c         <null>                                                             71         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Precision                                                          9            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:00fe7cad-0a83-!
 42f0-90f2-d6a9584916b2         <null>                                                             108        
-PartsSupplier                                                      SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                6            <null>                                                             string                                                             0            255          false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:eadfaba5-ce44-!
 4529-816f-6af94666baec         <null>                                                             148        
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      3            <null>                                                             string                                                             0            255          true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:8081b3a6-fc79-!
 42fd-b7c9-a19d682a1658         <null>                                                             102        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9866!
 1374-00000070                  <null>                                                             121        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-c6b6!
 fe85-0000006d                  <null>                                                             118        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4998!
 1f32-0000006f                  <null>                                                             120        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-231d!
 606f-0000006e                  <null>                                                             119        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            13           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8b63!
 34ca-00000079                  <null>                                                             130        
+PartsSupplier                                                      SYS                                                                Columns                                                            Position                                                           5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-2a37!
 1082-00000006                  <null>                                                             22         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         Position                                                           9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-77e2!
 7402-0000003e                  <null>                                                             76         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Position                                                           6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-e970!
 0d0e-00000052                  <null>                                                             94         
+PartsSupplier                                                      SYS                                                                Columns                                                            Precision                                                          26           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-1f35!
 6797-0000001b                  <null>                                                             43         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Precision                                                          12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-a8d2!
 4393-0000002d                  <null>                                                             60         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Precision                                                          9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-de6e!
 6423-00000055                  <null>                                                             97         
+PartsSupplier                                                      SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d1de!
 677c-00000081                  <null>                                                             137        
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bf0c!
 0fa3-0000004f                  <null>                                                             91         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       QUANTITY                                                           3            QUANTITY                                                           short                                                              0            0            true           true            true             false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    3            0                10           mmuuid:3fc400c1-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             16         
-PartsSupplier                                                      SYS                                                                Columns                                                            Radix                                                              28           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:43a6124c-972f-!
 4c4c-af05-24080c2a8ad7         <null>                                                             56         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Radix                                                              13           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:967ab8fd-3226-!
 4a78-8cf2-2eb7fbf2981a         <null>                                                             72         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Radix                                                              12           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:8df37c99-3b12-!
 4789-8128-4aa496f895c4         <null>                                                             111        
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         RefKeyUID                                                          7            <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:aafbdf50-25aa-!
 427b-b322-7cb36094a1e2         <null>                                                             85         
-PartsSupplier                                                      SYS                                                                Keys                                                               RefKeyUID                                                          9            <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:1cf4c5ad-5932-!
 47ec-8593-385b75bfeba8         <null>                                                             97         
-PartsSupplier                                                      SYS                                                                Procedures                                                         ReturnsResults                                                     5            <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:b01164c8-dd10-!
 410d-a91b-fcb2fc0450ce         <null>                                                             120        
-PartsSupplier                                                      SYS                                                                DataTypes                                                          RuntimeType                                                        16           <null>                                                             string                                                             0            64           true           true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   64           64               10           mmuuid:3c7bc9d0-b73f-!
 49a0-b9ab-dc97a4d2a124         <null>                                                             75         
+PartsSupplier                                                      SYS                                                                Columns                                                            Radix                                                              28           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-fe7b!
 371d-0000001d                  <null>                                                             45         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Radix                                                              13           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-8818!
 1319-0000002e                  <null>                                                             61         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Radix                                                              12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bdb4!
 33a9-00000058                  <null>                                                             100        
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         RefKeyUID                                                          7            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-5ab6!
 5a7d-0000003c                  <null>                                                             74         
+PartsSupplier                                                      SYS                                                                Keys                                                               RefKeyUID                                                          9            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9b9c!
 7d68-00000049                  <null>                                                             86         
+PartsSupplier                                                      SYS                                                                Procedures                                                         ReturnsResults                                                     5            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-078e!
 8cb4-00000062                  <null>                                                             109        
+PartsSupplier                                                      SYS                                                                DataTypes                                                          RuntimeType                                                        16           <null>                                                             string                                                             0            64           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-13ce!
 be47-00000031                  <null>                                                             64         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             SHIPPER_ID                                                         1            SHIPPER_ID                                                         short                                                              0            0            true           true            true             false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    2            0                10           mmuuid:121bc540-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             5          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       SHIPPER_ID                                                         4            SHIPPER_ID                                                         short                                                              0            0            true           true            true             false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    2            0                10           mmuuid:3fc400c2-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             17         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             SHIPPER_NAME                                                       2            SHIPPER_NAME                                                       string                                                             0            30           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            30               10           mmuuid:130fe940-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             6          
@@ -114,54 +114,54 @@
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_NAME                                                      2            SUPPLIER_NAME                                                      string                                                             0            30           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            30               10           mmuuid:2f044881-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             10         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_STATE                                                     5            SUPPLIER_STATE                                                     string                                                             0            2            false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            2                10           mmuuid:2fe92a41-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             13         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_STATUS                                                    3            SUPPLIER_STATUS                                                    short                                                              0            0            true           true            true             false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    2            0                10           mmuuid:2f044882-73ff-!
 1edc-a81c-ecf397b10590         <null>                                                             11         
-PartsSupplier                                                      SYS                                                                Columns                                                            Scale                                                              8            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:cc6c6113-8d70-!
 40c8-84c0-94e17c14e22e         <null>                                                             36         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Scale                                                              6            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             (0)                                                                java.lang.Integer                                                  10           10               10           mmuuid:e8655204-e97a-!
 45cd-909b-1e37731e9546         <null>                                                             65         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Scale                                                              11           <null>                                                             integer                                                            0            10           true           true            true             false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             (0)                                                                java.lang.Integer                                                  10           10               10           mmuuid:360c8b1d-4b3d-!
 42fd-952c-bf5763cad69e         <null>                                                             110        
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:2738c484-d24d-!
 4c40-b0b7-e734afb03450         <null>                                                             19         
-PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:859288c9-cd78-!
 4407-90fc-61b5d310e2ab         <null>                                                             30         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:787be966-cf12-!
 4956-907f-a8e6dc1009dc         <null>                                                             80         
-PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:4a7fc059-208e-!
 4f98-b6ef-cb7c6102a327         <null>                                                             90         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:88497911-619c-!
 4ca8-b482-8885d940706a         <null>                                                             101        
-PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:53a84865-334e-!
 4750-b343-de2411d56e3e         <null>                                                             117        
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:95bd960c-fd84-!
 44c9-9831-692376f69b46         <null>                                                             151        
-PartsSupplier                                                      SYS                                                                Columns                                                            SearchType                                                         22           <null>                                                             string                                                             0            20           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   20           20               10           mmuuid:3037138a-bb20-!
 4485-ba01-75bc20b1a532         <null>                                                             50         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          SearchType                                                         14           <null>                                                             string                                                             0            20           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   20           20               10           mmuuid:d8494fa3-40e4-!
 44cd-b0d8-da5c83685a75         <null>                                                             73         
-PartsSupplier                                                      SYS                                                                Columns                                                            SupportsSelect                                                     11           <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:c2a50f93-0040-!
 41ec-ad7b-e8511296555f         <null>                                                             39         
-PartsSupplier                                                      SYS                                                                Columns                                                            SupportsUpdates                                                    12           <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:fab660d1-36bf-!
 4a5b-bbe6-9a543e0ebd76         <null>                                                             40         
-PartsSupplier                                                      SYS                                                                Tables                                                             SupportsUpdates                                                    7            <null>                                                             boolean                                                            0            1            true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            1                10           mmuuid:5144d230-2b0e-!
 4255-b321-65b9f6f6f76c         <null>                                                             156        
-PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          3            <null>                                                             string                                                             0            255          true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:2c09c9d1-2f25-!
 45de-81cf-eeb2a5157d34         <null>                                                             31         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          3            <null>                                                             string                                                             0            2048         true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   2048         2048             10           mmuuid:c24fad72-0c0d-!
 4260-96ae-f188ad77b137         <null>                                                             81         
-PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          3            <null>                                                             string                                                             0            2048         true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   2048         2048             10           mmuuid:7d9540bd-b51f-!
 4206-8c33-b39c5ba8bb8b         <null>                                                             91         
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetName                                                         5            <null>                                                             string                                                             0            4000         false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            4000             10           mmuuid:d2831595-d6f5-!
 4cca-aa5d-2ff2530d0ab1         <null>                                                             22         
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                   4            <null>                                                             string                                                             0            255          false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:a95dba1c-283e-!
 4f48-9671-34cecdb7d0e3         <null>                                                             21         
-PartsSupplier                                                      SYS                                                                Keys                                                               Type                                                               7            <null>                                                             string                                                             0            20           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   20           20               10           mmuuid:29e73c18-afec-!
 43a9-81ab-7378d6daf20b         <null>                                                             95         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Type                                                               7            <null>                                                             string                                                             0            100          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   100          100              10           mmuuid:76a1981b-1226-!
 4a55-9acf-82a061cc8642         <null>                                                             106        
-PartsSupplier                                                      SYS                                                                Tables                                                             Type                                                               4            <null>                                                             string                                                             0            20           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   20           20               10           mmuuid:4814a0af-4e8f-!
 4f55-9b25-3148d90d3d9b         <null>                                                             153        
-PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeLength                                                         7            <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             (0)                                                                java.lang.Integer                                                  10           10               10           mmuuid:0668382a-f9c3-!
 4507-8b0f-df65a2ebbf2f         <null>                                                             66         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    TypeLength                                                         10           <null>                                                             integer                                                            0            10           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             (0)                                                                java.lang.Integer                                                  10           10               10           mmuuid:791d7a29-8fc5-!
 4735-9144-1accc114b58e         <null>                                                             109        
-PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeName                                                           4            <null>                                                             string                                                             0            100          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   100          100              10           mmuuid:48081cdd-9e90-!
 4440-a956-4a32af96d7f4         <null>                                                             63         
-PartsSupplier                                                      SYS                                                                Columns                                                            UID                                                                29           <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:5f491c75-769b-!
 4908-9f68-2a9a486607bb         <null>                                                             57         
-PartsSupplier                                                      SYS                                                                DataTypes                                                          UID                                                                15           <null>                                                             string                                                             0            50           true           true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:dd57f577-ffc4-!
 4b55-8f7f-355b9ea3ce37         <null>                                                             74         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         UID                                                                8            <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:0d994a45-4f52-!
 4b79-9b31-7ef22331fee2         <null>                                                             86         
-PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                10           <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:782218d1-5337-!
 48c6-9070-0aafd4c6cd20         <null>                                                             98         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                14           <null>                                                             string                                                             0            50           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            50               10           mmuuid:a278de2e-89f1-!
 4281-9e63-54aebb6062ce         <null>                                                             113        
-PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                6            <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:de9df25a-c886-!
 46e0-ae3a-8eb6792e43f4         <null>                                                             121        
-PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                3            <null>                                                             string                                                             0            50           true           true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:b333969a-83e0-!
 4010-9463-9a0088da6c83         <null>                                                             126        
-PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                4            <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:ad232e4d-9c01-!
 4d0c-bc57-0459d9db918a         <null>                                                             146        
-PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                8            <null>                                                             string                                                             0            50           true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:6afe3737-26f9-!
 43a8-88db-86531b5dc66c         <null>                                                             157        
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        10           <null>                                                             integer                                                            0            10           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           10               10           mmuuid:30d5ae74-b19e-!
 4186-97e1-aeff5801e44f         <null>                                                             138        
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Updated                                                            8            <null>                                                             timestamp                                                          0            0            false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.sql.Timestamp                                                 0            0                10           mmuuid:33970a66-7ad4-!
 411f-a6c4-545746747fe6         <null>                                                             25         
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:c1ce9841-e272-!
 4839-8c78-777a5f68d241         <null>                                                             18         
-PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            1            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:83f19a81-1243-!
 4751-8c99-daddbf37b1d7         <null>                                                             29         
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            1            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:f062eb9c-4854-!
 47fb-b7bd-a4e23c782b62         <null>                                                             79         
-PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            1            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:5785b523-7da3-!
 42c1-8920-66daa1f7fa1d         <null>                                                             89         
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            1            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:f832f316-2403-!
 43fa-9ccc-c3ab9d38acca         <null>                                                             100        
-PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            1            <null>                                                             string                                                             0            255          true           true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:1d664747-4a95-!
 4605-8b28-381bed3121f1         <null>                                                             116        
-PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:73dbf95b-a283-!
 4f0a-81b9-9b98e09c2906         <null>                                                             143        
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:58de905f-9d64-!
 4831-a985-da6d082ff709         <null>                                                             150        
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Valid                                                              6            <null>                                                             boolean                                                            0            0            false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  0            0                10           mmuuid:13098912-bce2-!
 4842-9ea9-b162fcd7383e         <null>                                                             23         
-PartsSupplier                                                      SYS                                                                Properties                                                         Value                                                              2            <null>                                                             string                                                             0            255          true           true            false            true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   255          255              10           mmuuid:c917257d-06b7-!
 41dd-a6cb-44c0ff0f897e         <null>                                                             125        
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            2            <null>                                                             string                                                             0            50           true           true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   50           50               10           mmuuid:c876d749-a512-!
 4810-9910-3034ca524c45         <null>                                                             164        
+PartsSupplier                                                      SYS                                                                Columns                                                            Scale                                                              8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-fe8a!
 2c63-00000009                  <null>                                                             25         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Scale                                                              6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-8827!
 085f-00000027                  <null>                                                             54         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Scale                                                              11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bdc3!
 28ef-00000057                  <null>                                                             99         
+PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-55dc!
 5b25-00000003                  <null>                                                             19         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a387!
 bea5-00000037                  <null>                                                             69         
+PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-e46d!
 e190-00000042                  <null>                                                             79         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-1515!
 57b1-0000004e                  <null>                                                             90         
+PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9af8!
 ff4d-0000005f                  <null>                                                             106        
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-14ee!
 03a2-00000085                  <null>                                                             140        
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-328c!
 c9e6-00000003                  <null>                                                             155        
+PartsSupplier                                                      SYS                                                                Columns                                                            SearchType                                                         22           <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4643!
 445b-00000017                  <null>                                                             39         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          SearchType                                                         14           <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-cfe0!
 2057-0000002f                  <null>                                                             62         
+PartsSupplier                                                      SYS                                                                Columns                                                            SupportsSelect                                                     11           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-1385!
 87f9-0000000c                  <null>                                                             28         
+PartsSupplier                                                      SYS                                                                Columns                                                            SupportsUpdates                                                    12           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-939c!
 acbf-0000000d                  <null>                                                             29         
+PartsSupplier                                                      SYS                                                                Tables                                                             SupportsUpdates                                                    7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-52ae!
 553c-0000008a                  <null>                                                             145        
+PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fab2!
 c692-00000004                  <null>                                                             20         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          3            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-485e!
 2a12-00000038                  <null>                                                             70         
+PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          3            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8944!
 4cfd-00000043                  <null>                                                             80         
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetName                                                         5            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-6a4a!
 8dd6-00000006                  <null>                                                             158        
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                   4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-4ebf!
 7e57-00000005                  <null>                                                             157        
+PartsSupplier                                                      SYS                                                                Keys                                                               Type                                                               7            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8883!
 9cfe-00000047                  <null>                                                             84         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Type                                                               7            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b92b!
 131f-00000053                  <null>                                                             95         
+PartsSupplier                                                      SYS                                                                Tables                                                             Type                                                               4            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b903!
 bf10-00000087                  <null>                                                             142        
+PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeLength                                                         7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-98a4!
 ae15-00000028                  <null>                                                             55         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    TypeLength                                                         10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-ce40!
 cea5-00000056                  <null>                                                             98         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeName                                                           4            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-5eee!
 a43a-00000025                  <null>                                                             52         
+PartsSupplier                                                      SYS                                                                Columns                                                            UID                                                                29           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f9cb!
 5b69-0000001e                  <null>                                                             46         
+PartsSupplier                                                      SYS                                                                DataTypes                                                          UID                                                                15           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8368!
 3765-00000030                  <null>                                                             63         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         UID                                                                8            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4776!
 bee9-0000003d                  <null>                                                             75         
+PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                10           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-885c!
 e1d4-0000004a                  <null>                                                             87         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                14           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b904!
 57f5-0000005a                  <null>                                                             102        
+PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                6            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3ee7!
 ff91-00000063                  <null>                                                             110        
+PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                3            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0ad0!
 d33c-00000069                  <null>                                                             115        
+PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                4            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bd15!
 2622-0000007f                  <null>                                                             135        
+PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                8            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b8dd!
 03e6-0000008b                  <null>                                                             146        
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-ddfd!
 bf2d-00000076                  <null>                                                             127        
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Updated                                                            8            <null>                                                             timestamp                                                          0            12           false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.sql.Timestamp                                                 0            0                0            tid:60b87e792634-2bb9!
 fa95-00000009                  <null>                                                             161        
+PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-36f2!
 8338-00000002                  <null>                                                             18         
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-849d!
 e6b8-00000036                  <null>                                                             68         
+PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-c584!
 09a3-00000041                  <null>                                                             78         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f62b!
 7fc4-0000004d                  <null>                                                             89         
+PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7c0f!
 2760-0000005e                  <null>                                                             105        
+PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fa3c!
 4df1-0000007c                  <null>                                                             132        
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f604!
 2bb5-00000084                  <null>                                                             139        
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-13a2!
 f1f9-00000002                  <null>                                                             154        
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Valid                                                              6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:60b87e792634-db64!
 21d6-00000007                  <null>                                                             159        
+PartsSupplier                                                      SYS                                                                Properties                                                         Value                                                              2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0fb9!
 2c5d-00000068                  <null>                                                             114        
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            2            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-27fe!
 e087-00000093                  <null>                                                             153        
 PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adbin                                                              3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-b094!
 89b6-0000004d                  <null>                                                             181        
 PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adnum                                                              2            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-b094!
 b835-0000004c                  <null>                                                             180        
 PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adrelid                                                            1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-6765!
 c4e3-0000004b                  <null>                                                             179        
@@ -180,7 +180,7 @@
 PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atttypid                                                           4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-bd39!
 f12a-00000013                  <null>                                                             186        
 PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atttypmod                                                          7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-a120!
 a8bd-00000016                  <null>                                                             189        
 PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       autoinc                                                            6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-83aa!
 4e56-00000064                  <null>                                                             175        
-PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       contents                                                           2            <null>                                                             blob                                                               0            0            false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             org.teiid.core.types.BlobType                                      0            0                10           mmuuid:f9421669-3564-!
 451d-9293-96c1e5e72c4f         <null>                                                             28         
+PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       contents                                                           2            <null>                                                             blob                                                               0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             org.teiid.core.types.BlobType                                      0            0                0            tid:60b87e792634-2c5e!
 89f3-0000000d                  <null>                                                             164        
 PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datacl                                                             7            <null>                                                             object                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-dad6!
 37f3-00000056                  <null>                                                             208        
 PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datallowconn                                                       5            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-5e2b!
 9a9e-00000054                  <null>                                                             206        
 PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datconfig                                                          6            <null>                                                             object                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-1944!
 37f9-00000055                  <null>                                                             207        
@@ -228,7 +228,7 @@
 PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relnamespace                                                       3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-0445!
 3ed6-00000007                  <null>                                                             195        
 PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relpages                                                           7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-5f0e!
 b4bf-0000000b                  <null>                                                             199        
 PartsSupplier                                                      pg_catalog                                                         pg_class                                                           reltuples                                                          6            <null>                                                             float                                                              3            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Float                                                    7            0                10           tid:7ff2755e9621-9f58!
 9978-0000000a                  <null>                                                             198        
-PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       resourcePath                                                       1            <null>                                                             string                                                             0            255          false          true            false            true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:b1bc5150-3dcc-!
 452e-9e75-4a506997f612         <null>                                                             27         
+PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       resourcePath                                                       1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-3744!
 142c-0000000c                  <null>                                                             163        
 PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgargs                                                             4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9e3c!
 4ae3-00000044                  <null>                                                             234        
 PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgconstrname                                                       8            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-2ba0!
 9840-00000048                  <null>                                                             238        
 PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgconstrrelid                                                      2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9f72!
 b425-00000042                  <null>                                                             232        
@@ -256,15 +256,15 @@
 PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usesuper                                                           4            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-938d!
 e68e-0000005d                  <null>                                                             254        
 Row Count : 254
 getColumnName      getColumnType  getCatalogName  getColumnClassName  getColumnLabel     getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName            12             PartsSupplier   java.lang.String    VDBName            string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName         12             PartsSupplier   java.lang.String    SchemaName         string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName            12             PartsSupplier   java.lang.String    VDBName            string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName         12             PartsSupplier   java.lang.String    SchemaName         string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName          12             PartsSupplier   java.lang.String    TableName          string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name               12             PartsSupplier   java.lang.String    Name               string             SYS            Columns       255                   255           0         false            false            false       false                 0           true        true          false     false       
-Position           4              PartsSupplier   java.lang.Integer   Position           integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-NameInSource       12             PartsSupplier   java.lang.String    NameInSource       string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
-DataType           12             PartsSupplier   java.lang.String    DataType           string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          true      false       
-Scale              4              PartsSupplier   java.lang.Integer   Scale              integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-Length             4              PartsSupplier   java.lang.Integer   Length             integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name               12             PartsSupplier   java.lang.String    Name               string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
+Position           4              PartsSupplier   java.lang.Integer   Position           integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+NameInSource       12             PartsSupplier   java.lang.String    NameInSource       string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DataType           12             PartsSupplier   java.lang.String    DataType           string             SYS            Columns       100                   100           0         false            true             false       false                 0           true        true          false     false       
+Scale              4              PartsSupplier   java.lang.Integer   Scale              integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+Length             4              PartsSupplier   java.lang.Integer   Length             integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
 IsLengthFixed      -7             PartsSupplier   java.lang.Boolean   IsLengthFixed      boolean            SYS            Columns       5                     1             0         false            false            false       false                 0           true        true          false     false       
 SupportsSelect     -7             PartsSupplier   java.lang.Boolean   SupportsSelect     boolean            SYS            Columns       5                     1             0         false            false            false       false                 0           true        true          false     false       
 SupportsUpdates    -7             PartsSupplier   java.lang.Boolean   SupportsUpdates    boolean            SYS            Columns       5                     1             0         false            false            false       false                 0           true        true          false     false       
@@ -273,17 +273,17 @@
 IsCurrency         -7             PartsSupplier   java.lang.Boolean   IsCurrency         boolean            SYS            Columns       5                     1             0         false            false            false       false                 0           true        true          false     false       
 IsAutoIncremented  -7             PartsSupplier   java.lang.Boolean   IsAutoIncremented  boolean            SYS            Columns       5                     1             0         false            false            false       false                 0           true        true          false     false       
 NullType           12             PartsSupplier   java.lang.String    NullType           string             SYS            Columns       20                    20            0         false            true             false       false                 0           true        true          false     false       
-MinRange           12             PartsSupplier   java.lang.String    MinRange           string             SYS            Columns       50                    50            0         false            false            false       false                 1           true        true          false     false       
-MaxRange           12             PartsSupplier   java.lang.String    MaxRange           string             SYS            Columns       50                    50            0         false            false            false       false                 1           true        true          false     false       
-DistinctCount      4              PartsSupplier   java.lang.Integer   DistinctCount      integer            SYS            Columns       11                    10            0         false            true             false       true                  1           false       true          true      true        
-NullCount          4              PartsSupplier   java.lang.Integer   NullCount          integer            SYS            Columns       11                    10            0         false            true             false       true                  1           false       true          true      true        
-SearchType         12             PartsSupplier   java.lang.String    SearchType         string             SYS            Columns       20                    20            0         false            false            false       false                 0           true        true          false     false       
-Format             12             PartsSupplier   java.lang.String    Format             string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
-DefaultValue       12             PartsSupplier   java.lang.String    DefaultValue       string             SYS            Columns       255                   255           0         false            false            false       false                 1           true        true          false     false       
+MinRange           12             PartsSupplier   java.lang.String    MinRange           string             SYS            Columns       50                    50            0         false            true             false       false                 1           true        true          false     false       
+MaxRange           12             PartsSupplier   java.lang.String    MaxRange           string             SYS            Columns       50                    50            0         false            true             false       false                 1           true        true          false     false       
+DistinctCount      4              PartsSupplier   java.lang.Integer   DistinctCount      integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+NullCount          4              PartsSupplier   java.lang.Integer   NullCount          integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+SearchType         12             PartsSupplier   java.lang.String    SearchType         string             SYS            Columns       20                    20            0         false            true             false       false                 0           true        true          false     false       
+Format             12             PartsSupplier   java.lang.String    Format             string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+DefaultValue       12             PartsSupplier   java.lang.String    DefaultValue       string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
 JavaClass          12             PartsSupplier   java.lang.String    JavaClass          string             SYS            Columns       500                   500           0         false            true             false       false                 0           true        true          false     false       
-Precision          4              PartsSupplier   java.lang.Integer   Precision          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-CharOctetLength    4              PartsSupplier   java.lang.Integer   CharOctetLength    integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          false     false       
-Radix              4              PartsSupplier   java.lang.Integer   Radix              integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
-UID                12             PartsSupplier   java.lang.String    UID                string             SYS            Columns       50                    50            0         false            false            false       false                 0           true        true          false     false       
-Description        12             PartsSupplier   java.lang.String    Description        string             SYS            Columns       255                   255           0         false            true             false       true                  1           false       true          true      true        
-OID                4              PartsSupplier   java.lang.Integer   OID                integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          false     false       
+Precision          4              PartsSupplier   java.lang.Integer   Precision          integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+CharOctetLength    4              PartsSupplier   java.lang.Integer   CharOctetLength    integer            SYS            Columns       11                    10            0         false            false            false       false                 1           true        true          true      false       
+Radix              4              PartsSupplier   java.lang.Integer   Radix              integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       
+UID                12             PartsSupplier   java.lang.String    UID                string             SYS            Columns       50                    50            0         false            true             false       false                 0           true        true          false     false       
+Description        12             PartsSupplier   java.lang.String    Description        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
+OID                4              PartsSupplier   java.lang.Integer   OID                integer            SYS            Columns       11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -55,22 +55,22 @@
 varbinary                                                          true        true        varbinary                                                          org.teiid.core.types.BinaryType                                    0            8196         Nullable              false     false              false            0            0            Searchable            mmuuid:182fd511-1a3e-447a-a6ea-72569d6a22ec         varbinary                                                         base64Binary                                                      <null>                                                             53         
 Row Count : 53
 getColumnName      getColumnType  getCatalogName  getColumnClassName  getColumnLabel     getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-Name               12             PartsSupplier   java.lang.String    Name               string             SYS            DataTypes     100                   100           0         false            true             false       false                 0           true        true          true      false       
-IsStandard         -7             PartsSupplier   java.lang.Boolean   IsStandard         boolean            SYS            DataTypes     5                     1             0         false            true             false       false                 1           true        true          true      false       
-IsPhysical         -7             PartsSupplier   java.lang.Boolean   IsPhysical         boolean            SYS            DataTypes     5                     1             0         false            true             false       false                 1           true        true          true      false       
-TypeName           12             PartsSupplier   java.lang.String    TypeName           string             SYS            DataTypes     100                   100           0         false            false            false       false                 0           true        true          false     false       
+Name               12             PartsSupplier   java.lang.String    Name               string             SYS            DataTypes     100                   100           0         false            true             false       false                 0           true        true          false     false       
+IsStandard         -7             PartsSupplier   java.lang.Boolean   IsStandard         boolean            SYS            DataTypes     5                     1             0         false            false            false       false                 1           true        true          false     false       
+IsPhysical         -7             PartsSupplier   java.lang.Boolean   IsPhysical         boolean            SYS            DataTypes     5                     1             0         false            false            false       false                 1           true        true          false     false       
+TypeName           12             PartsSupplier   java.lang.String    TypeName           string             SYS            DataTypes     100                   100           0         false            true             false       false                 0           true        true          false     false       
 JavaClass          12             PartsSupplier   java.lang.String    JavaClass          string             SYS            DataTypes     500                   500           0         false            true             false       false                 0           true        true          false     false       
-Scale              4              PartsSupplier   java.lang.Integer   Scale              integer            SYS            DataTypes     11                    10            0         false            false            false       false                 1           true        true          false     false       
-TypeLength         4              PartsSupplier   java.lang.Integer   TypeLength         integer            SYS            DataTypes     11                    10            0         false            false            false       false                 0           true        true          false     false       
+Scale              4              PartsSupplier   java.lang.Integer   Scale              integer            SYS            DataTypes     11                    10            0         false            false            false       false                 1           true        true          true      false       
+TypeLength         4              PartsSupplier   java.lang.Integer   TypeLength         integer            SYS            DataTypes     11                    10            0         false            false            false       false                 0           true        true          true      false       
 NullType           12             PartsSupplier   java.lang.String    NullType           string             SYS            DataTypes     20                    20            0         false            true             false       false                 0           true        true          false     false       
-IsSigned           -7             PartsSupplier   java.lang.Boolean   IsSigned           boolean            SYS            DataTypes     5                     1             0         false            true             false       false                 0           true        true          false     false       
-IsAutoIncremented  -7             PartsSupplier   java.lang.Boolean   IsAutoIncremented  boolean            SYS            DataTypes     5                     1             0         false            true             false       false                 0           true        true          true      false       
-IsCaseSensitive    -7             PartsSupplier   java.lang.Boolean   IsCaseSensitive    boolean            SYS            DataTypes     5                     1             0         false            true             false       false                 0           true        true          false     false       
-Precision          4              PartsSupplier   java.lang.Integer   Precision          integer            SYS            DataTypes     11                    10            0         false            false            false       false                 0           true        true          false     false       
-Radix              4              PartsSupplier   java.lang.Integer   Radix              integer            SYS            DataTypes     11                    10            0         false            false            false       false                 1           true        true          false     false       
-SearchType         12             PartsSupplier   java.lang.String    SearchType         string             SYS            DataTypes     20                    20            0         false            false            false       false                 0           true        true          false     false       
-UID                12             PartsSupplier   java.lang.String    UID                string             SYS            DataTypes     50                    50            0         false            false            false       false                 0           true        true          true      false       
-RuntimeType        12             PartsSupplier   java.lang.String    RuntimeType        string             SYS            DataTypes     64                    64            0         false            true             false       false                 1           true        true          true      false       
-BaseType           12             PartsSupplier   java.lang.String    BaseType           string             SYS            DataTypes     64                    64            0         false            true             false       false                 1           true        true          true      false       
-Description        12             PartsSupplier   java.lang.String    Description        string             SYS            DataTypes     255                   255           0         false            true             false       true                  1           false       true          true      true        
-OID                4              PartsSupplier   java.lang.Integer   OID                integer            SYS            DataTypes     11                    10            0         false            false            false       false                 0           true        true          false     false       
+IsSigned           -7             PartsSupplier   java.lang.Boolean   IsSigned           boolean            SYS            DataTypes     5                     1             0         false            false            false       false                 0           true        true          false     false       
+IsAutoIncremented  -7             PartsSupplier   java.lang.Boolean   IsAutoIncremented  boolean            SYS            DataTypes     5                     1             0         false            false            false       false                 0           true        true          false     false       
+IsCaseSensitive    -7             PartsSupplier   java.lang.Boolean   IsCaseSensitive    boolean            SYS            DataTypes     5                     1             0         false            false            false       false                 0           true        true          false     false       
+Precision          4              PartsSupplier   java.lang.Integer   Precision          integer            SYS            DataTypes     11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix              4              PartsSupplier   java.lang.Integer   Radix              integer            SYS            DataTypes     11                    10            0         false            false            false       false                 1           true        true          true      false       
+SearchType         12             PartsSupplier   java.lang.String    SearchType         string             SYS            DataTypes     20                    20            0         false            true             false       false                 0           true        true          false     false       
+UID                12             PartsSupplier   java.lang.String    UID                string             SYS            DataTypes     50                    50            0         false            true             false       false                 0           true        true          false     false       
+RuntimeType        12             PartsSupplier   java.lang.String    RuntimeType        string             SYS            DataTypes     64                    64            0         false            true             false       false                 1           true        true          false     false       
+BaseType           12             PartsSupplier   java.lang.String    BaseType           string             SYS            DataTypes     64                    64            0         false            true             false       false                 1           true        true          false     false       
+Description        12             PartsSupplier   java.lang.String    Description        string             SYS            DataTypes     255                   255           0         false            true             false       false                 1           true        true          false     false       
+OID                4              PartsSupplier   java.lang.Integer   OID                integer            SYS            DataTypes     11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -24,13 +24,13 @@
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typname                                                            matpg_datatype_ids                                                 Index                 <null>                                              tid:7ff2755e9621-ed0fa7f1-0000006f                  1            12         
 Row Count : 22
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            KeyColumns    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             PartsSupplier   java.lang.String    TableName       string             SYS            KeyColumns    2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             PartsSupplier   java.lang.String    Name            string             SYS            KeyColumns    255                   255           0         false            false            false       false                 0           true        true          false     false       
-KeyName        12             PartsSupplier   java.lang.String    KeyName         string             SYS            KeyColumns    255                   255           0         false            false            false       false                 1           true        true          false     false       
-KeyType        12             PartsSupplier   java.lang.String    KeyType         string             SYS            KeyColumns    20                    20            0         false            false            false       false                 0           true        true          false     false       
-RefKeyUID      12             PartsSupplier   java.lang.String    RefKeyUID       string             SYS            KeyColumns    50                    50            0         false            false            false       false                 1           true        true          false     false       
-UID            12             PartsSupplier   java.lang.String    UID             string             SYS            KeyColumns    50                    50            0         false            false            false       false                 0           true        true          false     false       
-Position       4              PartsSupplier   java.lang.Integer   Position        integer            SYS            KeyColumns    11                    10            0         false            true             false       true                  1           false       true          true      true        
-OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            KeyColumns    11                    10            0         false            false            false       false                 0           true        true          false     false       
+Name           12             PartsSupplier   java.lang.String    Name            string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
+KeyName        12             PartsSupplier   java.lang.String    KeyName         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 1           true        true          false     false       
+KeyType        12             PartsSupplier   java.lang.String    KeyType         string             SYS            KeyColumns    20                    20            0         false            true             false       false                 0           true        true          false     false       
+RefKeyUID      12             PartsSupplier   java.lang.String    RefKeyUID       string             SYS            KeyColumns    50                    50            0         false            true             false       false                 1           true        true          false     false       
+UID            12             PartsSupplier   java.lang.String    UID             string             SYS            KeyColumns    50                    50            0         false            true             false       false                 0           true        true          false     false       
+Position       4              PartsSupplier   java.lang.Integer   Position        integer            SYS            KeyColumns    11                    10            0         false            false            false       false                 1           true        true          true      false       
+OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            KeyColumns    11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -18,14 +18,14 @@
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pk_pg_proc                                                         <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-2e2ffa61-0000003f                  16         
 Row Count : 16
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            Keys          255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            Keys          255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            Keys          255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            Keys          255                   255           0         false            true             false       false                 1           true        true          false     false       
 TableName      12             PartsSupplier   java.lang.String    TableName       string             SYS            Keys          2048                  2048          0         false            true             false       false                 0           true        true          false     false       
-Name           12             PartsSupplier   java.lang.String    Name            string             SYS            Keys          255                   255           0         false            false            false       false                 0           true        true          false     false       
-Description    12             PartsSupplier   java.lang.String    Description     string             SYS            Keys          255                   255           0         false            false            false       false                 1           true        true          false     false       
-NameInSource   12             PartsSupplier   java.lang.String    NameInSource    string             SYS            Keys          255                   255           0         false            false            false       false                 1           true        true          false     false       
-Type           12             PartsSupplier   java.lang.String    Type            string             SYS            Keys          20                    20            0         false            false            false       false                 0           true        true          false     false       
+Name           12             PartsSupplier   java.lang.String    Name            string             SYS            Keys          255                   255           0         false            true             false       false                 0           true        true          false     false       
+Description    12             PartsSupplier   java.lang.String    Description     string             SYS            Keys          255                   255           0         false            true             false       false                 1           true        true          false     false       
+NameInSource   12             PartsSupplier   java.lang.String    NameInSource    string             SYS            Keys          255                   255           0         false            true             false       false                 1           true        true          false     false       
+Type           12             PartsSupplier   java.lang.String    Type            string             SYS            Keys          20                    20            0         false            true             false       false                 0           true        true          false     false       
 IsIndexed      -7             PartsSupplier   java.lang.Boolean   IsIndexed       boolean            SYS            Keys          5                     1             0         false            false            false       false                 0           true        true          false     false       
-RefKeyUID      12             PartsSupplier   java.lang.String    RefKeyUID       string             SYS            Keys          50                    50            0         false            false            false       false                 1           true        true          false     false       
-UID            12             PartsSupplier   java.lang.String    UID             string             SYS            Keys          50                    50            0         false            false            false       false                 0           true        true          false     false       
-OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            Keys          11                    10            0         false            false            false       false                 0           true        true          false     false       
+RefKeyUID      12             PartsSupplier   java.lang.String    RefKeyUID       string             SYS            Keys          50                    50            0         false            true             false       false                 1           true        true          false     false       
+UID            12             PartsSupplier   java.lang.String    UID             string             SYS            Keys          50                    50            0         false            true             false       false                 0           true        true          false     false       
+OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            Keys          11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,47 +1,47 @@
 string                                                             string                                                             string                                                             string                                                             string                     integer      string                                                             boolean   integer      integer      integer      integer      string      string                                              string                                                             integer    
 VDBName                                                            SchemaName                                                         ProcedureName                                                      Name                                                               DataType                   Position     Type                                                               Optional  Precision    TypeLength   Scale        Radix        NullType    UID                                                 Description                                                        OID        
-PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     Invalidate                                                         boolean                    2            In                                                                 false     0            0            0            10           No Nulls    mmuuid:5736cfd3-750f-42d8-b083-102061e11c60         <null>                                                             9          
-PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  Key                                                                object                     2            In                                                                 false     0            0            0            10           No Nulls    mmuuid:7af5a63b-1b91-4d1e-912e-846a7e84c579         <null>                                                             12         
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Name                                                               string                     3            In                                                                 false     0            0            0            10           No Nulls    mmuuid:ea92812c-1516-4c75-b5d3-c531fdbd8475         <null>                                                             22         
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        OldValue                                                           clob                       1            ReturnValue                                                        false     0            2097152      0            10           No Nulls    mmuuid:48034d50-dd11-4653-aeae-b0d8d3d55656         <null>                                                             20         
-PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     RowsUpdated                                                        integer                    3            ReturnValue                                                        false     0            0            0            10           No Nulls    mmuuid:d07a6a75-aa12-4dac-8eab-b2acdbaaffd8         <null>                                                             10         
-PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  RowsUpdated                                                        integer                    3            ReturnValue                                                        false     0            0            0            10           No Nulls    mmuuid:05a6a9be-c014-4d06-bcac-746cee4f118b         <null>                                                             13         
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        UID                                                                string                     2            In                                                                 false     0            50           0            10           No Nulls    mmuuid:d377510e-2ec5-445e-bdf0-59c7c0380962         <null>                                                             21         
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Value                                                              clob                       4            In                                                                 false     0            2097152      0            10           Nullable    mmuuid:ac5beeb8-2d0d-48ff-a533-4237d53b67e8         <null>                                                             23         
-PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     ViewName                                                           string                     1            In                                                                 false     0            0            0            10           No Nulls    mmuuid:e0c28e00-d987-48e4-8c60-5f637f10bf33         <null>                                                             8          
-PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  ViewName                                                           string                     1            In                                                                 false     0            0            0            10           No Nulls    mmuuid:ba635c44-a052-496d-9c35-ca010c0ebebe         <null>                                                             11         
-PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      cardinality                                                        integer                    2            In                                                                 false     0            0            0            10           No Nulls    mmuuid:0aba7849-7fd3-4bc6-a3d3-dfe433bc67a4         <null>                                                             25         
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     columnName                                                         string                     2            In                                                                 false     0            0            0            10           No Nulls    mmuuid:76553706-632f-4e60-8489-9d0361f58541         <null>                                                             15         
-PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         context                                                            string                     3            In                                                                 false     0            0            0            10           No Nulls    mmuuid:d62e3ceb-8e58-4c22-96b7-d76ee923e180         <null>                                                             3          
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             context                                                            string                     3            In                                                                 false     0            0            0            10           No Nulls    mmuuid:c3f22b88-7f80-4ae3-8e60-6953722b8c38         <null>                                                             6          
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     distinctCount                                                      integer                    3            In                                                                 false     0            0            0            10           Nullable    mmuuid:2c61976e-abb5-4c74-bdae-278681b82aa3         <null>                                                             16         
-PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      document                                                           string                     1            In                                                                 false     0            0            0            10           No Nulls    mmuuid:85b88af5-f0b8-401f-b35a-ccee56155492         <null>                                                             26         
-PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         level                                                              string                     2            In                                                                 false     0            0            0            10           No Nulls    mmuuid:995ab23a-3fd8-4ce0-aedd-6dcf99a65be1         <null>                                                             2          
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             level                                                              string                     2            In                                                                 false     0            0            0            10           No Nulls    mmuuid:ce0fd267-0038-49d5-ab1c-d8166d556b72         <null>                                                             5          
-PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         loggable                                                           boolean                    1            ReturnValue                                                        false     0            0            0            10           No Nulls    mmuuid:589773e4-2f8c-4972-ac0d-d694e317f154         <null>                                                             1          
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             logged                                                             boolean                    1            ReturnValue                                                        false     0            0            0            10           No Nulls    mmuuid:3086a5d9-ae1a-4c99-a649-ad9b8d3db8da         <null>                                                             4          
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     max                                                                string                     5            In                                                                 false     0            0            0            10           Nullable    mmuuid:8f42e701-3609-413d-8c10-77e32cd816f2         <null>                                                             18         
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     min                                                                string                     6            In                                                                 false     0            0            0            10           Nullable    mmuuid:4511ea3f-f2d2-4abf-b363-afb5186bc2d2         <null>                                                             19         
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             msg                                                                object                     4            In                                                                 false     0            0            0            10           No Nulls    mmuuid:81b921cc-9417-4655-898b-3d587ad3af16         <null>                                                             7          
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     nullCount                                                          integer                    4            In                                                                 false     0            0            0            10           Nullable    mmuuid:44b8c83c-9fcd-4bd2-a730-76e401205536         <null>                                                             17         
-PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      schema                                                             xml                        1            ResultSet                                                          false     0            0            0            10           Nullable    mmuuid:003980bb-38bb-41ad-b8c2-c87ca47aa554         <null>                                                             27         
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     tableName                                                          string                     1            In                                                                 false     0            0            0            10           No Nulls    mmuuid:4dcab018-ca4a-467b-96cc-7f28734c840e         <null>                                                             14         
-PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      tableName                                                          string                     1            In                                                                 false     0            0            0            10           No Nulls    mmuuid:28d8ad4a-e091-4934-afd9-7d27310bd370         <null>                                                             24         
+PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     Invalidate                                                         boolean                    2            In                                                                 false     1            1            0            10           No Nulls    tid:60b87e792634-09a20d5b-00000019                  <null>                                                             11         
+PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  Key                                                                object                     2            In                                                                 false     0            2147483647   0            0            No Nulls    tid:60b87e792634-0001263f-0000001d                  <null>                                                             14         
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Name                                                               string                     3            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-0024eeab-00000029                  <null>                                                             24         
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        OldValue                                                           clob                       1            ReturnValue                                                        false     0            2097152      0            0            No Nulls    tid:60b87e792634-0f2c17aa-00000027                  <null>                                                             22         
+PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     RowsUpdated                                                        integer                    3            ReturnValue                                                        false     10           4            0            10           No Nulls    tid:60b87e792634-884f8882-0000001a                  <null>                                                             12         
+PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  RowsUpdated                                                        integer                    3            ReturnValue                                                        false     10           4            0            10           No Nulls    tid:60b87e792634-884f8882-0000001e                  <null>                                                             15         
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        UID                                                                string                     2            In                                                                 false     0            50           0            0            No Nulls    tid:60b87e792634-00014830-00000028                  <null>                                                             23         
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        Value                                                              clob                       4            In                                                                 false     0            2097152      0            0            Nullable    tid:60b87e792634-04e9a151-0000002a                  <null>                                                             25         
+PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     ViewName                                                           string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-4b1eb2f0-00000018                  <null>                                                             10         
+PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  ViewName                                                           string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-4b1eb2f0-0000001c                  <null>                                                             13         
+PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      cardinality                                                        integer                    2            In                                                                 false     10           4            0            10           No Nulls    tid:60b87e792634-3260ed8e-0000002d                  <null>                                                             27         
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     columnName                                                         string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-827e2701-00000021                  <null>                                                             17         
+PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         context                                                            string                     3            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-38b735af-00000011                  <null>                                                             5          
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             context                                                            string                     3            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-38b735af-00000015                  <null>                                                             8          
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     distinctCount                                                      integer                    3            In                                                                 false     10           4            0            10           Nullable    tid:60b87e792634-98c12f73-00000022                  <null>                                                             18         
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      document                                                           string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:2cb59cfd55db-335cd11b-00000095                  <null>                                                             1          
+PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         level                                                              string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-06219b84-00000010                  <null>                                                             4          
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             level                                                              string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-06219b84-00000014                  <null>                                                             7          
+PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         loggable                                                           boolean                    1            ReturnValue                                                        false     1            1            0            10           No Nulls    tid:60b87e792634-786ed17d-0000000f                  <null>                                                             3          
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             logged                                                             boolean                    1            ReturnValue                                                        false     1            1            0            10           No Nulls    tid:60b87e792634-be97f582-00000013                  <null>                                                             6          
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     max                                                                string                     5            In                                                                 false     0            4000         0            0            Nullable    tid:60b87e792634-0001a564-00000024                  <null>                                                             20         
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     min                                                                string                     6            In                                                                 false     0            4000         0            0            Nullable    tid:60b87e792634-0001a652-00000025                  <null>                                                             21         
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             msg                                                                object                     4            In                                                                 false     0            2147483647   0            0            No Nulls    tid:60b87e792634-0001a781-00000016                  <null>                                                             9          
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     nullCount                                                          integer                    4            In                                                                 false     10           4            0            10           Nullable    tid:60b87e792634-3ca1f7c8-00000023                  <null>                                                             19         
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      schema                                                             xml                        1            ResultSet                                                          false     0            2147483647   0            0            Nullable    tid:2cb59cfd55db-c9e135a1-00000097                  <null>                                                             2          
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     tableName                                                          string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-89769379-00000020                  <null>                                                             16         
+PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      tableName                                                          string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-89769379-0000002c                  <null>                                                             26         
 Row Count : 27
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName     getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
 ProcedureName  12             PartsSupplier   java.lang.String    ProcedureName   string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
-Name           12             PartsSupplier   java.lang.String    Name            string             SYS            ProcedureParams  255                   255           0         false            false            false       false                 0           true        true          false     false       
-DataType       12             PartsSupplier   java.lang.String    DataType        string             SYS            ProcedureParams  25                    25            0         false            true             false       false                 0           true        true          true      false       
-Position       4              PartsSupplier   java.lang.Integer   Position        integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-Type           12             PartsSupplier   java.lang.String    Type            string             SYS            ProcedureParams  100                   100           0         false            false            false       false                 0           true        true          false     false       
+Name           12             PartsSupplier   java.lang.String    Name            string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
+DataType       12             PartsSupplier   java.lang.String    DataType        string             SYS            ProcedureParams  25                    25            0         false            true             false       false                 0           true        true          false     false       
+Position       4              PartsSupplier   java.lang.Integer   Position        integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+Type           12             PartsSupplier   java.lang.String    Type            string             SYS            ProcedureParams  100                   100           0         false            true             false       false                 0           true        true          false     false       
 Optional       -7             PartsSupplier   java.lang.Boolean   Optional        boolean            SYS            ProcedureParams  5                     1             0         false            false            false       false                 0           true        true          false     false       
-Precision      4              PartsSupplier   java.lang.Integer   Precision       integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-TypeLength     4              PartsSupplier   java.lang.Integer   TypeLength      integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-Scale          4              PartsSupplier   java.lang.Integer   Scale           integer            SYS            ProcedureParams  11                    10            0         false            false            false       true                  0           false       true          false     true        
-Radix          4              PartsSupplier   java.lang.Integer   Radix           integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
-NullType       12             PartsSupplier   java.lang.String    NullType        string             SYS            ProcedureParams  10                    10            0         false            false            false       false                 0           true        true          false     false       
-UID            12             PartsSupplier   java.lang.String    UID             string             SYS            ProcedureParams  50                    50            0         false            true             false       true                  1           false       true          true      true        
-Description    12             PartsSupplier   java.lang.String    Description     string             SYS            ProcedureParams  255                   255           0         false            true             false       true                  1           false       true          true      true        
-OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          false     false       
+Precision      4              PartsSupplier   java.lang.Integer   Precision       integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+TypeLength     4              PartsSupplier   java.lang.Integer   TypeLength      integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+Scale          4              PartsSupplier   java.lang.Integer   Scale           integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+Radix          4              PartsSupplier   java.lang.Integer   Radix           integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       
+NullType       12             PartsSupplier   java.lang.String    NullType        string             SYS            ProcedureParams  10                    10            0         false            true             false       false                 0           true        true          false     false       
+UID            12             PartsSupplier   java.lang.String    UID             string             SYS            ProcedureParams  50                    50            0         false            true             false       false                 1           true        true          false     false       
+Description    12             PartsSupplier   java.lang.String    Description     string             SYS            ProcedureParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
+OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            ProcedureParams  11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,20 +1,20 @@
 string                                                             string                                                             string                                                             string                                                             boolean         string                                              string                                                             integer    
 VDBName                                                            SchemaName                                                         Name                                                               NameInSource                                                       ReturnsResults  UID                                                 Description                                                        OID        
-PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      <null>                                                             true            mmuuid:68497bd9-30f5-461b-bf13-6b26aeb2fc4f         <null>                                                             8          
-PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         <null>                                                             false           mmuuid:36769e93-4cc3-417b-853e-5ee5e6653d01         <null>                                                             1          
-PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             <null>                                                             false           mmuuid:9a754e95-853b-40b2-a085-56d57f45953d         <null>                                                             2          
-PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     <null>                                                             false           mmuuid:52178344-dca8-4c76-8549-00a4515c7044         <null>                                                             3          
-PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  <null>                                                             false           mmuuid:1674912b-af56-465a-a1b9-d1de8b761f10         <null>                                                             4          
-PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     <null>                                                             false           mmuuid:49c367be-918f-43be-8b9e-99e275179859         <null>                                                             5          
-PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        <null>                                                             false           mmuuid:8db9b08e-3d6e-415a-9ceb-3fef726f424c         <null>                                                             6          
-PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      <null>                                                             false           mmuuid:6d167c35-04d1-41f6-83ff-888c39423823         <null>                                                             7          
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      <null>                                                             true            tid:2cb59cfd55db-b59a8ad1-00000094                  <null>                                                             1          
+PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         <null>                                                             false           tid:60b87e792634-492678c7-0000000e                  <null>                                                             2          
+PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             <null>                                                             false           tid:60b87e792634-be97959d-00000012                  <null>                                                             3          
+PartsSupplier                                                      SYSADMIN                                                           refreshMatView                                                     <null>                                                             false           tid:60b87e792634-d197ccca-00000017                  <null>                                                             4          
+PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  <null>                                                             false           tid:60b87e792634-9021c8b0-0000001b                  <null>                                                             5          
+PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     <null>                                                             false           tid:60b87e792634-3dd16127-0000001f                  <null>                                                             6          
+PartsSupplier                                                      SYSADMIN                                                           setProperty                                                        <null>                                                             false           tid:60b87e792634-3b607c57-00000026                  <null>                                                             7          
+PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      <null>                                                             false           tid:60b87e792634-c20fcf73-0000002b                  <null>                                                             8          
 Row Count : 8
 getColumnName   getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName         12             PartsSupplier   java.lang.String    VDBName         string             SYS            Procedures    255                   255           0         false            false            false       false                 0           true        true          false     false       
-SchemaName      12             PartsSupplier   java.lang.String    SchemaName      string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName         12             PartsSupplier   java.lang.String    VDBName         string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
+SchemaName      12             PartsSupplier   java.lang.String    SchemaName      string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 Name            12             PartsSupplier   java.lang.String    Name            string             SYS            Procedures    255                   255           0         false            true             false       false                 0           true        true          false     false       
-NameInSource    12             PartsSupplier   java.lang.String    NameInSource    string             SYS            Procedures    255                   255           0         false            false            false       false                 1           true        true          false     false       
+NameInSource    12             PartsSupplier   java.lang.String    NameInSource    string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
 ReturnsResults  -7             PartsSupplier   java.lang.Boolean   ReturnsResults  boolean            SYS            Procedures    5                     1             0         false            false            false       false                 0           true        true          false     false       
-UID             12             PartsSupplier   java.lang.String    UID             string             SYS            Procedures    50                    50            0         false            false            false       false                 0           true        true          false     false       
-Description     12             PartsSupplier   java.lang.String    Description     string             SYS            Procedures    255                   255           0         false            true             false       true                  1           false       true          true      true        
-OID             4              PartsSupplier   java.lang.Integer   OID             integer            SYS            Procedures    11                    10            0         false            false            false       false                 0           true        true          false     false       
+UID             12             PartsSupplier   java.lang.String    UID             string             SYS            Procedures    50                    50            0         false            true             false       false                 0           true        true          false     false       
+Description     12             PartsSupplier   java.lang.String    Description     string             SYS            Procedures    255                   255           0         false            true             false       false                 1           true        true          false     false       
+OID             4              PartsSupplier   java.lang.Integer   OID             integer            SYS            Procedures    11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -6,8 +6,8 @@
 pg_type:oid                                                        1028                                                               tid:7ff2755e9621-f418fbbe-0000003d                  4            Clob[4]                                                          
 Row Count : 4
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-Name           12             PartsSupplier   java.lang.String    Name            string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          true      false       
-Value          12             PartsSupplier   java.lang.String    Value           string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          true      false       
-UID            12             PartsSupplier   java.lang.String    UID             string             SYS            Properties    50                    50            0         false            false            false       false                 0           true        true          true      false       
-OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            Properties    11                    10            0         false            false            false       false                 0           true        true          false     false       
-ClobValue      2005           PartsSupplier   java.sql.Clob       ClobValue       clob               SYS            Properties    2097152               2097152       0         false            true             false       true                  1           false       true          true      true        
+Name           12             PartsSupplier   java.lang.String    Name            string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          false     false       
+Value          12             PartsSupplier   java.lang.String    Value           string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          false     false       
+UID            12             PartsSupplier   java.lang.String    UID             string             SYS            Properties    50                    50            0         false            true             false       false                 0           true        true          false     false       
+OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            Properties    11                    10            0         false            false            false       false                 0           true        true          true      false       
+ClobValue      2005           PartsSupplier   java.sql.Clob       ClobValue       clob               SYS            Properties    2097152               2097152       0         false            true             false       false                 1           true        true          false     false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -5,17 +5,17 @@
 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        
+PKTABLE_CAT    12             PartsSupplier   java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_SCHEM  12             PartsSupplier   java.lang.String    PKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKTABLE_NAME   12             PartsSupplier   java.lang.String    PKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PKCOLUMN_NAME  12             PartsSupplier   java.lang.String    PKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_CAT    12             PartsSupplier   java.lang.String    FKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_SCHEM  12             PartsSupplier   java.lang.String    FKTABLE_SCHEM   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKTABLE_NAME   12             PartsSupplier   java.lang.String    FKTABLE_NAME    string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+FKCOLUMN_NAME  12             PartsSupplier   java.lang.String    FKCOLUMN_NAME   string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+KEY_SEQ        5              PartsSupplier   java.lang.Short     KEY_SEQ         short              SYS            ReferenceKeyColumns  6                     5             0         false            false            false       false                 1           true        true          true      false       
+UPDATE_RULE    4              PartsSupplier   java.lang.Integer   UPDATE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+DELETE_RULE    4              PartsSupplier   java.lang.Integer   DELETE_RULE     integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_NAME        12             PartsSupplier   java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+PK_NAME        12             PartsSupplier   java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
+DEFERRABILITY  4              PartsSupplier   java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,15 +1,15 @@
 string                                                             string                                                             boolean     string                                              string                                                             string                                                             integer    
 VDBName                                                            Name                                                               IsPhysical  UID                                                 Description                                                        PrimaryMetamodelURI                                                OID        
 PartsSupplier                                                      PartsSupplier                                                      true        mmuuid:19c7f380-73d8-1edc-a81c-ecf397b10590         <null>                                                             http://www.metamatrix.com/metamodels/Relational                    1          
-PartsSupplier                                                      SYS                                                                true        mmuuid:49b9c0f9-2c4c-42d3-9409-2d847d29a1de         System                                                             http://www.metamatrix.com/metamodels/Relational                    3          
-PartsSupplier                                                      SYSADMIN                                                           true        mmuuid:82f6153e-31e0-4034-b335-013cb418da34         <null>                                                             http://www.metamatrix.com/metamodels/Relational                    2          
+PartsSupplier                                                      SYS                                                                true        tid:2cb59cfd55db-000142ad-00000000                  <null>                                                             http://www.metamatrix.com/metamodels/Relational                    2          
+PartsSupplier                                                      SYSADMIN                                                           true        tid:60b87e792634-a3626ca2-00000000                  <null>                                                             http://www.metamatrix.com/metamodels/Relational                    3          
 PartsSupplier                                                      pg_catalog                                                         true        tid:7ff2755e9621-35592dd1-00000000                  <null>                                                             http://www.metamatrix.com/metamodels/Relational                    4          
 Row Count : 4
 getColumnName        getColumnType  getCatalogName  getColumnClassName  getColumnLabel       getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName              12             PartsSupplier   java.lang.String    VDBName              string             SYS            Schemas       255                   255           0         false            true             false       true                  1           false       true          true      true        
-Name                 12             PartsSupplier   java.lang.String    Name                 string             SYS            Schemas       255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName              12             PartsSupplier   java.lang.String    VDBName              string             SYS            Schemas       255                   255           0         false            true             false       false                 1           true        true          false     false       
+Name                 12             PartsSupplier   java.lang.String    Name                 string             SYS            Schemas       255                   255           0         false            true             false       false                 1           true        true          false     false       
 IsPhysical           -7             PartsSupplier   java.lang.Boolean   IsPhysical           boolean            SYS            Schemas       5                     1             0         false            false            false       false                 0           true        true          false     false       
-UID                  12             PartsSupplier   java.lang.String    UID                  string             SYS            Schemas       50                    50            0         false            false            false       false                 0           true        true          false     false       
-Description          12             PartsSupplier   java.lang.String    Description          string             SYS            Schemas       255                   255           0         false            true             false       true                  1           false       true          true      true        
-PrimaryMetamodelURI  12             PartsSupplier   java.lang.String    PrimaryMetamodelURI  string             SYS            Schemas       255                   255           0         false            false            false       false                 0           true        true          false     false       
-OID                  4              PartsSupplier   java.lang.Integer   OID                  integer            SYS            Schemas       11                    10            0         false            false            false       false                 0           true        true          false     false       
+UID                  12             PartsSupplier   java.lang.String    UID                  string             SYS            Schemas       50                    50            0         false            true             false       false                 0           true        true          false     false       
+Description          12             PartsSupplier   java.lang.String    Description          string             SYS            Schemas       255                   255           0         false            true             false       false                 1           true        true          false     false       
+PrimaryMetamodelURI  12             PartsSupplier   java.lang.String    PrimaryMetamodelURI  string             SYS            Schemas       255                   255           0         false            true             false       false                 0           true        true          false     false       
+OID                  4              PartsSupplier   java.lang.Integer   OID                  integer            SYS            Schemas       11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -1,23 +1,23 @@
 string                                                             string                                                             string                                                             string                string                                                             boolean     boolean          string                                              integer      string                                                             boolean   boolean         integer    
 VDBName                                                            SchemaName                                                         Name                                                               Type                  NameInSource                                                       IsPhysical  SupportsUpdates  UID                                                 Cardinality  Description                                                        IsSystem  IsMaterialized  OID        
-PartsSupplier                                                      SYS                                                                Columns                                                            Table                 <null>                                                             true        false            mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509         -1           <null>                                                             true      false           8          
-PartsSupplier                                                      SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957         -1           <null>                                                             true      false           9          
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            mmuuid:14946083-3bd5-42d5-8283-1c0694347c29         -1           <null>                                                             true      false           10         
-PartsSupplier                                                      SYS                                                                Keys                                                               Table                 <null>                                                             true        false            mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108         -1           <null>                                                             true      false           11         
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256         -1           <null>                                                             true      false           6          
+PartsSupplier                                                      SYS                                                                Columns                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-9bd42fbd-00000001                  -1           <null>                                                             true      false           6          
+PartsSupplier                                                      SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6130d2cf-00000021                  -1           <null>                                                             true      false           7          
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-c5c6549e-00000035                  -1           <null>                                                             true      false           8          
+PartsSupplier                                                      SYS                                                                Keys                                                               Table                 <null>                                                             true        false            tid:2cb59cfd55db-0023a214-00000040                  -1           <null>                                                             true      false           9          
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            tid:60b87e792634-14d6450e-00000001                  -1           <null>                                                             true      false           17         
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                Table                 PARTS                                                              true        true             mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           1          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             Table                 SHIP_VIA                                                           true        true             mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590         4            <null>                                                             false     false           2          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               Table                 STATUS                                                             true        true             mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         3            <null>                                                             false     false           3          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             Table                 SUPPLIER                                                           true        true             mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           4          
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       Table                 SUPPLIER_PARTS                                                     true        true             mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         227          <null>                                                             false     false           5          
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626         -1           <null>                                                             true      false           12         
-PartsSupplier                                                      SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962         -1           <null>                                                             true      false           13         
-PartsSupplier                                                      SYS                                                                Properties                                                         Table                 <null>                                                             true        false            mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85         -1           <null>                                                             true      false           14         
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29         -1           <null>                                                             true      false           15         
-PartsSupplier                                                      SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9         -1           <null>                                                             true      false           16         
-PartsSupplier                                                      SYS                                                                Tables                                                             Table                 <null>                                                             true        false            mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7         -1           <null>                                                             true      false           17         
-PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            mmuuid:1785804d-beaf-4831-9531-e59164fedd49         -1           <null>                                                             true      false           7          
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489         -1           <null>                                                             true      false           18         
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-0000004c                  -1           <null>                                                             true      false           10         
+PartsSupplier                                                      SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000005d                  -1           <null>                                                             true      false           11         
+PartsSupplier                                                      SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000066                  -1           <null>                                                             true      false           12         
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000006c                  -1           <null>                                                             true      false           13         
+PartsSupplier                                                      SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-0000007b                  -1           <null>                                                             true      false           14         
+PartsSupplier                                                      SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-00000083                  -1           <null>                                                             true      false           15         
+PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            tid:60b87e792634-1e9b1131-0000000b                  -1           <null>                                                             true      false           18         
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-00000091                  -1           <null>                                                             true      false           16         
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-00000068                  -1           <null>                                                             true      true            19         
 PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-0000005e                  -1           <null>                                                             true      true            20         
 PartsSupplier                                                      pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-00000031                  -1           <null>                                                             true      false           21         
@@ -33,16 +33,16 @@
 PartsSupplier                                                      pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-00000059                  -1           <null>                                                             true      false           31         
 Row Count : 31
 getColumnName    getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-VDBName          12             PartsSupplier   java.lang.String    VDBName          string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-SchemaName       12             PartsSupplier   java.lang.String    SchemaName       string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
+VDBName          12             PartsSupplier   java.lang.String    VDBName          string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+SchemaName       12             PartsSupplier   java.lang.String    SchemaName       string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 Name             12             PartsSupplier   java.lang.String    Name             string             SYS            Tables        255                   255           0         false            true             false       false                 0           true        true          false     false       
-Type             12             PartsSupplier   java.lang.String    Type             string             SYS            Tables        20                    20            0         false            false            false       false                 0           true        true          false     false       
+Type             12             PartsSupplier   java.lang.String    Type             string             SYS            Tables        20                    20            0         false            true             false       false                 0           true        true          false     false       
 NameInSource     12             PartsSupplier   java.lang.String    NameInSource     string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
-IsPhysical       -7             PartsSupplier   java.lang.Boolean   IsPhysical       boolean            SYS            Tables        5                     1             0         false            true             false       false                 0           true        true          false     false       
+IsPhysical       -7             PartsSupplier   java.lang.Boolean   IsPhysical       boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       
 SupportsUpdates  -7             PartsSupplier   java.lang.Boolean   SupportsUpdates  boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       
-UID              12             PartsSupplier   java.lang.String    UID              string             SYS            Tables        50                    50            0         false            false            false       false                 0           true        true          false     false       
-Cardinality      4              PartsSupplier   java.lang.Integer   Cardinality      integer            SYS            Tables        11                    10            0         false            true             false       false                 0           true        true          true      false       
-Description      12             PartsSupplier   java.lang.String    Description      string             SYS            Tables        255                   255           0         false            true             false       true                  1           false       true          true      true        
-IsSystem         -7             PartsSupplier   java.lang.Boolean   IsSystem         boolean            SYS            Tables        5                     1             0         false            true             false       true                  1           false       true          true      true        
-IsMaterialized   -7             PartsSupplier   java.lang.Boolean   IsMaterialized   boolean            SYS            Tables        5                     1             0         false            false            false       true                  0           false       true          false     true        
-OID              4              PartsSupplier   java.lang.Integer   OID              integer            SYS            Tables        11                    10            0         false            false            false       false                 0           true        true          false     false       
+UID              12             PartsSupplier   java.lang.String    UID              string             SYS            Tables        50                    50            0         false            true             false       false                 0           true        true          false     false       
+Cardinality      4              PartsSupplier   java.lang.Integer   Cardinality      integer            SYS            Tables        11                    10            0         false            false            false       false                 0           true        true          true      false       
+Description      12             PartsSupplier   java.lang.String    Description      string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
+IsSystem         -7             PartsSupplier   java.lang.Boolean   IsSystem         boolean            SYS            Tables        5                     1             0         false            false            false       false                 1           true        true          false     false       
+IsMaterialized   -7             PartsSupplier   java.lang.Boolean   IsMaterialized   boolean            SYS            Tables        5                     1             0         false            false            false       false                 0           true        true          false     false       
+OID              4              PartsSupplier   java.lang.Integer   OID              integer            SYS            Tables        11                    10            0         false            false            false       false                 0           true        true          true      false       

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -22,5 +22,5 @@
 /runtime-inf/PROC_TRANSFORM.INDEX                                  Blob[8212]                                                       
 Row Count : 20
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-resourcePath   12             PartsSupplier   java.lang.String    resourcePath    string             SYSADMIN       VDBResources  255                   255           0         false            true             false       false                 1           true        true          true      false       
-contents       2004           PartsSupplier   java.sql.Blob       contents        blob               SYSADMIN       VDBResources  2147483647            2147483647    0         false            true             false       false                 1           true        true          true      false       
+resourcePath   12             PartsSupplier   java.lang.String    resourcePath    string             SYSADMIN       VDBResources  255                   255           0         false            true             false       false                 1           true        true          false     false       
+contents       2004           PartsSupplier   java.sql.Blob       contents        blob               SYSADMIN       VDBResources  2147483647            2147483647    0         false            false            false       false                 1           true        false         false     false       

Modified: trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected	2012-07-19 12:14:32 UTC (rev 4244)
+++ trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected	2012-07-19 15:47:33 UTC (rev 4245)
@@ -8,6 +8,6 @@
 pg_type:oid                                                        1028                                                               tid:7ff2755e9621-f418fbbe-0000003d                
 Row Count : 6
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-Name           12             xmlvp           java.lang.String    Name            string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          true      false       
-Value          12             xmlvp           java.lang.String    Value           string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          true      false       
-UID            12             xmlvp           java.lang.String    UID             string             SYS            Properties    50                    50            0         false            false            false       false                 0           true        true          true      false       
+Name           12             xmlvp           java.lang.String    Name            string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          false     false       
+Value          12             xmlvp           java.lang.String    Value           string             SYS            Properties    255                   255           0         false            true             false       false                 0           true        true          false     false       
+UID            12             xmlvp           java.lang.String    UID             string             SYS            Properties    50                    50            0         false            true             false       false                 0           true        true          false     false       



More information about the teiid-commits mailing list