[teiid-commits] teiid SVN: r4434 - in trunk: api/src/main/java/org/teiid/metadata and 26 other directories.

Author: shawkins Date: 2012-09-13 07:16:46 -0400 (Thu, 13 Sep 2012) New Revision: 4434 Added: trunk/engine/src/main/java/org/teiid/dqp/internal/process/BaseExtractionTable.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/RecordTable.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/SchemaRecordTable.java trunk/engine/src/main/java/org/teiid/query/tempdata/BaseIndexInfo.java trunk/engine/src/main/java/org/teiid/query/tempdata/SearchableTable.java trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_alltypes.expected trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_void.expected trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_with_return.expected trunk/test-integration/common/src/test/resources/TestVDBMerge/ trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.after.expected trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.before.expected trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.test.expected trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.after.expected trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.before.expected trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestSystemPerformance.java Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java trunk/api/src/main/java/org/teiid/metadata/Schema.java trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java trunk/engine/src/main/java/org/teiid/query/metadata/CompositeMetadataStore.java trunk/engine/src/main/java/org/teiid/query/metadata/TempCapabilitiesFinder.java trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java trunk/engine/src/main/java/org/teiid/query/sql/lang/CompoundCriteria.java trunk/engine/src/main/java/org/teiid/query/sql/lang/Criteria.java trunk/engine/src/main/java/org/teiid/query/sql/visitor/ElementCollectorVisitor.java trunk/engine/src/main/java/org/teiid/query/tempdata/IndexInfo.java trunk/engine/src/main/java/org/teiid/query/tempdata/TempTable.java trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java trunk/metadata/src/test/resources/schema.ser trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/HardCodedExecutionFactory.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCProceduresSchema.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 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/TestODBCProceduresSchema/test_Pg_Proc_with_return_table.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_INDEX.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/testPgProc.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/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/testSchemas.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected Log: TEIID-2181 adding support for index based system table queries Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -56,6 +56,7 @@ private ConnectionType connectionType = VDB.ConnectionType.BY_VERSION; private long queryTimeout = Long.MIN_VALUE; private Set<String> importedModels = Collections.emptySet(); + private Set<String> multiSource; public String getFullName() { return getName() + VERSION_DELIM + getVersion(); @@ -192,13 +193,16 @@ } public Set<String> getMultiSourceModelNames(){ - Set<String> list = new HashSet<String>(); - for(ModelMetaData m: models.values()) { - if (m.isSupportsMultiSourceBindings()) { - list.add(m.getName()); + if (multiSource == null) { + HashSet<String> set = new HashSet<String>(); + for(ModelMetaData m: models.values()) { + if (m.isSupportsMultiSourceBindings()) { + set.add(m.getName()); + } } + multiSource = set; } - return list; + return multiSource; } public boolean isDynamic() { Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -149,6 +149,7 @@ Column column = new Column(); column.setName(name); table.addColumn(column); + column.setParent(table); column.setPosition(table.getColumns().size()); //1 based indexing setColumnType(type, column); setUUID(column); Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; +import java.util.NavigableMap; import java.util.TreeMap; import org.teiid.connector.DataPlugin; @@ -37,11 +37,11 @@ public class MetadataStore implements Serializable { private static final long serialVersionUID = -3130247626435324312L; - protected Map<String, Schema> schemas = new TreeMap<String, Schema>(String.CASE_INSENSITIVE_ORDER); + protected NavigableMap<String, Schema> schemas = new TreeMap<String, Schema>(String.CASE_INSENSITIVE_ORDER); protected List<Schema> schemaList = new ArrayList<Schema>(); //used for a stable ordering - protected Map<String, Datatype> datatypes = new TreeMap<String, Datatype>(); + protected NavigableMap<String, Datatype> datatypes = new TreeMap<String, Datatype>(String.CASE_INSENSITIVE_ORDER); - public Map<String, Schema> getSchemas() { + public NavigableMap<String, Schema> getSchemas() { return schemas; } @@ -72,7 +72,7 @@ this.datatypes.put(datatype.getName(), datatype); } - public Map<String, Datatype> getDatatypes() { + public NavigableMap<String, Datatype> getDatatypes() { return datatypes; } Modified: trunk/api/src/main/java/org/teiid/metadata/Schema.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -24,6 +24,7 @@ import java.io.IOException; import java.util.Map; +import java.util.NavigableMap; import java.util.TreeMap; import org.teiid.connector.DataPlugin; @@ -35,8 +36,8 @@ private boolean physical = true; private String primaryMetamodelUri = "http://www.metamatrix.com/metamodels/Relational"; //$NON-NLS-1$ - private Map<String, Table> tables = new TreeMap<String, Table>(String.CASE_INSENSITIVE_ORDER); - private Map<String, Procedure> procedures = new TreeMap<String, Procedure>(String.CASE_INSENSITIVE_ORDER); + private NavigableMap<String, Table> tables = new TreeMap<String, Table>(String.CASE_INSENSITIVE_ORDER); + private NavigableMap<String, Procedure> procedures = new TreeMap<String, Procedure>(String.CASE_INSENSITIVE_ORDER); private Map<String, FunctionMethod> functions = new TreeMap<String, FunctionMethod>(String.CASE_INSENSITIVE_ORDER); public void addTable(Table table) { @@ -65,7 +66,7 @@ * Get the tables defined in this schema * @return */ - public Map<String, Table> getTables() { + public NavigableMap<String, Table> getTables() { return tables; } @@ -77,7 +78,7 @@ * Get the procedures defined in this schema * @return */ - public Map<String, Procedure> getProcedures() { + public NavigableMap<String, Procedure> getProcedures() { return procedures; } Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-09-13 11:16:46 UTC (rev 4434) @@ -35,6 +35,7 @@ <li>TEIID-2111 <b>Vararg Procedures</b> - variable argument procedures and functions can be created through DDL using the VARIADIC parameter type. See the Reference for usage. <li>TEIID-2195 <b>Function Based Indexes</b> - DDL can be used to specify function based indexes. When used on an internal mat view it will create the corresponding function based index automatically. In any other circumstance, the metadata is not currently used. + <li>TEIID-2181 <b>System query performance</b> - system queries are now indexed on case-insensitive schema/table name columns. </ul> <h2><a name="Compatibility">Compatibility Issues</a></h2> @@ -51,6 +52,7 @@ to truncate. The exception and the use of 32 bit serialization can be avoided by setting the system property org.teiid.longDatesTimes to true. <li>TEIID-2184 to be consistent with the rest of Teiid's logic the system functions dayName and monthName will return values from the default locale, rather than only the English names. Use the system property org.teiid.enDateNames true to revert to the pre-8.2 behavior. <li>TEIID-2187 the CONSTRAINT keyword is not correctly used in table DDL. It should be replaced with a comma from scripts to be compatible with 8.2. If desired, 8.2 now supports the CONSTRAINT keyword to provide a name for each constraint. + <li>TEIID-2181 system tables no longer contain valid OIDs. That responsibility has moved to the pg_catalog. </ul> <h4>from 8.0</h4> Added: trunk/engine/src/main/java/org/teiid/dqp/internal/process/BaseExtractionTable.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/BaseExtractionTable.java (rev 0) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/BaseExtractionTable.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,173 @@ +/* + * 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.dqp.internal.process; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.api.exception.query.QueryMetadataException; +import org.teiid.common.buffer.TupleSource; +import org.teiid.core.TeiidComponentException; +import org.teiid.core.TeiidProcessingException; +import org.teiid.dqp.internal.process.RecordTable.ExpandingSimpleIterator; +import org.teiid.dqp.internal.process.RecordTable.SimpleIterator; +import org.teiid.dqp.internal.process.RecordTable.SimpleIteratorWrapper; +import org.teiid.metadata.AbstractMetadataRecord; +import org.teiid.query.eval.Evaluator; +import org.teiid.query.metadata.TransformationMetadata; +import org.teiid.query.processor.relational.RelationalNode; +import org.teiid.query.sql.lang.Criteria; +import org.teiid.query.sql.lang.Query; +import org.teiid.query.sql.symbol.ElementSymbol; +import org.teiid.query.sql.symbol.Expression; +import org.teiid.query.tempdata.BaseIndexInfo; +import org.teiid.query.util.CommandContext; + +abstract class BaseExtractionTable<T> { + + static final class ExtractionTupleSource<T> implements TupleSource { + private final Criteria condition; + private final SimpleIterator<T> iter; + private final CommandContext cc; + private final VDBMetaData vdb; + private final TransformationMetadata metadata; + private ArrayList<Object> rowBuffer; + private BaseExtractionTable<T> extraction; + + ExtractionTupleSource(Criteria condition, + SimpleIterator<T> iter, CommandContext cc, VDBMetaData vdb, + TransformationMetadata metadata, BaseExtractionTable<T> extraction) { + this.condition = condition; + this.iter = iter; + this.cc = cc; + this.vdb = vdb; + this.metadata = metadata; + this.extraction = extraction; + } + + @Override + public List<?> nextTuple() throws TeiidComponentException, + TeiidProcessingException { + while (true) { + T val = iter.next(); + if (val == null) { + return null; + } + if (rowBuffer == null) { + rowBuffer = new ArrayList<Object>(extraction.cols); + } else { + rowBuffer.clear(); + } + extraction.fillRow(rowBuffer, val, vdb, metadata, cc, iter); + if (condition == null || extraction.eval.evaluate(condition, rowBuffer)) { + List<?> result = rowBuffer; + rowBuffer = null; + return result; + } + + } + } + + @Override + public void closeSource() { + + } + } + + private Evaluator eval; + private int cols; + + public BaseExtractionTable(List<ElementSymbol> columns) { + Map<Expression, Integer> map = RelationalNode.createLookupMap(columns); + this.eval = new Evaluator(map, null, null); + this.cols = columns.size(); + } + + public TupleSource processQuery(Query query, final VDBMetaData vdb, final TransformationMetadata metadata, final CommandContext cc) throws QueryMetadataException, TeiidComponentException { + return new ExtractionTupleSource(query.getCriteria(), createIterator(vdb, metadata, cc), cc, vdb, metadata, this); + } + + protected SimpleIterator<T> createIterator(final VDBMetaData vdb, final TransformationMetadata metadata, final CommandContext cc) throws QueryMetadataException, TeiidComponentException { + return null; + } + + protected abstract void fillRow(List<Object> row, T record, VDBMetaData vdb, TransformationMetadata metadata, CommandContext cc, SimpleIterator<T> iter); + +} + +abstract class RecordExtractionTable<T extends AbstractMetadataRecord> extends BaseExtractionTable<T> { + private RecordTable<T> baseTable; + + public RecordExtractionTable(RecordTable<T> baseTable, List<ElementSymbol> columns) { + super(columns); + this.baseTable = baseTable; + } + + @Override + public TupleSource processQuery(Query query, VDBMetaData vdb, + TransformationMetadata metadata, CommandContext cc) { + BaseIndexInfo<?> ii = baseTable.planQuery(query, query.getCriteria()); + final SimpleIterator<T> iter = baseTable.processQuery(vdb, metadata.getMetadataStore(), ii); + return new ExtractionTupleSource<T>(ii.getNonCoveredCriteria(), iter, cc, vdb, metadata, this); + } + +} + +abstract class ChildRecordExtractionTable<P extends AbstractMetadataRecord, T> extends BaseExtractionTable<T> { + private RecordTable<P> baseTable; + + public ChildRecordExtractionTable(RecordTable<P> baseTable, List<ElementSymbol> columns) { + super(columns); + this.baseTable = baseTable; + } + + @Override + public TupleSource processQuery(Query query, VDBMetaData vdb, + TransformationMetadata metadata, CommandContext cc) { + BaseIndexInfo<?> ii = baseTable.planQuery(query, query.getCriteria()); + final SimpleIterator<P> iter = baseTable.processQuery(vdb, metadata.getMetadataStore(), ii); + while (ii.next != null) { + ii = ii.next; + } + return new ExtractionTupleSource<T>(ii.getNonCoveredCriteria(), new ExpandingSimpleIterator<P, T>(iter) { + + SimpleIteratorWrapper<T> wrapper = new SimpleIteratorWrapper<T>(null); + + protected RecordTable.SimpleIterator<T> getChildIterator(P parent) { + Collection<? extends T> children = getChildren(parent); + if (children.isEmpty()) { + return RecordTable.emptyIterator(); + } + wrapper.setIterator(children.iterator()); + return wrapper; + } + + }, cc, vdb, metadata, this); + } + + protected abstract Collection<? extends T> getChildren(P parent); + +} Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/process/BaseExtractionTable.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -36,6 +36,8 @@ import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.capabilities.SourceCapabilities; +import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability; +import org.teiid.translator.SourceSystemFunctions; import org.teiid.translator.TranslatorException; @@ -44,6 +46,19 @@ public class CachedFinder implements CapabilitiesFinder { private static BasicSourceCapabilities SYSTEM_CAPS = new BasicSourceCapabilities(); + static { + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_IN, true); + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_COMPARE_EQ, true); + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_COMPARE_ORDERED, true); + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_ONLY_LITERAL_COMPARE, true); + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_LIKE, true); + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_LIKE_ESCAPE, true); + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_LIKE_REGEX, true); + SYSTEM_CAPS.setCapabilitySupport(Capability.CRITERIA_SIMILAR, true); + SYSTEM_CAPS.setFunctionSupport(SourceSystemFunctions.UCASE, true); + SYSTEM_CAPS.setSourceProperty(Capability.MAX_IN_CRITERIA_SIZE, 100000); + SYSTEM_CAPS.setSourceProperty(Capability.MAX_DEPENDENT_PREDICATES, 1); + } private ConnectorManagerRepository connectorRepo; private VDBMetaData vdb; Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -30,10 +30,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.LinkedHashSet; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.Map.Entry; import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; @@ -46,7 +47,9 @@ import org.teiid.common.buffer.BufferManager.TupleSourceType; import org.teiid.core.CoreConstants; import org.teiid.core.TeiidComponentException; +import org.teiid.core.TeiidException; import org.teiid.core.TeiidProcessingException; +import org.teiid.core.TeiidRuntimeException; import org.teiid.core.types.BlobType; import org.teiid.core.types.ClobImpl; import org.teiid.core.types.ClobType; @@ -58,6 +61,9 @@ import org.teiid.dqp.internal.datamgr.ConnectorManager; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; import org.teiid.dqp.internal.datamgr.ConnectorWork; +import org.teiid.dqp.internal.process.RecordTable.ExpandingSimpleIterator; +import org.teiid.dqp.internal.process.RecordTable.SimpleIterator; +import org.teiid.dqp.internal.process.RecordTable.SimpleIteratorWrapper; import org.teiid.dqp.internal.process.SessionAwareCache.CacheID; import org.teiid.dqp.internal.process.TupleSourceCache.CachableVisitor; import org.teiid.dqp.message.AtomicRequestMessage; @@ -69,22 +75,28 @@ import org.teiid.metadata.*; import org.teiid.query.QueryPlugin; import org.teiid.query.metadata.CompositeMetadataStore; +import org.teiid.query.metadata.SystemMetadata; import org.teiid.query.metadata.TempMetadataID; import org.teiid.query.metadata.TransformationMetadata; +import org.teiid.query.metadata.CompositeMetadataStore.RecordHolder; import org.teiid.query.optimizer.relational.RelationalPlanner; import org.teiid.query.parser.ParseInfo; import org.teiid.query.processor.CollectionTupleSource; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.processor.RegisterRequestParameter; +import org.teiid.query.resolver.util.ResolverUtil; import org.teiid.query.sql.lang.Command; +import org.teiid.query.sql.lang.Criteria; import org.teiid.query.sql.lang.Query; import org.teiid.query.sql.lang.SourceHint; import org.teiid.query.sql.lang.StoredProcedure; import org.teiid.query.sql.lang.UnaryFromClause; import org.teiid.query.sql.navigator.PreOrPostOrderNavigator; import org.teiid.query.sql.symbol.Constant; +import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.GroupSymbol; import org.teiid.query.sql.visitor.GroupCollectorVisitor; +import org.teiid.query.tempdata.BaseIndexInfo; import org.teiid.query.tempdata.GlobalTableStore; import org.teiid.query.tempdata.GlobalTableStoreImpl.MatTableInfo; import org.teiid.query.util.CommandContext; @@ -124,11 +136,11 @@ SETCOLUMNSTATS, SETPROPERTY, LOGMSG, - ISLOGGABLE + ISLOGGABLE, } private enum SystemProcs { - GETXMLSCHEMAS + GETXMLSCHEMAS, } private static final TreeMap<String, Integer> levelMap = new TreeMap<String, Integer>(String.CASE_INSENSITIVE_ORDER); @@ -155,11 +167,458 @@ private BufferManager bufferManager; private EventDistributor eventDistributor; private boolean detectChangeEvents; + + private Map<SystemTables, BaseExtractionTable<?>> systemTables = new HashMap<SystemTables, BaseExtractionTable<?>>(); + private Map<SystemAdminTables, BaseExtractionTable<?>> systemAdminTables = new HashMap<SystemAdminTables, BaseExtractionTable<?>>(); + + private int i; public DataTierManagerImpl(DQPCore requestMgr, BufferManager bufferMgr, boolean detectChangeEvents) { this.requestMgr = requestMgr; this.bufferManager = bufferMgr; this.detectChangeEvents = detectChangeEvents; + MetadataStore ms = SystemMetadata.getInstance().getSystemStore(); + TransformationMetadata tm = new TransformationMetadata(null, new CompositeMetadataStore(ms), null, null, null); + String name = SystemTables.SCHEMAS.name(); + List<ElementSymbol> columns = getColumns(tm, name); + systemTables.put(SystemTables.SCHEMAS, new RecordExtractionTable<Schema>(new SchemaRecordTable(1, columns), columns) { + + @Override + public void fillRow(List<Object> row, Schema model, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<Schema> iter) { + row.add(vdb.getName()); + row.add(model.getName()); + row.add(model.isPhysical()); + row.add(model.getUUID()); + row.add(model.getAnnotation()); + row.add(model.getPrimaryMetamodelUri()); + row.add(null); + } + }); + name = SystemTables.TABLES.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.TABLES, new RecordExtractionTable<Table>(new TableSystemTable(1, 2, columns), columns) { + + @Override + public void fillRow(List<Object> row, Table table, + VDBMetaData v, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<Table> iter) { + row.add(v.getName()); + row.add(table.getParent().getName()); + row.add(table.getName()); + row.add(table.getTableType().toString()); + row.add(table.getNameInSource()); + row.add(table.isPhysical()); + row.add(table.supportsUpdate()); + row.add(table.getUUID()); + row.add(table.getCardinality()); + row.add(table.getAnnotation()); + row.add(table.isSystem()); + row.add(table.isMaterialized()); + row.add(null); + } + }); + name = SystemAdminTables.MATVIEWS.name(); + columns = getColumns(tm, name); + systemAdminTables.put(SystemAdminTables.MATVIEWS, new RecordExtractionTable<Table>(new TableSystemTable(1, 2, columns) { + @Override + protected boolean isValid(Table s, VDBMetaData vdb, + List<Object> rowBuffer, Criteria condition) + throws TeiidProcessingException, TeiidComponentException { + if (s == null || !s.isMaterialized()) { + return false; + } + return super.isValid(s, vdb, rowBuffer, condition); + } + }, columns) { + + @Override + public void fillRow(List<Object> row, Table table, + VDBMetaData v, TransformationMetadata m, CommandContext cc, SimpleIterator<Table> iter) { + String targetSchema = null; + String matTableName = null; + String state = null; + Timestamp updated = null; + Integer cardinaltity = null; + Boolean valid = null; + if (table.getMaterializedTable() == null) { + GlobalTableStore globalStore = cc.getGlobalTableStore(); + matTableName = RelationalPlanner.MAT_PREFIX+table.getFullName().toUpperCase(); + MatTableInfo info = globalStore.getMatTableInfo(matTableName); + valid = info.isValid(); + state = info.getState().name(); + updated = info.getUpdateTime()==-1?null:new Timestamp(info.getUpdateTime()); + TempMetadataID id = globalStore.getTempTableStore().getMetadataStore().getTempGroupID(matTableName); + if (id != null) { + cardinaltity = id.getCardinality(); + } + //ttl, pref_mem - not part of proper metadata + } else { + Table t = table.getMaterializedTable(); + matTableName = t.getName(); + targetSchema = t.getParent().getName(); + } + row.add(v.getName()); + row.add(table.getParent().getName()); + row.add(table.getName()); + row.add(targetSchema); + row.add(matTableName); + row.add(valid); + row.add(state); + row.add(updated); + row.add(cardinaltity); + } + }); + name = SystemAdminTables.VDBRESOURCES.name(); + columns = getColumns(tm, name); + systemAdminTables.put(SystemAdminTables.VDBRESOURCES, new BaseExtractionTable<String>(columns) { + + @Override + public SimpleIterator<String> createIterator(VDBMetaData vdb, + TransformationMetadata metadata, CommandContext cc) throws QueryMetadataException, TeiidComponentException { + String[] vals = metadata.getVDBResourcePaths(); + return new SimpleIteratorWrapper<String>(Arrays.asList(vals).iterator()); + } + + @Override + public void fillRow(List<Object> row, String filePath, + VDBMetaData v, TransformationMetadata m, CommandContext cc, SimpleIterator<String> iter) { + row.add(filePath); + row.add(new BlobType(m.getVDBResourceAsBlob(filePath))); + } + }); + name = SystemTables.PROCEDURES.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.PROCEDURES, new RecordExtractionTable<Procedure>(new ProcedureSystemTable(1, 2, columns), columns) { + + @Override + public void fillRow(List<Object> row, Procedure proc, + VDBMetaData v, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<Procedure> iter) { + row.add(v.getName()); + row.add(proc.getParent().getName()); + row.add(proc.getName()); + row.add(proc.getNameInSource()); + row.add(proc.getResultSet() != null); + row.add(proc.getUUID()); + row.add(proc.getAnnotation()); + row.add(null); + } + }); + name = SystemTables.DATATYPES.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.DATATYPES, new RecordExtractionTable<Datatype>(new RecordTable<Datatype>(new int[] {0}, columns) { + + @Override + public SimpleIterator<Datatype> processQuery(VDBMetaData vdb, + CompositeMetadataStore metadataStore, BaseIndexInfo<?> ii) { + return processQuery(vdb, metadataStore.getDatatypes(), ii); + } + }, columns) { + + @Override + public void fillRow(List<Object> row, Datatype datatype, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<Datatype> iter) { + row.add(datatype.getName()); + row.add(datatype.isBuiltin()); + row.add(datatype.isBuiltin()); + row.add(datatype.getName()); + row.add(datatype.getJavaClassName()); + row.add(datatype.getScale()); + row.add(datatype.getLength()); + row.add(datatype.getNullType().toString()); + row.add(datatype.isSigned()); + row.add(datatype.isAutoIncrement()); + row.add(datatype.isCaseSensitive()); + row.add(datatype.getPrecision()); + row.add(datatype.getRadix()); + row.add(datatype.getSearchType().toString()); + row.add(datatype.getUUID()); + row.add(datatype.getRuntimeTypeName()); + row.add(datatype.getBasetypeName()); + row.add(datatype.getAnnotation()); + row.add(null); + } + }); + name = SystemTables.VIRTUALDATABASES.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.VIRTUALDATABASES, new BaseExtractionTable<VDBMetaData>(columns) { + @Override + public SimpleIterator<VDBMetaData> createIterator(VDBMetaData vdb, + TransformationMetadata metadata, CommandContext cc) + throws QueryMetadataException, TeiidComponentException { + return new SimpleIteratorWrapper<VDBMetaData>(Arrays.asList(vdb).iterator()); + } + @Override + public void fillRow(List<Object> row, VDBMetaData record, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<VDBMetaData> iter) { + row.add(record.getName()); + row.add(record.getVersion()); + } + }); + name = SystemTables.PROCEDUREPARAMS.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.PROCEDUREPARAMS, new ChildRecordExtractionTable<Procedure, BaseColumn>(new ProcedureSystemTable(1, 2, columns), columns) { + @Override + public void fillRow(List<Object> row, BaseColumn param, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<BaseColumn> iter) { + Datatype dt = param.getDatatype(); + row.add(vdb.getName()); + String type = "ResultSet"; //$NON-NLS-1$ + AbstractMetadataRecord proc = param.getParent(); + boolean isOptional = false; + if (param instanceof ProcedureParameter) { + ProcedureParameter pp = (ProcedureParameter)param; + type = pp.getType().name(); + isOptional = pp.isOptional(); + } else { + Column pp = (Column)param; + proc = param.getParent().getParent(); + } + row.add(proc.getParent().getName()); + row.add(proc.getName()); + row.add(param.getName()); + row.add(dt!=null?dt.getRuntimeTypeName():null); + row.add(param.getPosition()); + row.add(type); + row.add(isOptional); + row.add(param.getPrecision()); + row.add(param.getLength()); + row.add(param.getScale()); + row.add(param.getRadix()); + row.add(param.getNullType().toString()); + row.add(param.getUUID()); + row.add(param.getAnnotation()); + row.add(null); + } + + @Override + protected Collection<? extends BaseColumn> getChildren(final Procedure parent) { + Collection<ProcedureParameter> params = parent.getParameters(); + if (parent.getResultSet() == null) { + return params; + } + //TODO: don't incur the gc cost of the temp list + Collection<Column> rsColumns = parent.getResultSet().getColumns(); + ArrayList<BaseColumn> result = new ArrayList<BaseColumn>(params.size() + rsColumns.size()); + result.addAll(params); + result.addAll(rsColumns); + return result; + } + + }); + name = SystemTables.PROPERTIES.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.PROPERTIES, new ChildRecordExtractionTable<AbstractMetadataRecord, Map.Entry<String, String>>( + new RecordTable<AbstractMetadataRecord>(new int[] {0}, columns.subList(2, 3)) { + @Override + protected void fillRow(AbstractMetadataRecord s, + List<Object> rowBuffer) { + rowBuffer.add(s.getUUID()); + } + + @Override + public SimpleIterator<AbstractMetadataRecord> processQuery( + VDBMetaData vdb, CompositeMetadataStore metadataStore, + BaseIndexInfo<?> ii) { + return processQuery(vdb, metadataStore.getOids(), ii); + } + + @Override + protected AbstractMetadataRecord extractRecord(Object val) { + if (val != null) { + return ((RecordHolder)val).getRecord(); + } + return null; + } + }, columns) { + + @Override + public void fillRow(List<Object> row, Map.Entry<String,String> entry, VDBMetaData vdb, TransformationMetadata metadata, CommandContext cc, SimpleIterator<Map.Entry<String, String>> iter) { + String value = entry.getValue(); + Clob clobValue = null; + if (value != null) { + clobValue = new ClobType(ClobImpl.createClob(value.toCharArray())); + } + row.add(entry.getKey()); + row.add(entry.getValue()); + row.add(((ExpandingSimpleIterator<AbstractMetadataRecord, Entry<String, String>>)iter).getCurrentParent().getUUID()); + row.add(null); + row.add(clobValue); + } + + @Override + protected Collection<Map.Entry<String,String>> getChildren(AbstractMetadataRecord parent) { + return parent.getProperties().entrySet(); + } + }); + name = SystemTables.COLUMNS.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.COLUMNS, new ChildRecordExtractionTable<Table, Column>(new TableSystemTable(1, 2, columns), columns) { + @Override + protected void fillRow(List<Object> row, Column column, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<Column> iter) { + Datatype dt = column.getDatatype(); + row.add(vdb.getName()); + row.add(column.getParent().getParent().getName()); + row.add(column.getParent().getName()); + row.add(column.getName()); + row.add(column.getPosition()); + row.add(column.getNameInSource()); + row.add(dt!=null?dt.getRuntimeTypeName():null); + row.add(column.getScale()); + row.add(column.getLength()); + row.add(column.isFixedLength()); + row.add(column.isSelectable()); + row.add(column.isUpdatable()); + row.add(column.isCaseSensitive()); + row.add(column.isSigned()); + row.add(column.isCurrency()); + row.add(column.isAutoIncremented()); + row.add(column.getNullType().toString()); + row.add(column.getMinimumValue()); + row.add(column.getMaximumValue()); + row.add(column.getDistinctValues()); + row.add(column.getNullValues()); + row.add(column.getSearchType().toString()); + row.add(column.getFormat()); + row.add(column.getDefaultValue()); + row.add(dt!=null?dt.getJavaClassName():null); + row.add(column.getPrecision()); + row.add(column.getCharOctetLength()); + row.add(column.getRadix()); + row.add(column.getUUID()); + row.add(column.getAnnotation()); + row.add(null); + } + + @Override + protected Collection<Column> getChildren(Table parent) { + return parent.getColumns(); + } + + }); + name = SystemTables.KEYS.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.KEYS, new ChildRecordExtractionTable<Table, KeyRecord>(new TableSystemTable(1, 2, columns), columns) { + @Override + protected void fillRow(List<Object> row, KeyRecord key, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<KeyRecord> iter) { + row.add(vdb.getName()); + row.add(key.getParent().getParent().getName()); + row.add(key.getParent().getName()); + row.add(key.getName()); + row.add(key.getAnnotation()); + row.add(key.getNameInSource()); + row.add(key.getType().toString()); + row.add(false); + row.add((key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null); + row.add(key.getUUID()); + row.add(null); + } + + @Override + protected Collection<KeyRecord> getChildren(Table parent) { + return parent.getAllKeys(); + } + + }); + name = SystemTables.KEYCOLUMNS.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.KEYCOLUMNS, new ChildRecordExtractionTable<Table, List<?>>(new TableSystemTable(1, 2, columns), columns) { + + @Override + protected void fillRow(List<Object> row, List<?> record, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<List<?>> iter) { + row.add(vdb.getName()); + KeyRecord key = (KeyRecord) record.get(0); + Column column = (Column) record.get(1); + Integer pos = (Integer) record.get(2); + row.add(key.getParent().getParent().getName()); + row.add(key.getParent().getName()); + row.add(column.getName()); + row.add(key.getName()); + row.add(key.getType().toString()); + row.add((key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null); + row.add(key.getUUID()); + row.add(pos); + row.add(null); + } + + @Override + protected Collection<List<?>> getChildren(Table parent) { + ArrayList<List<?>> cols = new ArrayList<List<?>>(); + + for (KeyRecord record : parent.getAllKeys()) { + int i = 1; + for (Column col : record.getColumns()) { + cols.add(Arrays.asList(record, col, i++)); + } + } + return cols; + } + }); + //we key the referencekeycolumns by fk + name = SystemTables.REFERENCEKEYCOLUMNS.name(); + columns = getColumns(tm, name); + systemTables.put(SystemTables.REFERENCEKEYCOLUMNS, new ChildRecordExtractionTable<Table, List<?>>(new TableSystemTable(5, 6, columns), columns) { + + @Override + protected void fillRow(List<Object> row, List<?> record, + VDBMetaData vdb, TransformationMetadata metadata, + CommandContext cc, SimpleIterator<List<?>> iter) { + row.add(vdb.getName()); + ForeignKey key = (ForeignKey) record.get(0); + Table pkTable = key.getPrimaryKey().getParent(); + Column column = (Column) record.get(1); + Short pos = (Short) record.get(2); + row.add(pkTable.getParent().getName()); + row.add(pkTable.getName()); + row.add(key.getPrimaryKey().getColumns().get(pos-1).getName()); + row.add(vdb.getName()); + row.add(key.getParent().getParent().getName()); + row.add(key.getParent().getName()); + row.add(column.getName()); + row.add(pos); + row.add(DatabaseMetaData.importedKeyNoAction); + row.add(DatabaseMetaData.importedKeyNoAction); + row.add(key.getName()); + row.add(key.getPrimaryKey().getName()); + row.add(DatabaseMetaData.importedKeyInitiallyDeferred); + } + + @Override + protected Collection<List<?>> getChildren(Table parent) { + ArrayList<List<?>> cols = new ArrayList<List<?>>(); + + for (KeyRecord record : parent.getForeignKeys()) { + short i = 1; + for (Column col : record.getColumns()) { + cols.add(Arrays.asList(record, col, i++)); + } + } + return cols; + } + }); + } + + private List<ElementSymbol> getColumns(TransformationMetadata tm, + String name) { + GroupSymbol gs = new GroupSymbol(name); + try { + ResolverUtil.resolveGroup(gs, tm); + List<ElementSymbol> columns = ResolverUtil.resolveElementsInGroup(gs, tm); + return columns; + } catch (TeiidException e) { + throw new TeiidRuntimeException(e); + } } public boolean detectChangeEvents() { @@ -249,381 +708,191 @@ } /** - * TODO: it would be good if processing here was lazy, in response of next batch, rather than up front. * @param command * @param workItem * @return * @throws TeiidComponentException * @throws TeiidProcessingException */ - @SuppressWarnings("unchecked") private TupleSource processSystemQuery(CommandContext context, Command command, DQPWorkContext workContext) throws TeiidComponentException, TeiidProcessingException { String vdbName = workContext.getVdbName(); int vdbVersion = workContext.getVdbVersion(); VDBMetaData vdb = workContext.getVDB(); - CompositeMetadataStore metadata = vdb.getAttachment(TransformationMetadata.class).getMetadataStore(); TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class); - Collection rows = new ArrayList(); - int oid = 1; + CompositeMetadataStore metadata = indexMetadata.getMetadataStore(); if (command instanceof Query) { Query query = (Query)command; UnaryFromClause ufc = (UnaryFromClause)query.getFrom().getClauses().get(0); GroupSymbol group = ufc.getGroup(); if (StringUtil.startsWithIgnoreCase(group.getNonCorrelationName(), CoreConstants.SYSTEM_ADMIN_MODEL)) { final SystemAdminTables sysTable = SystemAdminTables.valueOf(group.getNonCorrelationName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase()); - switch (sysTable) { - case MATVIEWS: - for (Schema schema : getVisibleSchemas(vdb, metadata)) { - for (Table table : schema.getTables().values()) { - if (!table.isMaterialized()) { - continue; - } - String targetSchema = null; - String matTableName = null; - String state = null; - Timestamp updated = null; - Integer cardinaltity = null; - Boolean valid = null; - if (table.getMaterializedTable() == null) { - GlobalTableStore globalStore = context.getGlobalTableStore(); - matTableName = RelationalPlanner.MAT_PREFIX+table.getFullName().toUpperCase(); - MatTableInfo info = globalStore.getMatTableInfo(matTableName); - valid = info.isValid(); - state = info.getState().name(); - updated = info.getUpdateTime()==-1?null:new Timestamp(info.getUpdateTime()); - TempMetadataID id = globalStore.getTempTableStore().getMetadataStore().getTempGroupID(matTableName); - if (id != null) { - cardinaltity = id.getCardinality(); - } - //ttl, pref_mem - not part of proper metadata - } else { - Table t = table.getMaterializedTable(); - matTableName = t.getName(); - targetSchema = t.getParent().getName(); - } - rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), targetSchema, matTableName, valid, state, updated, cardinaltity)); - } - } - break; - case VDBRESOURCES: - String[] filePaths = indexMetadata.getVDBResourcePaths(); - for (String filePath : filePaths) { - rows.add(Arrays.asList(filePath, new BlobType(indexMetadata.getVDBResourceAsBlob(filePath)))); - } - break; - } - return new CollectionTupleSource(rows.iterator()); + BaseExtractionTable<?> et = systemAdminTables.get(sysTable); + return et.processQuery(query, vdb, indexMetadata, context); } final SystemTables sysTable = SystemTables.valueOf(group.getNonCorrelationName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase()); - switch (sysTable) { - case DATATYPES: - for (Datatype datatype : metadata.getDatatypes().values()) { - rows.add(Arrays.asList(datatype.getName(), datatype.isBuiltin(), datatype.isBuiltin(), datatype.getName(), datatype.getJavaClassName(), datatype.getScale(), - datatype.getLength(), datatype.getNullType().toString(), datatype.isSigned(), datatype.isAutoIncrement(), datatype.isCaseSensitive(), datatype.getPrecision(), - datatype.getRadix(), datatype.getSearchType().toString(), datatype.getUUID(), datatype.getRuntimeTypeName(), datatype.getBasetypeName(), datatype.getAnnotation(), oid++)); + BaseExtractionTable<?> et = systemTables.get(sysTable); + return et.processQuery(query, vdb, indexMetadata, context); + } + Collection<List<?>> rows = new ArrayList<List<?>>(); + StoredProcedure proc = (StoredProcedure)command; + if (StringUtil.startsWithIgnoreCase(proc.getProcedureCallableName(), CoreConstants.SYSTEM_ADMIN_MODEL)) { + final SystemAdminProcs sysProc = SystemAdminProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase()); + switch (sysProc) { + case LOGMSG: + case ISLOGGABLE: + String level = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); + String logContext = (String)((Constant)proc.getParameter(3).getExpression()).getValue(); + Object message = null; + if (sysProc == SystemAdminProcs.LOGMSG) { + message = ((Constant)proc.getParameter(4).getExpression()).getValue(); } - break; - case VIRTUALDATABASES: - rows.add(Arrays.asList(vdbName, vdbVersion)); - break; - case SCHEMAS: - for (Schema model : getVisibleSchemas(vdb, metadata)) { - rows.add(Arrays.asList(vdbName, model.getName(), model.isPhysical(), model.getUUID(), model.getAnnotation(), model.getPrimaryMetamodelUri(), oid++)); - } - break; - case PROCEDURES: - for (Schema schema : getVisibleSchemas(vdb, metadata)) { - for (Procedure proc : schema.getProcedures().values()) { - rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), proc.getNameInSource(), proc.getResultSet() != null, proc.getUUID(), proc.getAnnotation(), oid++)); + int msgLevel = getLevel(level); + boolean logged = false; + if (LogManager.isMessageToBeRecorded(logContext, msgLevel)) { + if (message != null) { + LogManager.log(msgLevel, logContext, message); } + logged = true; } - break; - case PROCEDUREPARAMS: - for (Schema schema : getVisibleSchemas(vdb, metadata)) { - for (Procedure proc : schema.getProcedures().values()) { - for (ProcedureParameter param : proc.getParameters()) { - Datatype dt = param.getDatatype(); - rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), param.getName(), dt!=null?dt.getRuntimeTypeName():null, param.getPosition(), param.getType().name(), param.isOptional(), - param.getPrecision(), param.getLength(), param.getScale(), param.getRadix(), param.getNullType().toString(), param.getUUID(), param.getAnnotation(), oid++)); - } - if (proc.getResultSet() != null) { - for (Column param : proc.getResultSet().getColumns()) { - Datatype dt = param.getDatatype(); - rows.add(Arrays.asList(vdbName, proc.getParent().getName(), proc.getName(), param.getName(), dt!=null?dt.getRuntimeTypeName():null, param.getPosition(), "ResultSet", false, //$NON-NLS-1$ - param.getPrecision(), param.getLength(), param.getScale(), param.getRadix(), param.getNullType().toString(), param.getUUID(), param.getAnnotation(), oid++)); - } - } - } + if (proc.returnParameters()) { + rows.add(Arrays.asList(logged)); } - break; - case PROPERTIES: //TODO: consider storing separately in the metadatastore - Collection<AbstractMetadataRecord> records = getAllPropertiedObjects(metadata, getVisibleSchemas(vdb, metadata)); - for (AbstractMetadataRecord record : records) { - for (Map.Entry<String, String> entry : record.getProperties().entrySet()) { - String value = entry.getValue(); - Clob clobValue = null; - if (value != null) { - clobValue = new ClobType(ClobImpl.createClob(value.toCharArray())); + return new CollectionTupleSource(rows.iterator()); + case SETPROPERTY: + try { + String uuid = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); + String key = (String)((Constant)proc.getParameter(3).getExpression()).getValue(); + Clob value = (Clob)((Constant)proc.getParameter(4).getExpression()).getValue(); + String strVal = null; + String result = null; + if (value != null) { + if (value.length() > MAX_VALUE_LENGTH) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30548, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30548, MAX_VALUE_LENGTH)); } - rows.add(Arrays.asList(entry.getKey(), entry.getValue(), record.getUUID(), oid++, clobValue)); + strVal = ObjectConverterUtil.convertToString(value.getCharacterStream()); } - } - break; - default: - for (Schema schema : getVisibleSchemas(vdb, metadata)) { - for (Table table : schema.getTables().values()) { - switch (sysTable) { - case TABLES: - rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), table.getTableType().toString(), table.getNameInSource(), - table.isPhysical(), table.supportsUpdate(), table.getUUID(), table.getCardinality(), table.getAnnotation(), table.isSystem(), table.isMaterialized(), oid++)); - break; - case COLUMNS: - for (Column column : table.getColumns()) { - Datatype dt = column.getDatatype(); - rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), column.getName(), column.getPosition(), column.getNameInSource(), - dt!=null?dt.getRuntimeTypeName():null, column.getScale(), column.getLength(), column.isFixedLength(), column.isSelectable(), column.isUpdatable(), - column.isCaseSensitive(), column.isSigned(), column.isCurrency(), column.isAutoIncremented(), column.getNullType().toString(), column.getMinimumValue(), - column.getMaximumValue(), column.getDistinctValues(), column.getNullValues(), column.getSearchType().toString(), column.getFormat(), - column.getDefaultValue(), dt!=null?dt.getJavaClassName():null, column.getPrecision(), - column.getCharOctetLength(), column.getRadix(), column.getUUID(), column.getAnnotation(), oid++)); - } - break; - case KEYS: - for (KeyRecord key : table.getAllKeys()) { - rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), key.getName(), key.getAnnotation(), key.getNameInSource(), key.getType().toString(), - false, (key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null, key.getUUID(), oid++)); - } - break; - case KEYCOLUMNS: - for (KeyRecord key : table.getAllKeys()) { - int postition = 1; - for (Column column : key.getColumns()) { - rows.add(Arrays.asList(vdbName, schema.getName(), table.getName(), column.getName(), key.getName(), key.getType().toString(), - (key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null, key.getUUID(), postition++, oid++)); - } - } - break; - case REFERENCEKEYCOLUMNS: - for (ForeignKey key : table.getForeignKeys()) { - short postition = 0; - for (Column column : key.getColumns()) { - Table pkTable = key.getPrimaryKey().getParent(); - rows.add(Arrays.asList(vdbName, pkTable.getParent().getName(), pkTable.getName(), key.getPrimaryKey().getColumns().get(postition).getName(), vdbName, schema.getName(), table.getName(), column.getName(), - ++postition, DatabaseMetaData.importedKeyNoAction, DatabaseMetaData.importedKeyNoAction, key.getName(), key.getPrimaryKey().getName(), DatabaseMetaData.importedKeyInitiallyDeferred)); - } - } - break; - } + AbstractMetadataRecord target = getByUuid(metadata, uuid); + if (target == null) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30549, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30549, uuid)); } - } - break; - } - } else { - StoredProcedure proc = (StoredProcedure)command; - if (StringUtil.startsWithIgnoreCase(proc.getProcedureCallableName(), CoreConstants.SYSTEM_ADMIN_MODEL)) { - final SystemAdminProcs sysProc = SystemAdminProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase()); - switch (sysProc) { - case LOGMSG: - case ISLOGGABLE: - String level = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); - String logContext = (String)((Constant)proc.getParameter(3).getExpression()).getValue(); - Object message = null; - if (sysProc == SystemAdminProcs.LOGMSG) { - message = ((Constant)proc.getParameter(4).getExpression()).getValue(); + AbstractMetadataRecord schema = target; + while (!(schema instanceof Schema) && schema.getParent() != null) { + schema = schema.getParent(); } - int msgLevel = getLevel(level); - boolean logged = false; - if (LogManager.isMessageToBeRecorded(logContext, msgLevel)) { - if (message != null) { - LogManager.log(msgLevel, logContext, message); - } - logged = true; + if (schema instanceof Schema && vdb.getImportedModels().contains(((Schema)schema).getName())) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID31098, QueryPlugin.Util.getString("ValidationVisitor.invalid_alter", uuid)); //$NON-NLS-1$ } - if (proc.returnParameters()) { - rows.add(Arrays.asList(logged)); + if (getMetadataRepository(target, vdb) != null) { + getMetadataRepository(target, vdb).setProperty(vdbName, vdbVersion, target, key, strVal); } - return new CollectionTupleSource(rows.iterator()); - case SETPROPERTY: - try { - String uuid = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); - String key = (String)((Constant)proc.getParameter(3).getExpression()).getValue(); - Clob value = (Clob)((Constant)proc.getParameter(4).getExpression()).getValue(); - String strVal = null; - String result = null; - if (value != null) { - if (value.length() > MAX_VALUE_LENGTH) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30548, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30548, MAX_VALUE_LENGTH)); - } - strVal = ObjectConverterUtil.convertToString(value.getCharacterStream()); - } - AbstractMetadataRecord target = getByUuid(metadata, uuid); - if (target == null) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30549, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30549, uuid)); - } - AbstractMetadataRecord schema = target; - while (!(schema instanceof Schema) && schema.getParent() != null) { - schema = schema.getParent(); - } - if (schema instanceof Schema && vdb.getImportedModels().contains(((Schema)schema).getName())) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID31098, QueryPlugin.Util.getString("ValidationVisitor.invalid_alter", uuid)); //$NON-NLS-1$ - } - if (getMetadataRepository(target, vdb) != null) { - getMetadataRepository(target, vdb).setProperty(vdbName, vdbVersion, target, key, strVal); - } - result = target.setProperty(key, strVal); - if (eventDistributor != null) { - eventDistributor.setProperty(vdbName, vdbVersion, uuid, key, strVal); - } - if (proc.returnParameters()) { - if (result == null) { - rows.add(Arrays.asList((Clob)null)); - } else { - rows.add(Arrays.asList(new ClobType(ClobImpl.createClob(result.toCharArray())))); - } - } - return new CollectionTupleSource(rows.iterator()); - } catch (SQLException e) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30550, e); - } catch (IOException e) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30551, e); + result = target.setProperty(key, strVal); + if (eventDistributor != null) { + eventDistributor.setProperty(vdbName, vdbVersion, uuid, key, strVal); } - } - Table table = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue()); - switch (sysProc) { - case SETCOLUMNSTATS: - String columnName = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); - Column c = null; - for (Column col : table.getColumns()) { - if (col.getName().equalsIgnoreCase(columnName)) { - c = col; - break; + if (proc.returnParameters()) { + if (result == null) { + rows.add(Arrays.asList((Clob)null)); + } else { + rows.add(Arrays.asList(new ClobType(ClobImpl.createClob(result.toCharArray())))); } } - if (c == null) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30552, columnName + TransformationMetadata.NOT_EXISTS_MESSAGE); - } - Integer distinctVals = (Integer)((Constant)proc.getParameter(3).getExpression()).getValue(); - Integer nullVals = (Integer)((Constant)proc.getParameter(4).getExpression()).getValue(); - String max = (String) ((Constant)proc.getParameter(5).getExpression()).getValue(); - String min = (String) ((Constant)proc.getParameter(6).getExpression()).getValue(); - ColumnStats columnStats = new ColumnStats(); - columnStats.setDistinctValues(distinctVals); - columnStats.setNullValues(nullVals); - columnStats.setMaximumValue(max); - columnStats.setMinimumValue(min); - if (getMetadataRepository(table, vdb) != null) { - getMetadataRepository(table, vdb).setColumnStats(vdbName, vdbVersion, c, columnStats); - } - c.setColumnStats(columnStats); - if (eventDistributor != null) { - eventDistributor.setColumnStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), columnName, columnStats); - } - break; - case SETTABLESTATS: - Constant val = (Constant)proc.getParameter(2).getExpression(); - int cardinality = (Integer)val.getValue(); - TableStats tableStats = new TableStats(); - tableStats.setCardinality(cardinality); - if (getMetadataRepository(table, vdb) != null) { - getMetadataRepository(table, vdb).setTableStats(vdbName, vdbVersion, table, tableStats); - } - table.setCardinality(cardinality); - if (eventDistributor != null) { - eventDistributor.setTableStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), tableStats); - } - break; + return new CollectionTupleSource(rows.iterator()); + } catch (SQLException e) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30550, e); + } catch (IOException e) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30551, e); } - table.setLastModified(System.currentTimeMillis()); - return new CollectionTupleSource(rows.iterator()); } - final SystemProcs sysTable = SystemProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase()); - switch (sysTable) { - case GETXMLSCHEMAS: - try { - Object groupID = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue()); - List<SQLXMLImpl> schemas = indexMetadata.getXMLSchemas(groupID); - for (SQLXMLImpl schema : schemas) { - rows.add(Arrays.asList(new XMLType(schema))); + Table table = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue()); + switch (sysProc) { + case SETCOLUMNSTATS: + String columnName = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); + Column c = null; + for (Column col : table.getColumns()) { + if (col.getName().equalsIgnoreCase(columnName)) { + c = col; + break; } - } catch (QueryMetadataException e) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30553, e); } + if (c == null) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30552, columnName + TransformationMetadata.NOT_EXISTS_MESSAGE); + } + Integer distinctVals = (Integer)((Constant)proc.getParameter(3).getExpression()).getValue(); + Integer nullVals = (Integer)((Constant)proc.getParameter(4).getExpression()).getValue(); + String max = (String) ((Constant)proc.getParameter(5).getExpression()).getValue(); + String min = (String) ((Constant)proc.getParameter(6).getExpression()).getValue(); + ColumnStats columnStats = new ColumnStats(); + columnStats.setDistinctValues(distinctVals); + columnStats.setNullValues(nullVals); + columnStats.setMaximumValue(max); + columnStats.setMinimumValue(min); + if (getMetadataRepository(table, vdb) != null) { + getMetadataRepository(table, vdb).setColumnStats(vdbName, vdbVersion, c, columnStats); + } + c.setColumnStats(columnStats); + if (eventDistributor != null) { + eventDistributor.setColumnStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), columnName, columnStats); + } break; + case SETTABLESTATS: + Constant val = (Constant)proc.getParameter(2).getExpression(); + int cardinality = (Integer)val.getValue(); + TableStats tableStats = new TableStats(); + tableStats.setCardinality(cardinality); + if (getMetadataRepository(table, vdb) != null) { + getMetadataRepository(table, vdb).setTableStats(vdbName, vdbVersion, table, tableStats); + } + table.setCardinality(cardinality); + if (eventDistributor != null) { + eventDistributor.setTableStats(vdbName, vdbVersion, table.getParent().getName(), table.getName(), tableStats); + } + break; } + table.setLastModified(System.currentTimeMillis()); + return new CollectionTupleSource(rows.iterator()); } + final SystemProcs sysTable = SystemProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase()); + switch (sysTable) { + case GETXMLSCHEMAS: + try { + Object groupID = indexMetadata.getGroupID((String)((Constant)proc.getParameter(1).getExpression()).getValue()); + List<SQLXMLImpl> schemas = indexMetadata.getXMLSchemas(groupID); + for (SQLXMLImpl schema : schemas) { + rows.add(Arrays.asList(new XMLType(schema))); + } + } catch (QueryMetadataException e) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30553, e); + } + break; + } return new CollectionTupleSource(rows.iterator()); } public MetadataRepository getMetadataRepository(AbstractMetadataRecord target, VDBMetaData vdb) { String modelName = null; - - if (target instanceof Schema) { - modelName = ((Schema)target).getName(); + while (target.getParent() != null) { + target = target.getParent(); } - else if (target instanceof Table) { - modelName = ((Table)target).getParent().getName(); - } - else if (target instanceof Procedure) { - modelName = ((Procedure)target).getParent().getName(); - } - else if (target instanceof FunctionMethod) { - modelName = ((FunctionMethod)target).getParent().getName(); - } - else if (target instanceof Column || target instanceof ProcedureParameter) { - AbstractMetadataRecord record = ((Column)target).getParent(); - return getMetadataRepository(record, vdb); - } - + modelName = target.getName(); if (modelName != null) { ModelMetaData model = vdb.getModel(modelName); - return model.getAttachment(MetadataRepository.class); + if (model != null) { + return model.getAttachment(MetadataRepository.class); + } } return null; } - //TODO: do better than a linear search public static AbstractMetadataRecord getByUuid(CompositeMetadataStore metadata, String uuid) { - for (AbstractMetadataRecord object : getAllPropertiedObjects(metadata, metadata.getSchemas().values())) { - if (object.getUUID().equals(uuid)) { - return object; - } + RecordHolder holder = metadata.getOids().get(uuid); + if (holder != null && uuid.equals(holder.getRecord().getUUID())) { + return holder.getRecord(); } return null; } - public static Collection<AbstractMetadataRecord> getAllPropertiedObjects(CompositeMetadataStore metadata, Collection<Schema> schemas) { - Collection<AbstractMetadataRecord> records = new LinkedHashSet<AbstractMetadataRecord>(); - records.addAll(metadata.getDatatypes().values()); - for (Schema schema : schemas) { - records.add(schema); - for (Table table : schema.getTables().values()) { - records.add(table); - records.addAll(table.getColumns()); - records.addAll(table.getAllKeys()); - } - for (Procedure proc : schema.getProcedures().values()) { - records.add(proc); - records.addAll(proc.getParameters()); - if (proc.getResultSet() != null) { - records.addAll(proc.getResultSet().getColumns()); - } - } - } - return records; - } - - private List<Schema> getVisibleSchemas(VDBMetaData vdb, CompositeMetadataStore metadata) { - ArrayList<Schema> result = new ArrayList<Schema>(); - for (Schema schema : metadata.getSchemaList()) { - if(vdb.isVisible(schema.getName())) { - result.add(schema); - } - } - return result; - } - private AtomicRequestMessage createRequest(RequestWorkItem workItem, Command command, String modelName, String connectorBindingId, int nodeID) throws TeiidComponentException { Added: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RecordTable.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RecordTable.java (rev 0) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RecordTable.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,249 @@ +/* + * 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.dqp.internal.process; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.SortedMap; + +import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.core.TeiidComponentException; +import org.teiid.core.TeiidProcessingException; +import org.teiid.metadata.AbstractMetadataRecord; +import org.teiid.query.eval.Evaluator; +import org.teiid.query.metadata.CompositeMetadataStore; +import org.teiid.query.processor.relational.RelationalNode; +import org.teiid.query.sql.lang.Criteria; +import org.teiid.query.sql.lang.OrderBy; +import org.teiid.query.sql.lang.Query; +import org.teiid.query.sql.symbol.ElementSymbol; +import org.teiid.query.sql.symbol.Expression; +import org.teiid.query.sql.symbol.Function; +import org.teiid.query.tempdata.BaseIndexInfo; +import org.teiid.query.tempdata.SearchableTable; + +abstract class RecordTable<T extends AbstractMetadataRecord> implements SearchableTable { + + public interface SimpleIterator<T> { + public T next() throws TeiidProcessingException, TeiidComponentException; + } + + private static final SimpleIterator<?> empty = new SimpleIterator<Object>() { + + @Override + public Object next() throws TeiidProcessingException, TeiidComponentException { + return null; + } + }; + + @SuppressWarnings("unchecked") + public static <T> SimpleIterator<T> emptyIterator() { + return (SimpleIterator<T>) empty; + } + + public static class SimpleIteratorWrapper<T> implements SimpleIterator<T> { + private Iterator<? extends T> iter; + + public SimpleIteratorWrapper(Iterator<? extends T> iter) { + this.iter = iter; + } + + public void setIterator(Iterator<? extends T> iter) { + this.iter = iter; + } + + @Override + public T next() throws TeiidProcessingException, + TeiidComponentException { + while (iter.hasNext()) { + T result = iter.next(); + if (result != null) { + return result; + } + } + return null; + } + + } + + public static abstract class ExpandingSimpleIterator<P, T> implements SimpleIterator<T> { + private SimpleIterator<T> childIter; + private SimpleIterator<P> parentIter; + private P currentParent; + + public ExpandingSimpleIterator(SimpleIterator<P> parentIter) { + this.parentIter = parentIter; + } + + @Override + public T next() throws TeiidProcessingException, + TeiidComponentException { + while (true) { + if (childIter == null) { + currentParent = parentIter.next(); + if (currentParent == null) { + return null; + } + childIter = getChildIterator(currentParent); + } + T t = childIter.next(); + if (t != null) { + return t; + } + childIter = null; + } + } + + public P getCurrentParent() { + return currentParent; + } + + protected abstract SimpleIterator<T> getChildIterator(P parent); + } + + private Map<Expression, Integer> columnMap; + private Expression[] pkColumns; + protected Evaluator eval; + + public RecordTable(int[] pkColumnIndexs, List<ElementSymbol> columns) { + this.columnMap = RelationalNode.createLookupMap(columns); + this.pkColumns = new ElementSymbol[pkColumnIndexs.length]; + for (int i = 0; i < pkColumnIndexs.length; i++) { + pkColumns[i] = columns.get(pkColumnIndexs[i]); + } + eval = new Evaluator(columnMap, null, null); + } + + @Override + public int getPkLength() { + return pkColumns.length; + } + + @Override + public Map<Expression, Integer> getColumnMap() { + return columnMap; + } + + @Override + public boolean matchesPkColumn(int pkIndex, Expression ex) { + if (ex instanceof Function) { + Function f = (Function)ex; + ex = f.getArg(0); + } + return (pkColumns[pkIndex].equals(ex)); + } + + @Override + public boolean supportsOrdering(int pkIndex, Expression ex) { + return !(ex instanceof ElementSymbol); + } + + public abstract SimpleIterator<T> processQuery(final VDBMetaData vdb, CompositeMetadataStore metadataStore, BaseIndexInfo<?> ii); + + public SimpleIterator<T> processQuery(final VDBMetaData vdb, NavigableMap<String, ?> map, BaseIndexInfo<?> ii) { + final Criteria crit = ii.getCoveredCriteria(); + final ArrayList<Object> rowBuffer = new ArrayList<Object>(1); + if (!ii.getValueSet().isEmpty()) { + final List<List<Object>> vals = ii.getValueSet(); + final SortedMap<String, ?> fMap = map; + return new SimpleIterator<T>() { + int i = 0; + @Override + public T next() throws TeiidProcessingException, TeiidComponentException { + while (i < vals.size()) { + T s = extractRecord(fMap.get(vals.get(i++).get(0))); + if (isValid(s, vdb, rowBuffer, crit)) { + return s; + } + } + return null; + } + }; + } + if (ii.getLower() != null) { + if (ii.getUpper() != null) { + map = map.subMap((String) ii.getLower().get(0), true, (String) ii.getUpper().get(0), true); + } else { + map = map.tailMap((String) ii.getLower().get(0), true); + } + } else if (ii.getUpper() != null) { + map = map.headMap((String) ii.getUpper().get(0), true); + } + final Iterator<?> iter = map.values().iterator(); + return new SimpleIterator<T>() { + @Override + public T next() throws TeiidProcessingException, TeiidComponentException { + while (iter.hasNext()) { + T s = extractRecord(iter.next()); + if (isValid(s, vdb, rowBuffer, crit)) { + return s; + } + } + return null; + } + }; + } + + protected T extractRecord(Object val) { + return (T) val; + } + + public BaseIndexInfo<RecordTable<?>> planQuery(Query query, Criteria condition) { + BaseIndexInfo<RecordTable<?>> info = new BaseIndexInfo<RecordTable<?>>(this, Collections.EMPTY_LIST, condition, null, false); + if (!info.getValueSet().isEmpty()) { + info.sortValueSet(OrderBy.ASC); + } + return info; + } + + /** + * + * @param s + * @param vdb + * @param rowBuffer + * @param condition + * @return + * @throws TeiidProcessingException + * @throws TeiidComponentException + */ + protected boolean isValid(T s, VDBMetaData vdb, List<Object> rowBuffer, Criteria condition) throws TeiidProcessingException, TeiidComponentException { + if (s == null) { + return false; + } + if (condition != null) { + rowBuffer.clear(); + fillRow(s, rowBuffer); + return eval.evaluate(condition, rowBuffer); + } + return true; + } + + protected void fillRow(T s, List<Object> rowBuffer) { + rowBuffer.add(s.getName()); + } + +} \ No newline at end of file Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RecordTable.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/engine/src/main/java/org/teiid/dqp/internal/process/SchemaRecordTable.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/SchemaRecordTable.java (rev 0) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/SchemaRecordTable.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,125 @@ +/* + * 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.dqp.internal.process; + +import java.util.List; +import java.util.NavigableMap; + +import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.core.TeiidComponentException; +import org.teiid.core.TeiidProcessingException; +import org.teiid.metadata.AbstractMetadataRecord; +import org.teiid.metadata.Procedure; +import org.teiid.metadata.Schema; +import org.teiid.metadata.Table; +import org.teiid.query.metadata.CompositeMetadataStore; +import org.teiid.query.sql.lang.Criteria; +import org.teiid.query.sql.lang.Query; +import org.teiid.query.sql.symbol.ElementSymbol; +import org.teiid.query.tempdata.BaseIndexInfo; + +class SchemaRecordTable extends RecordTable<Schema> { + + public SchemaRecordTable(int pkColumnIndex, List<ElementSymbol> columns) { + super(new int[] {0}, columns.subList(pkColumnIndex, pkColumnIndex + 1)); + } + + protected boolean isValid(Schema s, VDBMetaData vdb, List<Object> rowBuffer, Criteria condition) throws TeiidProcessingException, TeiidComponentException { + if (s == null || !vdb.isVisible(s.getName())) { + return false; + } + return super.isValid(s, vdb, rowBuffer, condition); + } + + @Override + public SimpleIterator<Schema> processQuery( + VDBMetaData vdb, CompositeMetadataStore metadataStore, + BaseIndexInfo<?> ii) { + return processQuery(vdb, metadataStore.getSchemas(), ii); + } + +} + +abstract class SchemaChildRecordTable<T extends AbstractMetadataRecord> extends RecordTable<T> { + + private SchemaRecordTable schemaTable; + + public SchemaChildRecordTable(int schemaPkColumnIndex, int tablePkColumnIndex, List<ElementSymbol> columns) { + super(new int[] {0}, columns.subList(tablePkColumnIndex, tablePkColumnIndex + 1)); + this.schemaTable = new SchemaRecordTable(schemaPkColumnIndex, columns); + } + + @Override + public SimpleIterator<T> processQuery( + final VDBMetaData vdb, final CompositeMetadataStore metadataStore, + final BaseIndexInfo<?> ii) { + final SimpleIterator<Schema> schemas = schemaTable.processQuery(vdb, metadataStore.getSchemas(), ii); + return new ExpandingSimpleIterator<Schema, T>(schemas) { + @Override + protected SimpleIterator<T> getChildIterator( + Schema parent) { + return processQuery(vdb, getChildren(parent), ii.next); + } + }; + } + + @Override + public BaseIndexInfo<RecordTable<?>> planQuery(Query query, + Criteria condition) { + BaseIndexInfo<RecordTable<?>> ii = schemaTable.planQuery(query, query.getCriteria()); + ii.next = super.planQuery(query, ii.getNonCoveredCriteria()); + return ii; + } + + @Override + protected void fillRow(T s, List<Object> rowBuffer) { + rowBuffer.add(s.getName()); + } + + protected abstract NavigableMap<String, T> getChildren(Schema s); + +} + +class ProcedureSystemTable extends SchemaChildRecordTable<Procedure> { + public ProcedureSystemTable(int schemaPkColumnIndex, + int tablePkColumnIndex, List<ElementSymbol> columns) { + super(schemaPkColumnIndex, tablePkColumnIndex, columns); + } + + @Override + protected NavigableMap<String, Procedure> getChildren(Schema s) { + return s.getProcedures(); + } +} + +class TableSystemTable extends SchemaChildRecordTable<Table> { + public TableSystemTable(int schemaPkColumnIndex, + int tablePkColumnIndex, List<ElementSymbol> columns) { + super(schemaPkColumnIndex, tablePkColumnIndex, columns); + } + + @Override + protected NavigableMap<String, Table> getChildren(Schema s) { + return s.getTables(); + } +} \ No newline at end of file Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/process/SchemaRecordTable.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -33,7 +33,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -230,12 +229,10 @@ throws ExpressionEvaluationException, BlockedException, TeiidComponentException { List<Criteria> subCrits = criteria.getCriteria(); - Iterator<Criteria> subCritIter = subCrits.iterator(); - boolean and = criteria.getOperator() == CompoundCriteria.AND; Boolean result = and?Boolean.TRUE:Boolean.FALSE; - while(subCritIter.hasNext()) { - Criteria subCrit = subCritIter.next(); + for (int i = 0; i < subCrits.size(); i++) { + Criteria subCrit = subCrits.get(i); Boolean value = evaluateTVL(subCrit, tuple); if (value == null) { result = null; Modified: trunk/engine/src/main/java/org/teiid/query/metadata/CompositeMetadataStore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/CompositeMetadataStore.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/metadata/CompositeMetadataStore.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -26,10 +26,13 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; +import java.util.TreeMap; import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.core.TeiidComponentException; import org.teiid.core.util.StringUtil; +import org.teiid.metadata.AbstractMetadataRecord; +import org.teiid.metadata.KeyRecord; import org.teiid.metadata.MetadataStore; import org.teiid.metadata.Procedure; import org.teiid.metadata.Schema; @@ -43,6 +46,25 @@ */ public class CompositeMetadataStore extends MetadataStore { private static final long serialVersionUID = 6868525815774998010L; + + private volatile int oidId = 1; + public static class RecordHolder { + AbstractMetadataRecord record; + Integer oid; + public RecordHolder(AbstractMetadataRecord record, Integer oid) { + this.record = record; + this.oid = oid; + } + + public Integer getOid() { + return oid; + } + + public AbstractMetadataRecord getRecord() { + return record; + } + } + private volatile TreeMap<String, RecordHolder> oids; public CompositeMetadataStore(MetadataStore metadataStore) { merge(metadataStore); @@ -147,4 +169,70 @@ return results; } + private void assignOids(Schema schema, TreeMap<String, RecordHolder> map) { + addOid(schema, map); + for (Table table : schema.getTables().values()) { + addOid(table, map); + addOids(table.getColumns(), map); + addOids(table.getAllKeys(), map); + } + for (Procedure proc : schema.getProcedures().values()) { + addOid(proc, map); + addOids(proc.getParameters(), map); + if (proc.getResultSet() != null) { + addOids(proc.getResultSet().getColumns(), map); + } + } + addOids(schema.getFunctions().values(), map); + } + + private void addOid(AbstractMetadataRecord record, TreeMap<String, RecordHolder> map) { + RecordHolder old = map.put(record.getUUID(), new RecordHolder(record, oidId++)); + if (old != null) { + throw new AssertionError("duplicate uid " + record); //$NON-NLS-1$ + } + if (record instanceof KeyRecord) { + //pretend that each keyrecord contains its own columns + oidId += ((KeyRecord)record).getColumns().size(); + } + } + + private void addOids(Collection<? extends AbstractMetadataRecord> records, TreeMap<String, RecordHolder> map) { + if (records == null) { + return; + } + for (AbstractMetadataRecord record : records) { + addOid(record, map); + } + } + + public Integer getOid(String record) { + RecordHolder holder = getOids().get(record); + if (holder == null) { + return null; + } + return holder.oid; + } + + public TreeMap<String, RecordHolder> getOids() { + if (oids == null) { + synchronized (this) { + if (oids == null) { + TreeMap<String, RecordHolder> map = new TreeMap<String, RecordHolder>(String.CASE_INSENSITIVE_ORDER); + addOids(this.getDatatypes().values(), map); + for (Schema s : getSchemaList()) { + assignOids(s, map); + } + oids = map; + } + } + } + return oids; + } + + public int getMaxOid() { + getOids(); + return oidId; + } + } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TempCapabilitiesFinder.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TempCapabilitiesFinder.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TempCapabilitiesFinder.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -27,6 +27,7 @@ import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.capabilities.SourceCapabilities; import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability; +import org.teiid.translator.ExecutionFactory.NullOrder; public class TempCapabilitiesFinder implements CapabilitiesFinder { @@ -45,6 +46,9 @@ tempCaps.setCapabilitySupport(Capability.CRITERIA_LIKE_REGEX, true); tempCaps.setCapabilitySupport(Capability.CRITERIA_SIMILAR, true); tempCaps.setCapabilitySupport(Capability.QUERY_AGGREGATES_COUNT_STAR, true); + tempCaps.setSourceProperty(Capability.MAX_IN_CRITERIA_SIZE, 100000); + tempCaps.setSourceProperty(Capability.MAX_DEPENDENT_PREDICATES, 1); + tempCaps.setSourceProperty(Capability.QUERY_ORDERBY_DEFAULT_NULL_ORDER, NullOrder.LOW); } private final CapabilitiesFinder delegate; Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -2674,14 +2674,8 @@ int i = 0; for (SetClause clause : update.getChangeList().getClauses()) { Expression ex = clause.getValue(); - Expression selectSymbol = null; if (!EvaluatableVisitor.willBecomeConstant(ex)) { - if (!(ex instanceof Expression)) { - selectSymbol = new ExpressionSymbol("expr", ex); //$NON-NLS-1$ - } else { - selectSymbol = (Expression)ex; - } - selectSymbols.add(new AliasSymbol("s_" +i, selectSymbol)); //$NON-NLS-1$ + selectSymbols.add(new AliasSymbol("s_" +i, ex)); //$NON-NLS-1$ ex = new ElementSymbol("s_" +i); //$NON-NLS-1$ } if (symbolMap != null) { Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/CompoundCriteria.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/CompoundCriteria.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/CompoundCriteria.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -55,7 +55,7 @@ * Constructs a default instance of this class. */ public CompoundCriteria() { - criteria = new ArrayList<Criteria>(); + criteria = new ArrayList<Criteria>(2); } /** @@ -64,11 +64,11 @@ * expression. * @param criteria List of {@link Criteria} being added */ - public CompoundCriteria( List criteria ) { + public CompoundCriteria( List<? extends Criteria> criteria ) { this(); - Iterator iter = criteria.iterator(); + Iterator<? extends Criteria> iter = criteria.iterator(); while ( iter.hasNext() ) { - addCriteria( (Criteria)iter.next() ); + addCriteria( iter.next() ); } } Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/Criteria.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/Criteria.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/Criteria.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -75,13 +75,13 @@ return parts; } - public static Criteria combineCriteria(List parts) { + public static Criteria combineCriteria(List<Criteria> parts) { if(parts == null || parts.isEmpty()) { return null; } if (parts.size() == 1) { - return (Criteria)parts.get(0); + return parts.get(0); } return new CompoundCriteria(parts); Modified: trunk/engine/src/main/java/org/teiid/query/sql/visitor/ElementCollectorVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/visitor/ElementCollectorVisitor.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/sql/visitor/ElementCollectorVisitor.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.List; import org.teiid.query.QueryPlugin; import org.teiid.query.sql.LanguageObject; @@ -81,8 +82,11 @@ * @param obj Language object */ public void visit(MultipleElementSymbol obj) { - if(obj.getElementSymbols() != null) { - this.elements.addAll(obj.getElementSymbols()); + List<ElementSymbol> elementSymbols = obj.getElementSymbols(); + if(elementSymbols != null) { + for (int i = 0; i < elementSymbols.size(); i++) { + visit(elementSymbols.get(i)); + } } } Added: trunk/engine/src/main/java/org/teiid/query/tempdata/BaseIndexInfo.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/tempdata/BaseIndexInfo.java (rev 0) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/BaseIndexInfo.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,333 @@ +/* + * 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.tempdata; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import org.teiid.language.Like.MatchMode; +import org.teiid.language.SortSpecification.NullOrdering; +import org.teiid.query.eval.Evaluator; +import org.teiid.query.processor.relational.ListNestedSortComparator; +import org.teiid.query.sql.lang.CompareCriteria; +import org.teiid.query.sql.lang.CompoundCriteria; +import org.teiid.query.sql.lang.Criteria; +import org.teiid.query.sql.lang.IsNullCriteria; +import org.teiid.query.sql.lang.MatchCriteria; +import org.teiid.query.sql.lang.OrderBy; +import org.teiid.query.sql.lang.OrderByItem; +import org.teiid.query.sql.lang.SetCriteria; +import org.teiid.query.sql.symbol.Constant; +import org.teiid.query.sql.symbol.Expression; +import org.teiid.query.sql.visitor.ElementCollectorVisitor; + +/** + * Accumulates information about index usage. + */ +public class BaseIndexInfo<T extends SearchableTable> { + + List<Object> lower = null; + List<Object> upper = null; + ArrayList<List<Object>> valueSet = new ArrayList<List<Object>>(); + T table; + Boolean ordering; + boolean covering; + CompoundCriteria nonCoveredCriteria = null; + CompoundCriteria coveredCriteria = null; + + public BaseIndexInfo(T table, final List<? extends Expression> projectedCols, final Criteria condition, OrderBy orderBy, boolean primary) { + this.table = table; + if (primary || this.table.getColumnMap().keySet().containsAll(projectedCols)) { + covering = true; + } + if (table.getPkLength() > 0) { + processCriteria(condition, primary); + if (orderBy != null) { + ordering = useIndexForOrderBy(orderBy); + } + } + } + + private void processCriteria(Criteria condition, boolean primary) { + List<Criteria> crits = Criteria.separateCriteriaByAnd(condition); + if (!primary) { + for (Iterator<Criteria> critIter = crits.iterator(); critIter.hasNext();) { + Criteria criteria = critIter.next(); + if (table.getColumnMap().keySet().containsAll(ElementCollectorVisitor.getElements(criteria, false))) { + if (coveredCriteria == null) { + coveredCriteria = new CompoundCriteria(); + } + coveredCriteria.addCriteria(criteria); + } else { + covering = false; + if (nonCoveredCriteria == null) { + nonCoveredCriteria = new CompoundCriteria(); + } + nonCoveredCriteria.addCriteria(criteria); + critIter.remove(); + } + } + } + for (int i = 0; i < table.getPkLength(); i++) { + for (Iterator<Criteria> critIter = crits.iterator(); critIter.hasNext();) { + Criteria criteria = critIter.next(); + if (criteria instanceof CompareCriteria) { + CompareCriteria cc = (CompareCriteria)criteria; + if (!table.matchesPkColumn(i, cc.getLeftExpression())) { + continue; + } + if (!table.supportsOrdering(i, cc.getLeftExpression()) && cc.getOperator() != CompareCriteria.EQ) { + critIter.remove(); + continue; + } + this.addCondition(i, (Constant)cc.getRightExpression(), cc.getOperator()); + critIter.remove(); + } else if (criteria instanceof IsNullCriteria) { + IsNullCriteria inc = (IsNullCriteria)criteria; + if (!table.matchesPkColumn(i, inc.getExpression())) { + continue; + } + this.addCondition(i, new Constant(null), CompareCriteria.EQ); + critIter.remove(); + } else if (criteria instanceof MatchCriteria) { + MatchCriteria matchCriteria = (MatchCriteria)criteria; + if (!table.matchesPkColumn(i, matchCriteria.getLeftExpression())) { + continue; + } + Constant value = (Constant)matchCriteria.getRightExpression(); + String pattern = (String)value.getValue(); + boolean escaped = false; + char escapeChar = matchCriteria.getEscapeChar(); + if (matchCriteria.getMode() == MatchMode.REGEX) { + escapeChar = '\\'; + } + StringBuilder prefix = new StringBuilder(); + + if (pattern.length() > 0 && matchCriteria.getMode() == MatchMode.REGEX && pattern.charAt(0) != '^') { + //make the assumption that we require an anchor + continue; + } + + for (int j = matchCriteria.getMode() == MatchMode.REGEX?1:0; j < pattern.length(); j++) { + char character = pattern.charAt(j); + + if (character == escapeChar && character != MatchCriteria.NULL_ESCAPE_CHAR) { + if (escaped) { + prefix.append(character); + escaped = false; + } else { + escaped = true; + } + continue; + } + if (!escaped) { + if (matchCriteria.getMode() == MatchMode.LIKE) { + if (character == MatchCriteria.WILDCARD_CHAR || character == MatchCriteria.MATCH_CHAR) { + break; + } + } else { + int index = Arrays.binarySearch(Evaluator.REGEX_RESERVED, character); + if (index >= 0 && pattern.length() > 0) { + getRegexPrefix(pattern, escapeChar, prefix, j, character); + break; + } + } + } else { + escaped = false; + } + prefix.append(character); + } + if (prefix.length() > 0) { + this.addCondition(i, new Constant(prefix.toString()), CompareCriteria.GE); + this.addCondition(i, new Constant(prefix.substring(0, prefix.length() -1) + (char) (prefix.charAt(prefix.length()-1)+1)), CompareCriteria.LE); + } else { + critIter.remove(); + } + } else if (criteria instanceof SetCriteria) { + SetCriteria setCriteria = (SetCriteria)criteria; + if (!table.matchesPkColumn(i, setCriteria.getExpression())) { + continue; + } + Collection<Constant> values = (Collection<Constant>) setCriteria.getValues(); + this.addSet(i, values); + critIter.remove(); + } + } + } + } + + private void getRegexPrefix(String pattern, char escapeChar, + StringBuilder prefix, int j, char character) { + boolean escaped = false; + //check the rest of the expression for | + int level = 0; + for (int k = j; k < pattern.length(); k++) { + character = pattern.charAt(k); + if (character == escapeChar && character != MatchCriteria.NULL_ESCAPE_CHAR) { + escaped = !escaped; + } else if (!escaped) { + if (character == '(') { + level++; + } else if (character == ')') { + level--; + } else if (character == '|' && level == 0) { + prefix.setLength(0); //TODO: turn this into an IN condition + return; + } + } + } + + if (character == '{' || character == '?' || character == '*') { + prefix.setLength(prefix.length() - 1); + } + } + + void addCondition(int i, Constant value, int comparisionMode) { + Object value2 = value.getValue(); + switch (comparisionMode) { + case CompareCriteria.EQ: + if (i == 0) { + valueSet.clear(); + valueSet.add(new ArrayList<Object>(table.getPkLength())); + } + if (valueSet.size() == 1) { + valueSet.get(0).add(value2); + } + lower = null; + upper = null; + break; + case CompareCriteria.GE: + case CompareCriteria.GT: + if (valueSet.isEmpty()) { + if (i == 0) { + lower = new ArrayList<Object>(table.getPkLength()); + lower.add(value2); + } if (lower != null && lower.size() == i) { + lower.add(value2); + } + } + break; + case CompareCriteria.LE: + case CompareCriteria.LT: + if (valueSet.isEmpty()) { + if (i == 0) { + upper = new ArrayList<Object>(table.getPkLength()); + upper.add(value2); + } else if (upper != null && upper.size() == i) { + upper.add(value2); + } + } + break; + } + } + + void addSet(int i, Collection<Constant> values) { + if (!valueSet.isEmpty()) { + return; + } + if (i == 0) { + for (Constant constant : values) { + List<Object> value = new ArrayList<Object>(table.getPkLength()); + Object value2 = constant.getValue(); + value.add(value2); + valueSet.add(value); + } + lower = null; + upper = null; + } + } + + /** + * Return a non-null direction if the index can be used, otherwise null. + * @param orderBy + * @return + */ + private Boolean useIndexForOrderBy(OrderBy orderBy) { + Boolean direction = null; + int size = orderBy.getOrderByItems().size(); + if (size > table.getPkLength()) { + return null; + } + for (int i = 0; i < size; i++) { + OrderByItem item = orderBy.getOrderByItems().get(i); + + if (!table.matchesPkColumn(i, item.getSymbol()) || !table.supportsOrdering(i, item.getSymbol())) { + return null; + } + + if (item.getNullOrdering() != null && ((item.isAscending() && item.getNullOrdering() == NullOrdering.LAST) + || (!item.isAscending() && item.getNullOrdering() == NullOrdering.FIRST))) { + //assumes nulls low + return null; + } + if (item.isAscending()) { + if (direction == null) { + direction = OrderBy.ASC; + } else if (direction != OrderBy.ASC) { + return null; + } + } else if (direction == null) { + direction = OrderBy.DESC; + } else if (direction != OrderBy.DESC) { + return null; + } + } + return direction; + } + + public List<Object> getLower() { + return lower; + } + + public List<Object> getUpper() { + return upper; + } + + public ArrayList<List<Object>> getValueSet() { + return valueSet; + } + + public void sortValueSet(boolean direction) { + int size = getValueSet().get(0).size(); + int[] sortOn = new int[size]; + for (int i = 0; i <sortOn.length; i++) { + sortOn[i] = i; + } + Collections.sort(getValueSet(), new ListNestedSortComparator(sortOn, direction)); + } + + public Criteria getCoveredCriteria() { + return coveredCriteria; + } + + public Criteria getNonCoveredCriteria() { + return nonCoveredCriteria; + } + + public BaseIndexInfo<?> next; + +} \ No newline at end of file Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata/BaseIndexInfo.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/IndexInfo.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/tempdata/IndexInfo.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/IndexInfo.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -22,284 +22,29 @@ package org.teiid.query.tempdata; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import org.teiid.common.buffer.TupleBrowser; import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; -import org.teiid.language.Like.MatchMode; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; -import org.teiid.query.eval.Evaluator; import org.teiid.query.processor.CollectionTupleSource; -import org.teiid.query.processor.relational.ListNestedSortComparator; -import org.teiid.query.processor.relational.RelationalNode; -import org.teiid.query.sql.lang.CompareCriteria; import org.teiid.query.sql.lang.Criteria; -import org.teiid.query.sql.lang.IsNullCriteria; -import org.teiid.query.sql.lang.MatchCriteria; import org.teiid.query.sql.lang.OrderBy; -import org.teiid.query.sql.lang.OrderByItem; -import org.teiid.query.sql.lang.SetCriteria; -import org.teiid.query.sql.symbol.Constant; -import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.Expression; -import org.teiid.query.sql.visitor.ElementCollectorVisitor; /** * Accumulates information about index usage. */ -class IndexInfo { +class IndexInfo extends BaseIndexInfo<TempTable> { - List<Object> lower = null; - List<Object> upper = null; - ArrayList<List<Object>> valueSet = new ArrayList<List<Object>>(); - TempTable table; - Boolean ordering; - boolean covering; TupleSource valueTs; - List<Criteria> nonCoveredCriteria = new LinkedList<Criteria>(); - List<Criteria> coveredCriteria = new LinkedList<Criteria>(); public IndexInfo(TempTable table, final List<? extends Expression> projectedCols, final Criteria condition, OrderBy orderBy, boolean primary) { - this.table = table; - if (primary || this.table.getColumnMap().keySet().containsAll(projectedCols)) { - covering = true; - } - if (table.getPkLength() > 0) { - processCriteria(condition, primary); - if (orderBy != null && (covering || this.table.getColumnMap().keySet().containsAll(orderBy.getSortKeys()))) { - ordering = useIndexForOrderBy(orderBy); - } - } + super(table, projectedCols, condition, orderBy, primary); } - private void processCriteria(Criteria condition, boolean primary) { - List<Criteria> crits = Criteria.separateCriteriaByAnd(condition); - if (!primary) { - for (Iterator<Criteria> critIter = crits.iterator(); critIter.hasNext();) { - Criteria criteria = critIter.next(); - if (table.getColumnMap().keySet().containsAll(ElementCollectorVisitor.getElements(criteria, false))) { - coveredCriteria.add(criteria); - } else { - covering = false; - nonCoveredCriteria.add(criteria); - critIter.remove(); - } - } - } - for (int i = 0; i < table.getPkLength(); i++) { - ElementSymbol keyColumn = table.getColumns().get(i); - for (Iterator<Criteria> critIter = crits.iterator(); critIter.hasNext();) { - Criteria criteria = critIter.next(); - if (criteria instanceof CompareCriteria) { - CompareCriteria cc = (CompareCriteria)criteria; - if (cc.getOperator() == CompareCriteria.NE - || !(cc.getRightExpression() instanceof Constant)) { - critIter.remove(); - continue; - } - if (!cc.getLeftExpression().equals(keyColumn)) { - continue; - } - this.addCondition(i, (Constant)cc.getRightExpression(), cc.getOperator()); - critIter.remove(); - } else if (criteria instanceof IsNullCriteria) { - IsNullCriteria inc = (IsNullCriteria)criteria; - if (inc.isNegated() || !inc.getExpression().equals(keyColumn)) { - continue; - } - this.addCondition(i, new Constant(null), CompareCriteria.EQ); - critIter.remove(); - } else { - if (i > 0) { - critIter.remove(); - continue; - } - if (criteria instanceof MatchCriteria) { - MatchCriteria matchCriteria = (MatchCriteria)criteria; - if (matchCriteria.isNegated() || !matchCriteria.getLeftExpression().equals(keyColumn) || !(matchCriteria.getRightExpression() instanceof Constant)) { - continue; - } - Constant value = (Constant)matchCriteria.getRightExpression(); - String pattern = (String)value.getValue(); - boolean escaped = false; - char escapeChar = matchCriteria.getEscapeChar(); - if (matchCriteria.getMode() == MatchMode.REGEX) { - escapeChar = '\\'; - } - StringBuilder prefix = new StringBuilder(); - - if (pattern.length() > 0 && matchCriteria.getMode() == MatchMode.REGEX && pattern.charAt(0) != '^') { - //make the assumption that we require an anchor - continue; - } - - for (int j = matchCriteria.getMode() == MatchMode.REGEX?1:0; i < pattern.length(); j++) { - char character = pattern.charAt(j); - - if (character == escapeChar && character != MatchCriteria.NULL_ESCAPE_CHAR) { - if (escaped) { - prefix.append(character); - escaped = false; - } else { - escaped = true; - } - continue; - } - if (!escaped) { - if (matchCriteria.getMode() == MatchMode.LIKE) { - if (character == MatchCriteria.WILDCARD_CHAR || character == MatchCriteria.MATCH_CHAR) { - break; - } - } else { - int index = Arrays.binarySearch(Evaluator.REGEX_RESERVED, character); - if (index >= 0 && pattern.length() > 0) { - getRegexPrefix(pattern, escapeChar, prefix, j, character); - break; - } - } - } else { - escaped = false; - } - prefix.append(character); - } - if (prefix.length() > 0) { - this.addCondition(i, new Constant(prefix.toString()), CompareCriteria.GE); - } - } else if (criteria instanceof SetCriteria) { - SetCriteria setCriteria = (SetCriteria)criteria; - if (!setCriteria.getExpression().equals(keyColumn) || !setCriteria.isAllConstants()) { - continue; - } - Collection<Constant> values = (Collection<Constant>) setCriteria.getValues(); - this.addSet(i, values); - } - } - } - } - } - - private void getRegexPrefix(String pattern, char escapeChar, - StringBuilder prefix, int j, char character) { - boolean escaped = false; - //check the rest of the expression for | - int level = 0; - for (int k = j; k < pattern.length(); k++) { - character = pattern.charAt(k); - if (character == escapeChar && character != MatchCriteria.NULL_ESCAPE_CHAR) { - escaped = !escaped; - } else if (!escaped) { - if (character == '(') { - level++; - } else if (character == ')') { - level--; - } else if (character == '|' && level == 0) { - prefix.setLength(0); //TODO: turn this into an IN condition - return; - } - } - } - - if (character == '{' || character == '?' || character == '*') { - prefix.setLength(prefix.length() - 1); - } - } - - void addCondition(int i, Constant value, int comparisionMode) { - switch (comparisionMode) { - case CompareCriteria.EQ: - if (i == 0) { - valueSet.clear(); - valueSet.add(new ArrayList<Object>(table.getPkLength())); - } - if (valueSet.size() == 1) { - valueSet.get(0).add(value.getValue()); - } - lower = null; - upper = null; - break; - case CompareCriteria.GE: - case CompareCriteria.GT: - if (valueSet.isEmpty()) { - if (i == 0) { - lower = new ArrayList<Object>(table.getPkLength()); - lower.add(value.getValue()); - } if (lower != null && lower.size() == i) { - lower.add(value.getValue()); - } - } - break; - case CompareCriteria.LE: - case CompareCriteria.LT: - if (valueSet.isEmpty()) { - if (i == 0) { - upper = new ArrayList<Object>(table.getPkLength()); - upper.add(value.getValue()); - } else if (upper != null && upper.size() == i) { - upper.add(value.getValue()); - } - } - break; - } - } - - void addSet(int i, Collection<Constant> values) { - if (!valueSet.isEmpty()) { - return; - } - if (i == 0) { - for (Constant constant : values) { - List<Object> value = new ArrayList<Object>(table.getPkLength()); - value.add(constant.getValue()); - valueSet.add(value); - } - lower = null; - upper = null; - } - } - - /** - * Return a non-null direction if the index can be used, otherwise null. - * @param orderBy - * @return - */ - private Boolean useIndexForOrderBy(OrderBy orderBy) { - Boolean direction = null; - int[] orderByIndexes = RelationalNode.getProjectionIndexes(this.table.getColumnMap(), orderBy.getSortKeys()); - for (int i = 0; i < table.getPkLength(); i++) { - if (orderByIndexes.length <= i) { - break; - } - if (orderByIndexes[i] != i) { - return null; - } - } - for (OrderByItem item : orderBy.getOrderByItems()) { - if (item.getNullOrdering() != null) { - return null; - } - if (item.isAscending()) { - if (direction == null) { - direction = OrderBy.ASC; - } else if (direction != OrderBy.ASC) { - return null; - } - } else if (direction == null) { - direction = OrderBy.DESC; - } else if (direction != OrderBy.DESC) { - return null; - } - } - return direction; - } - TupleBrowser createTupleBrowser() throws TeiidComponentException { boolean direction = OrderBy.ASC; if (ordering != null) { @@ -324,13 +69,4 @@ return new TupleBrowser(this.table.getTree(), lower, upper, direction); } - public void sortValueSet(boolean direction) { - int size = valueSet.get(0).size(); - int[] sortOn = new int[size]; - for (int i = 0; i <sortOn.length; i++) { - sortOn[i] = i; - } - Collections.sort(valueSet, new ListNestedSortComparator(sortOn, direction)); - } - } \ No newline at end of file Added: trunk/engine/src/main/java/org/teiid/query/tempdata/SearchableTable.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/tempdata/SearchableTable.java (rev 0) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/SearchableTable.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,39 @@ +/* + * 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.tempdata; + +import java.util.Map; + +import org.teiid.query.sql.symbol.Expression; + +public interface SearchableTable { + + Map<Expression, Integer> getColumnMap(); + + int getPkLength(); + + boolean matchesPkColumn(int pkIndex, Expression ex); + + boolean supportsOrdering(int pkIndex, Expression ex); + +} \ No newline at end of file Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata/SearchableTable.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTable.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTable.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTable.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -68,7 +68,7 @@ * TODO: in this implementation blocked exceptions will not happen * allowing for subquery evaluation though would cause pauses */ -public class TempTable implements Cloneable { +public class TempTable implements Cloneable, SearchableTable { private final class InsertUpdateProcessor extends UpdateProcessor { @@ -94,7 +94,6 @@ tree.setBatchInsert(false); } - @Override protected void tuplePassed(List tuple) throws BlockedException, TeiidComponentException, TeiidProcessingException { @@ -452,9 +451,9 @@ if (ii.ordering != null) { //use order and join primary.valueTs = ii.table.createTupleSource(pkColumns, - Criteria.combineCriteria(ii.coveredCriteria), orderBy, ii, agg); + ii.coveredCriteria, orderBy, ii, agg); primary.ordering = null; - return createTupleSource(projectedCols, Criteria.combineCriteria(ii.nonCoveredCriteria), null, primary, agg); + return createTupleSource(projectedCols, ii.nonCoveredCriteria, null, primary, agg); } //order by pk to localize lookup costs, then join OrderBy pkOrderBy = new OrderBy(); @@ -462,8 +461,8 @@ pkOrderBy.addVariable(elementSymbol); } primary.valueTs = ii.table.createTupleSource(pkColumns, - Criteria.combineCriteria(ii.coveredCriteria), pkOrderBy, ii, agg); - return createTupleSource(projectedCols, Criteria.combineCriteria(ii.nonCoveredCriteria), orderBy, primary, agg); + ii.coveredCriteria, pkOrderBy, ii, agg); + return createTupleSource(projectedCols, ii.nonCoveredCriteria, orderBy, primary, agg); } return createTupleSource(projectedCols, condition, orderBy, ii, agg); } @@ -574,6 +573,20 @@ } } + @Override + public boolean matchesPkColumn(int pkIndex, Expression ex) { + if (rowId != null) { + return false; + } + return columns.get(pkIndex).equals(ex); + } + + @Override + public boolean supportsOrdering(int pkIndex, Expression ex) { + //all indexes are currently ordered + return true; + } + public List<ElementSymbol> getColumns() { if (rowId != null) { return columns.subList(1, columns.size()); @@ -696,7 +709,7 @@ private void insertTuple(List<?> list, boolean ordered) throws TeiidComponentException, TeiidProcessingException { if (tree.insert(list, ordered?InsertMode.ORDERED:InsertMode.NEW, -1) != null) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30238, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30238)); + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30238, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30238, this.tid.getID())); } } @@ -798,7 +811,7 @@ return this.tid.getCacheHint(); } - int getPkLength() { + public int getPkLength() { if (rowId != null) { return 0; } @@ -814,7 +827,7 @@ return tid.getID() + " (" + columns + ")\n"; //$NON-NLS-1$ //$NON-NLS-2$ } - Map<Expression, Integer> getColumnMap() { + public Map<Expression, Integer> getColumnMap() { return this.columnMap; } Modified: trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql =================================================================== --- trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql 2012-09-13 11:16:46 UTC (rev 4434) @@ -29,7 +29,7 @@ Radix integer NOT NULL, UID string(50) NOT NULL, Description string(255), - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE DataTypes ( @@ -51,7 +51,7 @@ RuntimeType string(64), BaseType string(64), Description string(255), - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE KeyColumns ( @@ -64,7 +64,7 @@ RefKeyUID string(50), UID string(50) NOT NULL, Position integer, - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE Keys ( @@ -78,7 +78,7 @@ IsIndexed boolean NOT NULL, RefKeyUID string(50), UID string(50) NOT NULL, - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE ProcedureParams ( @@ -97,7 +97,7 @@ NullType string(10) NOT NULL, UID string(50), Description string(255), - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE Procedures ( @@ -108,14 +108,14 @@ ReturnsResults boolean NOT NULL, UID string(50) NOT NULL, Description string(255), - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE Properties ( Name string(255) NOT NULL, "Value" string(255) NOT NULL, UID string(50) NOT NULL, - OID integer NOT NULL, + OID integer, ClobValue clob(2097152) ); @@ -143,7 +143,7 @@ UID string(50) NOT NULL, Description string(255), PrimaryMetamodelURI string(255) NOT NULL, - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE Tables ( @@ -159,7 +159,7 @@ Description string(255), IsSystem boolean, IsMaterialized boolean NOT NULL, - OID integer NOT NULL + OID integer ); CREATE FOREIGN TABLE VirtualDatabases ( Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-09-13 11:16:46 UTC (rev 4434) @@ -746,7 +746,7 @@ TEIID30009=Reached maximum thread count "{0}" for worker pool "{1}" with a queue size high of "{2}". Queued work waited {3} ms prior to executing. To avoid queuing of work you may consider increasing "max-threads" or decreasing the "max-active-plans" in the "standalone-teiid.xml" file. TEIID30021=Uncaught exception processing work -TEIID30238=Duplicate key +TEIID30238=Duplicate key on {0} TEIID30236=Null value is not allowed for column {0} ValidationVisitor.group_in_both_dep=Table specified in both dependent and independent queries ''{0}'' XMLQuery.resolvingError=Failed to resolve the query ''{0}'' Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java =================================================================== --- trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -73,7 +73,7 @@ assertFalse(t.isVirtual()); } - @Test public void test71Schema() throws Exception { + @Test public void test81Schema() throws Exception { ObjectInputStream ois = new ObjectInputStream(new FileInputStream(UnitTestUtil.getTestDataFile("schema.ser"))); Schema schema = (Schema) ois.readObject(); assertNotNull(schema.getFunctions()); Modified: trunk/metadata/src/test/resources/schema.ser =================================================================== (Binary files differ) Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -28,6 +28,8 @@ import java.util.Map; import java.util.Properties; +import org.teiid.CommandContext; +import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.core.types.ArrayImpl; import org.teiid.core.types.DataTypeManager; import org.teiid.metadata.Column; @@ -38,6 +40,7 @@ import org.teiid.metadata.FunctionMethod.PushDown; import org.teiid.metadata.Table.Type; import org.teiid.odbc.ODBCServerRemoteImpl; +import org.teiid.query.metadata.TransformationMetadata; import org.teiid.query.resolver.util.ResolverVisitor; import org.teiid.translator.TranslatorException; @@ -64,6 +67,7 @@ addFunction("getExpr3", "pg_get_expr"); //$NON-NLS-1$ //$NON-NLS-2$ FunctionMethod func = addFunction("asPGVector", "asPGVector"); //$NON-NLS-1$ //$NON-NLS-2$ func.setProperty(ResolverVisitor.TEIID_PASS_THROUGH_TYPE, Boolean.TRUE.toString()); + addFunction("getOid", "getOid"); //$NON-NLS-1$ //$NON-NLS-2$ } private Table createView(String name) throws TranslatorException { @@ -96,7 +100,7 @@ addColumn("adbin", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ addColumn("adsrc", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ - String transformation = "SELECT st.oid as adrelid, convert(t1.Position, short) as adnum, " + //$NON-NLS-1$ + String transformation = "SELECT pg_catalog.getOid(st.uid) as adrelid, convert(t1.Position, short) as adnum, " + //$NON-NLS-1$ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue end as adbin, " + //$NON-NLS-1$ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue end as adsrc " + //$NON-NLS-1$ "FROM SYS.Columns as t1 LEFT OUTER JOIN SYS.Tables st ON (st.Name = t1.TableName AND st.SchemaName = t1.SchemaName)"; //$NON-NLS-1$ @@ -139,8 +143,8 @@ addPrimaryKey("pk_pg_attr", Arrays.asList("oid"), t); //$NON-NLS-1$ //$NON-NLS-2$ - String transformation = "SELECT t1.OID as oid, " + //$NON-NLS-1$ - "st.oid as attrelid, " + //$NON-NLS-1$ + String transformation = "SELECT pg_catalog.getOid(t1.uid) as oid, " + //$NON-NLS-1$ + "pg_catalog.getOid(st.uid) as attrelid, " + //$NON-NLS-1$ "t1.Name as attname, " + //$NON-NLS-1$ "pt.oid as atttypid," + //$NON-NLS-1$ "pt.typlen as attlen, " + //$NON-NLS-1$ @@ -153,8 +157,8 @@ "FROM SYS.Columns as t1 LEFT OUTER JOIN " + //$NON-NLS-1$ "SYS.Tables st ON (st.Name = t1.TableName AND st.SchemaName = t1.SchemaName) LEFT OUTER JOIN " + //$NON-NLS-1$ "pg_catalog.matpg_datatype pt ON t1.DataType = pt.Name " +//$NON-NLS-1$ - "UNION ALL SELECT kc.OID + (SELECT MAX(oid) FROM SYS.Columns) as oid, " + //$NON-NLS-1$ - "k.oid + (SELECT MAX(OID) FROM SYS.Tables) as attrelid, " + //$NON-NLS-1$ + "UNION ALL SELECT pg_catalog.getOid(kc.uid) + kc.position as oid, " + //$NON-NLS-1$ + "pg_catalog.getOid(kc.uid) as attrelid, " + //$NON-NLS-1$ "t1.Name as attname, " + //$NON-NLS-1$ "pt.oid as atttypid," + //$NON-NLS-1$ "pt.typlen as attlen, " + //$NON-NLS-1$ @@ -164,9 +168,9 @@ "CASE WHEN (t1.NullType = 'No Nulls') THEN true ELSE false END as attnotnull, " + //$NON-NLS-1$ "false as attisdropped, " + //$NON-NLS-1$ "false as atthasdef " + //$NON-NLS-1$ - "FROM (SYS.Keys as k INNER JOIN SYS.KeyColumns as kc ON k.uid = kc.uid INNER JOIN SYS.Columns as t1 ON kc.SchemaName = t1.SchemaName AND kc.TableName = t1.TableName AND kc.Name = t1.Name INNER JOIN " + //$NON-NLS-1$ + "FROM (SYS.KeyColumns as kc INNER JOIN SYS.Columns as t1 ON kc.SchemaName = t1.SchemaName AND kc.TableName = t1.TableName AND kc.Name = t1.Name INNER JOIN " + //$NON-NLS-1$ "SYS.Tables as st ON st.Name = t1.TableName AND st.SchemaName = t1.SchemaName) LEFT OUTER JOIN " + //$NON-NLS-1$ - "pg_catalog.matpg_datatype pt ON t1.DataType = pt.Name WHERE k.type in ('Primary', 'Unique', 'Index')"; //$NON-NLS-1$ + "pg_catalog.matpg_datatype pt ON t1.DataType = pt.Name WHERE kc.keytype in ('Primary', 'Unique', 'Index')"; //$NON-NLS-1$ t.setSelectTransformation(transformation); t.setMaterialized(true); return t; @@ -206,16 +210,16 @@ addPrimaryKey("pk_pg_class", Arrays.asList("oid"), t); //$NON-NLS-1$ //$NON-NLS-2$ - String transformation = "SELECT t1.OID as oid, t1.name as relname, " + //$NON-NLS-1$ - "(SELECT OID FROM SYS.Schemas WHERE Name = t1.SchemaName) as relnamespace, " + //$NON-NLS-1$ + String transformation = "SELECT pg_catalog.getOid(t1.uid) as oid, t1.name as relname, " + //$NON-NLS-1$ + "(SELECT pg_catalog.getOid(uid) FROM SYS.Schemas WHERE Name = t1.SchemaName) as relnamespace, " + //$NON-NLS-1$ "convert((CASE t1.isPhysical WHEN true THEN 'r' ELSE 'v' END), char) as relkind," + //$NON-NLS-1$ "0 as relam, " + //$NON-NLS-1$ "convert(0, float) as reltuples, " + //$NON-NLS-1$ "0 as relpages, " + //$NON-NLS-1$ "false as relhasrules, " + //$NON-NLS-1$ "false as relhasoids " + //$NON-NLS-1$ - "FROM SYS.Tables t1 UNION ALL SELECT t1.OID + (SELECT MAX(oid) as max from sys.tables) as oid, t1.name as relname, " + //$NON-NLS-1$ - "(SELECT OID FROM SYS.Schemas WHERE Name = t1.SchemaName) as relnamespace, " + //$NON-NLS-1$ + "FROM SYS.Tables t1 UNION ALL SELECT pg_catalog.getOid(t1.uid) as oid, t1.name as relname, " + //$NON-NLS-1$ + "(SELECT pg_catalog.getOid(uid) FROM SYS.Schemas WHERE Name = t1.SchemaName) as relnamespace, " + //$NON-NLS-1$ "convert('i', char) as relkind," + //$NON-NLS-1$ "0 as relam, " + //$NON-NLS-1$ "convert(0, float) as reltuples, " + //$NON-NLS-1$ @@ -257,16 +261,16 @@ addPrimaryKey("pk_pg_index", Arrays.asList("oid"), t); //$NON-NLS-1$ //$NON-NLS-2$ - String transformation = "SELECT k.oid as oid, " + //$NON-NLS-1$ - "k.oid + (SELECT MAX(oid) as max from sys.tables) as indexrelid, " + //$NON-NLS-1$ - "(SELECT OID FROM SYS.Tables WHERE SchemaName = t1.SchemaName AND Name = t1.TableName) as indrelid, " + //$NON-NLS-1$ - "cast(count(t1.OID) as short) as indnatts, " + //$NON-NLS-1$ + String transformation = "SELECT pg_catalog.getOid(t1.uid) as oid, " + //$NON-NLS-1$ + "pg_catalog.getOid(t1.uid) as indexrelid, " + //$NON-NLS-1$ + "(SELECT pg_catalog.getOid(uid) FROM SYS.Tables WHERE SchemaName = t1.SchemaName AND Name = t1.TableName) as indrelid, " + //$NON-NLS-1$ + "cast(count(t1.uid) as short) as indnatts, " + //$NON-NLS-1$ "false indisclustered, " + //$NON-NLS-1$ "(CASE WHEN t1.KeyType in ('Unique', 'Primary') THEN true ELSE false END) as indisunique, " + //$NON-NLS-1$ "(CASE t1.KeyType WHEN 'Primary' THEN true ELSE false END) as indisprimary, " + //$NON-NLS-1$ "'' as indexprs, asPGVector(" + //$NON-NLS-1$ - arrayAgg("(select at.attnum FROM pg_attribute as at WHERE at.attname = t1.Name AND at.attrelid = (SELECT OID FROM SYS.Tables WHERE SchemaName = t1.SchemaName AND Name = t1.TableName))", "t1.position") +") as indkey " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - "FROM SYS.Keys as k, Sys.KeyColumns as t1 WHERE k.uid = t1.uid GROUP BY k.oid, t1.KeyType, t1.SchemaName, t1.TableName, t1.KeyName"; //$NON-NLS-1$ + arrayAgg("(select at.attnum FROM pg_attribute as at WHERE at.attname = t1.Name AND at.attrelid = (SELECT pg_catalog.getOid(uid) FROM SYS.Tables WHERE SchemaName = t1.SchemaName AND Name = t1.TableName))", "t1.position") +") as indkey " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "FROM Sys.KeyColumns as t1 GROUP BY t1.uid, t1.KeyType, t1.SchemaName, t1.TableName, t1.KeyName"; //$NON-NLS-1$ t.setSelectTransformation(transformation); t.setMaterialized(true); return t; @@ -278,7 +282,7 @@ addColumn("oid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ addColumn("nspname", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ - String transformation = "SELECT t1.OID as oid, t1.Name as nspname " + //$NON-NLS-1$ + String transformation = "SELECT pg_catalog.getOid(uid) as oid, t1.Name as nspname " + //$NON-NLS-1$ "FROM SYS.Schemas as t1"; //$NON-NLS-1$ t.setSelectTransformation(transformation); @@ -327,14 +331,14 @@ addPrimaryKey("pk_pg_proc", Arrays.asList("oid"), t); //$NON-NLS-1$ //$NON-NLS-2$ - String transformation = "SELECT t1.OID as oid, t1.Name as proname, (SELECT (CASE WHEN count(pp.Type)>0 THEN true else false END) as x FROM ProcedureParams pp WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName and pp.Type='ResultSet') as proretset, " + //$NON-NLS-1$ + String transformation = "SELECT pg_catalog.getOid(t1.uid) as oid, t1.Name as proname, (SELECT (CASE WHEN count(pp.Type)>0 THEN true else false END) as x FROM ProcedureParams pp WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName and pp.Type='ResultSet') as proretset, " + //$NON-NLS-1$ "CASE WHEN (SELECT count(dt.oid) FROM ProcedureParams pp, matpg_datatype dt WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName AND pp.Type IN ('ReturnValue', 'ResultSet') AND dt.Name = pp.DataType) IS NULL THEN (select oid from pg_type WHERE typname = 'void') WHEN (SELECT count(dt.oid) FROM ProcedureParams pp, matpg_datatype dt WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName AND pp.Type = 'ResultSet' AND dt.Name = pp.DataType) IS NOT NULL THEN (select oid from pg_type WHERE typname = 'record') ELSE (SELECT dt.oid FROM ProcedureParams pp, matpg_datatype dt WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName AND pp.Type = 'ReturnValue' AND dt.Name = pp.DataType) END as prorettype, " + //$NON-NLS-1$ "convert((SELECT count(*) FROM ProcedureParams pp WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName AND pp.Type IN ('In', 'InOut')), short) as pronargs, " + //$NON-NLS-1$ "asPGVector((select "+arrayAgg("y.oid","y.type, y.position" )+" FROM ("+paramTable("'ResultSet','ReturnValue', 'Out'")+") as y)) as proargtypes, " +//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ "(select "+arrayAgg("y.name", "y.type, y.position")+" FROM (SELECT pp.Name as name, pp.position as position, pp.Type as type FROM ProcedureParams pp WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName AND pp.Type NOT IN ('ReturnValue' )) as y) as proargnames, " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "(select case WHEN count(distinct(y.type)) = 1 THEN null ELSE "+arrayAgg("CASE WHEN (y.type ='In') THEN cast('i' as char) WHEN (y.type = 'Out') THEN cast('o' as char) WHEN (y.type = 'InOut') THEN cast('b' as char) WHEN (y.type = 'ResultSet') THEN cast('t' as char) END", "y.type,y.position")+" END FROM (SELECT pp.Type as type, pp.Position as position FROM ProcedureParams pp WHERE pp.ProcedureName = t1.Name AND pp.SchemaName = t1.SchemaName AND pp.Type NOT IN ('ReturnValue')) as y) as proargmodes, " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "(select case WHEN count(distinct(y.oid)) = 1 THEN null ELSE "+arrayAgg("y.oid", "y.type, y.position")+" END FROM ("+paramTable("'ReturnValue'")+") as y) as proallargtypes, " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ - "(SELECT OID FROM SYS.Schemas WHERE Name = t1.SchemaName) as pronamespace " + //$NON-NLS-1$ + "(SELECT pg_catalog.getOid(uid) FROM SYS.Schemas WHERE Name = t1.SchemaName) as pronamespace " + //$NON-NLS-1$ "FROM SYS.Procedures as t1";//$NON-NLS-1$ t.setSelectTransformation(transformation); @@ -406,7 +410,7 @@ addColumn("typrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ addColumn("typelem", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ String transformation = - "select oid, typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem from texttable('" + //$NON-NLS-1$ + "select oid, typname, (SELECT pg_catalog.getOid(uid) FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem from texttable('" + //$NON-NLS-1$ "16,boolean,1,b,0,-1,0,0\n" + //$NON-NLS-1$ "1043,string,-1,b,0,-1,0,0\n" + //$NON-NLS-1$ "25,text,-1,b,0,-1,0,0\n" + //$NON-NLS-1$ @@ -547,6 +551,9 @@ for (int i = 0; i < params.length; i++) { paramTypes[i] = DataTypeManager.getDataTypeName(params[i]); } + if (params.length > 0 && params[0] == CommandContext.class) { + paramTypes = Arrays.copyOfRange(paramTypes, 1, paramTypes.length); + } FunctionMethod func = FunctionMethod.createFunctionMethod(name, name, "pg", returnType, paramTypes); //$NON-NLS-1$ setUUID(func); getSchema().addFunction(func); @@ -583,5 +590,11 @@ } return obj; } + + public static Integer getOid(org.teiid.CommandContext cc, String uid) { + VDBMetaData metadata = (VDBMetaData) cc.getVdb(); + TransformationMetadata tm = metadata.getAttachment(TransformationMetadata.class); + return tm.getMetadataStore().getOid(uid); + } } } Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/HardCodedExecutionFactory.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/HardCodedExecutionFactory.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/HardCodedExecutionFactory.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -37,7 +37,7 @@ import org.teiid.translator.TranslatorException; @Translator(name="hardcoded") -public final class HardCodedExecutionFactory extends ExecutionFactory<Object, Object> { +public class HardCodedExecutionFactory extends ExecutionFactory<Object, Object> { Map<String, List<? extends List<?>>> dataMap = new HashMap<String, List<? extends List<?>>>(); @Override Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,6 +1,5 @@ package org.teiid.jdbc; -import java.sql.SQLException; import java.util.Arrays; import org.junit.After; @@ -34,33 +33,12 @@ server.deployVDB(VDB1, UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb"); this.internalConnection = server.createConnection("jdbc:teiid:"+VDB1); - String[] expected = { - "VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]", - "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" - }; - executeTest("select * from tables where schemaname ='PartsSupplier'", expected); //$NON-NLS-1$ - - String[] expectedBefore = { - "VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]", - }; - String[] expectedAfter = { - "VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]", - "PartsSupplier BQT1 HugeA Table null true false mmuuid:7c66fc80-33d2-1dfa-9931-e83d04ce10a0 500000 null false false 6", - "PartsSupplier BQT1 HugeB Table null true false mmuuid:b0369400-33f8-1dfa-9931-e83d04ce10a0 500000 null false false 7", - "PartsSupplier BQT1 LargeA Table null true false mmuuid:3976a800-33b2-1dfa-9931-e83d04ce10a0 10000 null false false 8", - "PartsSupplier BQT1 LargeB Table null true false mmuuid:5fb40600-33c3-1dfa-9931-e83d04ce10a0 10000 null false false 9", - "PartsSupplier BQT1 MediumA Table null true false mmuuid:61074980-338d-1dfa-9931-e83d04ce10a0 1000 null false false 10", - "PartsSupplier BQT1 MediumB Table null true false mmuuid:e24bd1c0-33a4-1dfa-9931-e83d04ce10a0 1000 null false false 11", - "PartsSupplier BQT1 SmallA Table null true false mmuuid:0968424f-e6a0-1df9-ac06-b890ff96f710 50 null false false 12", - "PartsSupplier BQT1 SmallB Table null true false mmuuid:06fb8980-3377-1dfa-9931-e83d04ce10a0 50 null false false 13" - }; - - executeTest("select * from tables where schemaname='BQT1'", expectedBefore); //$NON-NLS-1$ + execute("select * from tables where schemaname ='PartsSupplier'"); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet("TestVDBMerge/merge.test", this.internalResultSet); + execute("select * from tables where schemaname='BQT1'"); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet("TestVDBMerge/merge.before", this.internalResultSet); + this.internalConnection.close(); server.deployVDB(VDB2, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb"); @@ -73,29 +51,17 @@ server.deployVDB(VDB1, UnitTestUtil.getTestDataPath()+"/PartsSupplier.vdb", param); this.internalConnection = server.createConnection("jdbc:teiid:"+VDB1); - executeTest("select * from tables where schemaname='BQT1' order by name", expectedAfter); //$NON-NLS-1$ + execute("select * from tables where schemaname='BQT1' order by name"); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet("TestVDBMerge/merge.after", this.internalResultSet); } - private void executeTest(String sql, String[] expected) throws SQLException{ - execute(sql); - if (expected != null) { - assertResults(expected); - } else { - printResults(true); - } - } - @Test public void testMergeWithEmptyVDB() throws Exception { server.deployVDB("empty", UnitTestUtil.getTestDataPath() + "/empty.vdb"); this.internalConnection = server.createConnection("jdbc:teiid:empty"); - String[] expectedBefore = { - "VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]", - }; - - executeTest("select * from tables where schemaname ='BQT1'", expectedBefore); //$NON-NLS-1$ - + execute("select * from tables where schemaname ='BQT1'"); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet("TestVDBMerge/mergeEmpty.before", this.internalResultSet); this.internalConnection.close(); server.deployVDB(VDB2, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb"); @@ -107,20 +73,8 @@ server.undeployVDB("empty"); server.deployVDB("empty", UnitTestUtil.getTestDataPath() + "/empty.vdb", param); - String[] expectedAfter = { - "VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]", - "empty BQT1 HugeA Table null true false mmuuid:7c66fc80-33d2-1dfa-9931-e83d04ce10a0 500000 null false false 1", - "empty BQT1 HugeB Table null true false mmuuid:b0369400-33f8-1dfa-9931-e83d04ce10a0 500000 null false false 2", - "empty BQT1 LargeA Table null true false mmuuid:3976a800-33b2-1dfa-9931-e83d04ce10a0 10000 null false false 3", - "empty BQT1 LargeB Table null true false mmuuid:5fb40600-33c3-1dfa-9931-e83d04ce10a0 10000 null false false 4", - "empty BQT1 MediumA Table null true false mmuuid:61074980-338d-1dfa-9931-e83d04ce10a0 1000 null false false 5", - "empty BQT1 MediumB Table null true false mmuuid:e24bd1c0-33a4-1dfa-9931-e83d04ce10a0 1000 null false false 6", - "empty BQT1 SmallA Table null true false mmuuid:0968424f-e6a0-1df9-ac06-b890ff96f710 50 null false false 7", - "empty BQT1 SmallB Table null true false mmuuid:06fb8980-3377-1dfa-9931-e83d04ce10a0 50 null false false 8" - }; - this.internalConnection = server.createConnection("jdbc:teiid:empty"); - executeTest("select * from tables where schemaname='BQT1'", expectedAfter); //$NON-NLS-1$ - + execute("select * from tables where schemaname='BQT1'"); //$NON-NLS-1$ + TestMMDatabaseMetaData.compareResultSet("TestVDBMerge/mergeEmpty.after", this.internalResultSet); } } Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCProceduresSchema.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCProceduresSchema.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCProceduresSchema.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -21,10 +21,6 @@ */ package org.teiid.systemmodel; -import static org.junit.Assert.*; - -import java.sql.Array; - import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -60,47 +56,17 @@ @Test public void test_Pg_Proc_alltypes() throws Exception { execute("select oid, proname, proretset,prorettype, pronargs, proargtypes, proargnames, proargmodes, proallargtypes, pronamespace FROM pg_proc where proname='bigProcedure'"); //$NON-NLS-1$ - assertTrue(this.internalResultSet.next()); - assertEquals(1, this.internalResultSet.getInt(1)); //oid - assertEquals("bigProcedure", this.internalResultSet.getString(2)); //proname - assertEquals(true, this.internalResultSet.getBoolean(3)); //proretset - assertEquals(2249, this.internalResultSet.getInt(4)); //prorettype - assertEquals(14, this.internalResultSet.getInt(5)); //pronargs - assertArrayEquals(new Object[] {1700,1043,700,20,701,21,1082,1083,1114,16,1043,21,1700,1700}, (Object[])((Array)this.internalResultSet.getObject(6)).getArray()); //proargtypes - assertArrayEquals(new Object[] {"intNum","stringNum","floatNum","longNum","doubleNum","byteNum","dateValue","timeValue","timestampValue","booValue","charValue","shortNum","bigIntNum","bigdecimalNum","col","col2"}, (Object[])((Array)this.internalResultSet.getObject(7)).getArray()); //proargnames - assertArrayEquals(new Object[] {'i','i','i','i','i','i','i','i','i','i','i','i','i','i','t','t'}, (Object[])((Array)this.internalResultSet.getObject(8)).getArray()); //proargmodes - assertArrayEquals(new Object[] {1700,1043,700,20,701,21,1082,1083,1114,16,1043,21,1700,1700,1043,1700}, (Object[])((Array)this.internalResultSet.getObject(9)).getArray()); //proallargtypes - assertEquals(1, this.internalResultSet.getInt(10)); //pronamespace + TestMMDatabaseMetaData.compareResultSet(this.internalResultSet); } @Test public void test_Pg_Proc_void() throws Exception { execute("select oid, proname, proretset,prorettype, pronargs, proargtypes, proargnames, proargmodes, proallargtypes, pronamespace FROM pg_proc where proname='VoidProcedure'"); //$NON-NLS-1$ - assertTrue(this.internalResultSet.next()); - assertEquals(4, this.internalResultSet.getInt(1)); //oid - assertEquals("VoidProcedure", this.internalResultSet.getString(2)); //proname - assertEquals(false, this.internalResultSet.getBoolean(3)); //proretset - assertEquals(2278, this.internalResultSet.getInt(4)); //prorettype - assertEquals(2, this.internalResultSet.getInt(5)); //pronargs - assertArrayEquals(new Object[] {1700,1043}, (Object[])((Array)this.internalResultSet.getObject(6)).getArray()); //proargtypes - assertArrayEquals(new Object[] {"intNum","stringNum"}, (Object[])((Array)this.internalResultSet.getObject(7)).getArray()); //proargnames - assertNull(this.internalResultSet.getObject(8)); //proargmodes - assertArrayEquals(new Object[] {1700,1043}, (Object[])((Array)this.internalResultSet.getObject(9)).getArray()); //proallargtypes - assertEquals(1, this.internalResultSet.getInt(10)); //pronamespace + TestMMDatabaseMetaData.compareResultSet(this.internalResultSet); } @Test public void test_Pg_Proc_with_return() throws Exception { execute("select oid, proname, proretset,prorettype, pronargs, proargtypes, proargnames, proargmodes, proallargtypes, pronamespace FROM pg_proc where proname='ProcedureWithReturn'"); //$NON-NLS-1$ - assertTrue(this.internalResultSet.next()); - assertEquals(3, this.internalResultSet.getInt(1)); //oid - assertEquals("ProcedureWithReturn", this.internalResultSet.getString(2)); //proname - assertEquals(false, this.internalResultSet.getBoolean(3)); //proretset - assertEquals(20, this.internalResultSet.getInt(4)); //prorettype - assertEquals(3, this.internalResultSet.getInt(5)); //pronargs - assertArrayEquals(new Object[] {1700,1043,700}, (Object[])((Array)this.internalResultSet.getObject(6)).getArray()); //proargtypes - assertArrayEquals(new Object[] {"intNum","stringNum","floatNum"}, (Object[])((Array)this.internalResultSet.getObject(7)).getArray()); //proargnames - assertNull(this.internalResultSet.getObject(8)); //proargmodes - assertArrayEquals(new Object[] {1700,1043,700}, (Object[])((Array)this.internalResultSet.getObject(9)).getArray()); //proallargtypes - assertEquals(1, this.internalResultSet.getInt(10)); //pronamespace + TestMMDatabaseMetaData.compareResultSet(this.internalResultSet); } @Test public void test_Pg_Proc_with_return_table() throws Exception { Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -98,8 +98,8 @@ } @Test public void testOIDUniquness() throws Exception { - for (String table : new String[] {"Tables", "Columns", "Schemas", "DataTypes", "Keys", "Procedures", "ProcedureParams", "Properties"}) { - execute("select count(distinct oid), count(*) from SYS."+table); + for (String table : new String[] {"pg_type", "pg_attribute", "pg_namespace", "pg_index"}) { + execute("select count(distinct oid), count(*) from "+table); internalResultSet.next(); assertEquals(internalResultSet.getInt(2), internalResultSet.getInt(1)); } Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -149,21 +149,6 @@ checkResult("testReferenceKeyColumns", "select* FROM SYS.ReferenceKeyColumns order by PKTABLE_NAME"); //$NON-NLS-1$ //$NON-NLS-2$ } - - @Test public void test_UID_OID_are_Equal() throws Exception { - execute("select distinct(UID) FROM SYS.Schemas"); //$NON-NLS-1$ - int uidCount = getRowCount(); - execute("select distinct(OID) FROM SYS.Schemas"); //$NON-NLS-1$ - int oidCount = getRowCount(); - assertEquals(uidCount, oidCount); - - execute("select distinct(UID) FROM SYS.DataTypes"); //$NON-NLS-1$ - uidCount = getRowCount(); - execute("select distinct(OID) FROM SYS.DataTypes"); //$NON-NLS-1$ - oidCount = getRowCount(); - assertEquals(uidCount, oidCount); - } - @Test public void testLogMsg() throws Exception { execute("call logMsg(level=>'DEBUG', context=>'org.teiid.foo', msg=>'hello world')"); //$NON-NLS-1$ } Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,36 +1,36 @@ 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 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 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-00000069 -1 <null> true true 19 -parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true 20 -parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false 21 -parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false 22 -parts pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true 23 -parts pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true 24 -parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false 25 -parts pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true 26 -parts pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false 27 -parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true 28 -parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false 29 -parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true 30 -parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false 31 +parts SYS Columns Table <null> true false tid:2cb59cfd55db-9bd42fbd-00000001 -1 <null> true false <null> +parts SYS DataTypes Table <null> true false tid:2cb59cfd55db-6130d2cf-00000021 -1 <null> true false <null> +parts SYS KeyColumns Table <null> true false tid:2cb59cfd55db-c5c6549e-00000035 -1 <null> true false <null> +parts SYS Keys Table <null> true false tid:2cb59cfd55db-0023a214-00000040 -1 <null> true false <null> +parts SYSADMIN MatViews Table <null> true false tid:60b87e792634-14d6450e-00000001 -1 <null> true false <null> +parts PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false <null> +parts SYS ProcedureParams Table <null> true false tid:2cb59cfd55db-ab347619-0000004c -1 <null> true false <null> +parts SYS Procedures Table <null> true false tid:2cb59cfd55db-8f29b420-0000005d -1 <null> true false <null> +parts SYS Properties Table <null> true false tid:2cb59cfd55db-3f9f6953-00000066 -1 <null> true false <null> +parts SYS ReferenceKeyColumns Table <null> true false tid:2cb59cfd55db-aa92fa09-0000006c -1 <null> true false <null> +parts SYS Schemas Table <null> true false tid:2cb59cfd55db-d57e16d2-0000007b -1 <null> true false <null> +parts SYS Tables Table <null> true false tid:2cb59cfd55db-94dc2a85-00000083 -1 <null> true false <null> +parts SYSADMIN VDBResources Table <null> true false tid:60b87e792634-1e9b1131-0000000b -1 <null> true false <null> +parts SYS VirtualDatabases Table <null> true false tid:2cb59cfd55db-a9e11fad-00000091 -1 <null> true false <null> +parts pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000069 -1 <null> true true <null> +parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true <null> +parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false <null> +parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false <null> +parts pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true <null> +parts pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true <null> +parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false <null> +parts pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true <null> +parts pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false <null> +parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true <null> +parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false <null> +parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true <null> +parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false <null> 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 false 1 true true false false @@ -45,4 +45,4 @@ 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 +OID 4 parts java.lang.Integer OID integer SYS Tables 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -188,7 +188,7 @@ 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 Columns OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 31 YES <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 @@ -207,7 +207,7 @@ 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 SYS DataTypes OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 19 YES <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 @@ -285,7 +285,7 @@ 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 KeyColumns OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 10 YES <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 @@ -296,7 +296,7 @@ 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 SYS Keys OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 11 YES <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 @@ -457,7 +457,7 @@ 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 ProcedureParams OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 16 YES <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 @@ -465,11 +465,11 @@ 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 Procedures OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 8 YES <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 OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 4 YES <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 @@ -491,7 +491,7 @@ 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 SYS Schemas OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 7 YES <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 @@ -572,7 +572,7 @@ 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> 0 13 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 13 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U1 IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 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 Added: trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_alltypes.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_alltypes.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_alltypes.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,15 @@ +integer string boolean integer short integer[] string[] char[] integer[] integer +oid proname proretset prorettype pronargs proargtypes proargnames proargmodes proallargtypes pronamespace +84 bigProcedure true 2249 14 [1700, 1043, 700, 20, 701, 21, 1082, 1083, 1114, 16, 1043, 21, 17$ [intNum, stringNum, floatNum, longNum, doubleNum, byteNum, dateVa$ [i, i, i, i, i, i, i, i, i, i, i, i, i, i, t, t] [1700, 1043, 700, 20, 701, 21, 1082, 1083, 1114, 16, 1043, 21, 17$ 54 +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +oid 4 bqt java.lang.Integer oid integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false +proname 12 bqt java.lang.String proname string pg_catalog pg_proc 4000 4000 0 false true false false 1 true true false false +proretset -7 bqt java.lang.Boolean proretset boolean pg_catalog pg_proc 5 1 0 false false false false 1 true true false false +prorettype 4 bqt java.lang.Integer prorettype integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false +pronargs 5 bqt java.lang.Short pronargs short pg_catalog pg_proc 6 5 0 false false false false 1 true true true false +proargtypes 2003 bqt java.sql.Array proargtypes integer[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proargnames 2003 bqt java.sql.Array proargnames string[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proargmodes 2003 bqt java.sql.Array proargmodes char[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proallargtypes 2003 bqt java.sql.Array proallargtypes integer[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +pronamespace 4 bqt java.lang.Integer pronamespace integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false Added: trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_void.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_void.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_void.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,15 @@ +integer string boolean integer short integer[] string[] char[] integer[] integer +oid proname proretset prorettype pronargs proargtypes proargnames proargmodes proallargtypes pronamespace +111 VoidProcedure false 2278 2 [1700, 1043] [intNum, stringNum] <null> [1700, 1043] 54 +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +oid 4 bqt java.lang.Integer oid integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false +proname 12 bqt java.lang.String proname string pg_catalog pg_proc 4000 4000 0 false true false false 1 true true false false +proretset -7 bqt java.lang.Boolean proretset boolean pg_catalog pg_proc 5 1 0 false false false false 1 true true false false +prorettype 4 bqt java.lang.Integer prorettype integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false +pronargs 5 bqt java.lang.Short pronargs short pg_catalog pg_proc 6 5 0 false false false false 1 true true true false +proargtypes 2003 bqt java.sql.Array proargtypes integer[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proargnames 2003 bqt java.sql.Array proargnames string[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proargmodes 2003 bqt java.sql.Array proargmodes char[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proallargtypes 2003 bqt java.sql.Array proallargtypes integer[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +pronamespace 4 bqt java.lang.Integer pronamespace integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false Added: trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_with_return.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_with_return.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_with_return.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,15 @@ +integer string boolean integer short integer[] string[] char[] integer[] integer +oid proname proretset prorettype pronargs proargtypes proargnames proargmodes proallargtypes pronamespace +106 ProcedureWithReturn false 20 3 [1700, 1043, 700] [intNum, stringNum, floatNum] <null> [1700, 1043, 700] 54 +Row Count : 1 +getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable +oid 4 bqt java.lang.Integer oid integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false +proname 12 bqt java.lang.String proname string pg_catalog pg_proc 4000 4000 0 false true false false 1 true true false false +proretset -7 bqt java.lang.Boolean proretset boolean pg_catalog pg_proc 5 1 0 false false false false 1 true true false false +prorettype 4 bqt java.lang.Integer prorettype integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false +pronargs 5 bqt java.lang.Short pronargs short pg_catalog pg_proc 6 5 0 false false false false 1 true true true false +proargtypes 2003 bqt java.sql.Array proargtypes integer[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proargnames 2003 bqt java.sql.Array proargnames string[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proargmodes 2003 bqt java.sql.Array proargmodes char[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +proallargtypes 2003 bqt java.sql.Array proallargtypes integer[] pg_catalog pg_proc 2147483647 2147483647 0 false false false false 1 true false false false +pronamespace 4 bqt java.lang.Integer pronamespace integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_with_return_table.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_with_return_table.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCProceduresSchema/test_Pg_Proc_with_return_table.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,6 +1,6 @@ integer string boolean integer short integer[] string[] char[] integer[] integer oid proname proretset prorettype pronargs proargtypes proargnames proargmodes proallargtypes pronamespace -2 ProcedureReturnTable true 2249 2 [1700, 1700] [intNum, bigDecimalNum, col1, col2] [i, i, t, t] [1700, 1700, 1043, 1114] 1 +101 ProcedureReturnTable true 2249 2 [1700, 1700] [intNum, bigDecimalNum, col1, col2] [i, i, t, t] [1700, 1700, 1043, 1114] 54 Row Count : 1 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable oid 4 bqt java.lang.Integer oid integer pg_catalog pg_proc 11 10 0 false false false false 1 true true true 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,260 +1,260 @@ 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> -8 4 <null> <null> -8 5 <null> <null> -8 6 <null> <null> -8 7 <null> <null> -8 8 <null> <null> -8 9 <null> <null> -8 10 <null> <null> -9 1 <null> <null> -9 2 <null> <null> -9 3 <null> <null> -9 4 <null> <null> -9 5 <null> <null> -9 6 <null> <null> -9 7 <null> <null> -9 8 <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> -10 4 <null> <null> -10 5 <null> <null> -10 6 <null> <null> -10 7 <null> <null> -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> -11 4 <null> <null> -11 5 <null> <null> -11 6 <null> <null> -11 7 <null> <null> -11 8 <null> <null> -12 1 <null> <null> -12 2 <null> <null> -12 3 <null> <null> -12 4 <null> <null> -12 5 <null> <null> -13 1 <null> <null> -13 2 <null> <null> -13 3 <null> <null> -13 4 <null> <null> -13 5 <null> <null> -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> -15 4 <null> <null> -15 5 <null> <null> -15 6 <null> <null> -15 7 <null> <null> -15 8 <null> <null> -15 9 <null> <null> -15 10 <null> <null> -15 11 <null> <null> -15 12 <null> <null> -15 13 <null> <null> -18 1 <null> <null> -18 2 <null> <null> -16 1 <null> <null> -16 2 <null> <null> -19 1 <null> <null> -19 2 <null> <null> -19 3 <null> <null> -19 4 <null> <null> -19 5 <null> <null> -20 1 <null> <null> -20 2 <null> <null> -20 3 <null> <null> -20 4 <null> <null> -20 5 <null> <null> -20 6 <null> <null> -20 7 <null> <null> -21 1 <null> <null> -21 2 <null> <null> -22 1 <null> <null> -22 2 <null> <null> -22 3 <null> <null> -22 4 <null> <null> -23 1 <null> <null> -23 2 <null> <null> -23 3 <null> <null> -23 4 <null> <null> -23 5 <null> <null> -23 6 <null> <null> -23 7 <null> <null> -23 8 <null> <null> -23 9 <null> <null> -23 10 <null> <null> -24 1 <null> <null> -24 2 <null> <null> -24 3 <null> <null> -24 4 <null> <null> -24 5 <null> <null> -24 6 <null> <null> -24 7 <null> <null> -24 8 <null> <null> -24 9 <null> <null> -25 1 <null> <null> -25 2 <null> <null> -25 3 <null> <null> -25 4 <null> <null> -25 5 <null> <null> -25 6 <null> <null> -25 7 <null> <null> -25 8 <null> <null> -25 9 <null> <null> -26 1 <null> <null> -26 2 <null> <null> -26 3 <null> <null> -26 4 <null> <null> -26 5 <null> <null> -26 6 <null> <null> -26 7 <null> <null> -26 8 <null> <null> -26 9 <null> <null> -27 1 <null> <null> -27 2 <null> <null> -28 1 <null> <null> -28 2 <null> <null> -28 3 <null> <null> -28 4 <null> <null> -28 5 <null> <null> -28 6 <null> <null> -28 7 <null> <null> -28 8 <null> <null> -28 9 <null> <null> -28 10 <null> <null> -29 1 <null> <null> -29 2 <null> <null> -29 3 <null> <null> -29 4 <null> <null> -29 5 <null> <null> -29 6 <null> <null> -29 7 <null> <null> -29 8 <null> <null> -29 9 <null> <null> -30 1 <null> <null> -30 2 <null> <null> -30 3 <null> <null> -30 4 <null> <null> -30 5 <null> <null> -30 6 <null> <null> -30 7 <null> <null> -30 8 <null> <null> -30 9 <null> <null> -30 10 <null> <null> -30 11 <null> <null> -31 1 <null> <null> -31 2 <null> <null> -31 3 <null> <null> -31 4 <null> <null> +95 1 <null> <null> +95 2 <null> <null> +95 3 <null> <null> +95 4 <null> <null> +95 5 <null> <null> +95 6 <null> <null> +95 7 <null> <null> +95 8 <null> <null> +95 9 <null> <null> +95 10 <null> <null> +95 11 <null> <null> +95 12 <null> <null> +95 13 <null> <null> +95 14 <null> <null> +95 15 <null> <null> +95 16 <null> <null> +95 17 <null> <null> +95 18 <null> <null> +95 19 <null> <null> +95 20 <null> <null> +95 21 <null> <null> +95 22 <null> <null> +95 23 <null> <null> +95 24 <null> <null> +95 25 <null> <null> +95 26 <null> <null> +95 27 <null> <null> +95 28 <null> <null> +95 29 <null> <null> +95 30 <null> <null> +95 31 <null> <null> +127 1 <null> <null> +127 2 <null> <null> +127 3 <null> <null> +127 4 <null> <null> +127 5 <null> <null> +127 6 <null> <null> +127 7 <null> <null> +127 8 <null> <null> +127 9 <null> <null> +127 10 <null> <null> +127 11 <null> <null> +127 12 <null> <null> +127 13 <null> <null> +127 14 <null> <null> +127 15 <null> <null> +127 16 <null> <null> +127 17 <null> <null> +127 18 <null> <null> +127 19 <null> <null> +147 1 <null> <null> +147 2 <null> <null> +147 3 <null> <null> +147 4 <null> <null> +147 5 <null> <null> +147 6 <null> <null> +147 7 <null> <null> +147 8 <null> <null> +147 9 <null> <null> +147 10 <null> <null> +158 1 <null> <null> +158 2 <null> <null> +158 3 <null> <null> +158 4 <null> <null> +158 5 <null> <null> +158 6 <null> <null> +158 7 <null> <null> +158 8 <null> <null> +158 9 <null> <null> +158 10 <null> <null> +158 11 <null> <null> +246 1 <null> <null> +246 2 <null> <null> +246 3 <null> <null> +246 4 <null> <null> +246 5 <null> <null> +246 6 <null> <null> +246 7 <null> <null> +246 8 <null> <null> +246 9 <null> <null> +55 1 <null> <null> +55 2 <null> <null> +55 3 <null> <null> +55 4 <null> <null> +62 1 <null> <null> +62 2 <null> <null> +67 1 <null> <null> +67 2 <null> <null> +72 1 <null> <null> +72 2 <null> <null> +72 3 <null> <null> +72 4 <null> <null> +72 5 <null> <null> +82 1 <null> <null> +82 2 <null> <null> +82 3 <null> <null> +82 4 <null> <null> +170 1 <null> <null> +170 2 <null> <null> +170 3 <null> <null> +170 4 <null> <null> +170 5 <null> <null> +170 6 <null> <null> +170 7 <null> <null> +170 8 <null> <null> +170 9 <null> <null> +170 10 <null> <null> +170 11 <null> <null> +170 12 <null> <null> +170 13 <null> <null> +170 14 <null> <null> +170 15 <null> <null> +170 16 <null> <null> +187 1 <null> <null> +187 2 <null> <null> +187 3 <null> <null> +187 4 <null> <null> +187 5 <null> <null> +187 6 <null> <null> +187 7 <null> <null> +187 8 <null> <null> +196 1 <null> <null> +196 2 <null> <null> +196 3 <null> <null> +196 4 <null> <null> +196 5 <null> <null> +202 1 <null> <null> +202 2 <null> <null> +202 3 <null> <null> +202 4 <null> <null> +202 5 <null> <null> +202 6 <null> <null> +202 7 <null> <null> +202 8 <null> <null> +202 9 <null> <null> +202 10 <null> <null> +202 11 <null> <null> +202 12 <null> <null> +202 13 <null> <null> +202 14 <null> <null> +217 1 <null> <null> +217 2 <null> <null> +217 3 <null> <null> +217 4 <null> <null> +217 5 <null> <null> +217 6 <null> <null> +217 7 <null> <null> +225 1 <null> <null> +225 2 <null> <null> +225 3 <null> <null> +225 4 <null> <null> +225 5 <null> <null> +225 6 <null> <null> +225 7 <null> <null> +225 8 <null> <null> +225 9 <null> <null> +225 10 <null> <null> +225 11 <null> <null> +225 12 <null> <null> +225 13 <null> <null> +256 1 <null> <null> +256 2 <null> <null> +239 1 <null> <null> +239 2 <null> <null> +292 1 <null> <null> +292 2 <null> <null> +292 3 <null> <null> +292 4 <null> <null> +292 5 <null> <null> +304 1 <null> <null> +304 2 <null> <null> +304 3 <null> <null> +304 4 <null> <null> +304 5 <null> <null> +304 6 <null> <null> +304 7 <null> <null> +319 1 <null> <null> +319 2 <null> <null> +322 1 <null> <null> +322 2 <null> <null> +322 3 <null> <null> +322 4 <null> <null> +327 1 <null> <null> +327 2 <null> <null> +327 3 <null> <null> +327 4 <null> <null> +327 5 <null> <null> +327 6 <null> <null> +327 7 <null> <null> +327 8 <null> <null> +327 9 <null> <null> +327 10 <null> <null> +340 1 <null> <null> +340 2 <null> <null> +340 3 <null> <null> +340 4 <null> <null> +340 5 <null> <null> +340 6 <null> <null> +340 7 <null> <null> +340 8 <null> <null> +340 9 <null> <null> +352 1 <null> <null> +352 2 <null> <null> +352 3 <null> <null> +352 4 <null> <null> +352 5 <null> <null> +352 6 <null> <null> +352 7 <null> <null> +352 8 <null> <null> +352 9 <null> <null> +362 1 <null> <null> +362 2 <null> <null> +362 3 <null> <null> +362 4 <null> <null> +362 5 <null> <null> +362 6 <null> <null> +362 7 <null> <null> +362 8 <null> <null> +362 9 <null> <null> +374 1 <null> <null> +374 2 <null> <null> +377 1 <null> <null> +377 2 <null> <null> +377 3 <null> <null> +377 4 <null> <null> +377 5 <null> <null> +377 6 <null> <null> +377 7 <null> <null> +377 8 <null> <null> +377 9 <null> <null> +377 10 <null> <null> +390 1 <null> <null> +390 2 <null> <null> +390 3 <null> <null> +390 4 <null> <null> +390 5 <null> <null> +390 6 <null> <null> +390 7 <null> <null> +390 8 <null> <null> +390 9 <null> <null> +400 1 <null> <null> +400 2 <null> <null> +400 3 <null> <null> +400 4 <null> <null> +400 5 <null> <null> +400 6 <null> <null> +400 7 <null> <null> +400 8 <null> <null> +400 9 <null> <null> +400 10 <null> <null> +400 11 <null> <null> +412 1 <null> <null> +412 2 <null> <null> +412 3 <null> <null> +412 4 <null> <null> Row Count : 255 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable adrelid 4 PartsSupplier java.lang.Integer adrelid integer pg_catalog pg_attrdef 11 10 0 false false false false 1 true true true false 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,279 +1,279 @@ integer integer string integer short short integer boolean boolean boolean oid attrelid attname atttypid attlen attnum atttypmod attnotnull attisdropped atthasdef -1 1 PART_ID 1043 -1 1 8 true false false -2 1 PART_NAME 1043 -1 2 259 false false false -3 1 PART_COLOR 1043 -1 3 34 false false false -4 1 PART_WEIGHT 1043 -1 4 259 false false false -5 2 SHIPPER_ID 21 2 1 4 true false false -6 2 SHIPPER_NAME 1043 -1 2 34 false false false -7 3 STATUS_ID 21 2 1 4 true false false -8 3 STATUS_NAME 1043 -1 2 34 false false false -9 4 SUPPLIER_ID 1043 -1 1 14 true false false -10 4 SUPPLIER_NAME 1043 -1 2 34 false false false -11 4 SUPPLIER_STATUS 21 2 3 4 false false false -12 4 SUPPLIER_CITY 1043 -1 4 34 false false false -13 4 SUPPLIER_STATE 1043 -1 5 6 false false false -14 5 SUPPLIER_ID 1043 -1 1 14 true false false -15 5 PART_ID 1043 -1 2 8 true false false -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 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 -168 19 uid 1043 -1 4 4004 false false false -169 19 typlen 21 2 5 6 false false false -170 20 attrelid 23 4 1 8 false false false -171 20 attnum 21 2 2 6 false false false -172 20 attname 1043 -1 3 4004 false false false -173 20 relname 1043 -1 4 4004 false false false -174 20 nspname 1043 -1 5 4004 false false false -175 20 autoinc 16 1 6 5 false false false -176 20 typoid 23 4 7 8 false false false -177 21 oid 23 4 1 8 false false false -178 21 amname 1043 -1 2 4004 false false false -179 22 adrelid 23 4 1 8 false false false -180 22 adnum 21 2 2 6 false false false -181 22 adbin 1043 -1 3 4004 false false false -182 22 adsrc 1043 -1 4 4004 false false false -183 23 oid 23 4 1 8 false false false -184 23 attrelid 23 4 2 8 false false false -185 23 attname 1043 -1 3 4004 false false false -186 23 atttypid 23 4 4 8 false false false -187 23 attlen 21 2 5 6 false false false -188 23 attnum 21 2 6 6 false false false -189 23 atttypmod 23 4 7 8 false false false -190 23 attnotnull 16 1 8 5 false false false -191 23 attisdropped 16 1 9 5 false false false -192 23 atthasdef 16 1 10 5 false false false -193 24 oid 23 4 1 8 false false false -194 24 relname 1043 -1 2 4004 false false false -195 24 relnamespace 23 4 3 8 false false false -196 24 relkind 1042 1 4 5 false false false -197 24 relam 23 4 5 8 false false false -198 24 reltuples 700 4 6 458759 false false false -199 24 relpages 23 4 7 8 false false false -200 24 relhasrules 16 1 8 5 false false false -201 24 relhasoids 16 1 9 5 false false false -202 25 oid 23 4 1 8 false false false -203 25 datname 1043 -1 2 4004 false false false -204 25 encoding 23 4 3 8 false false false -205 25 datlastsysoid 23 4 4 8 false false false -206 25 datallowconn 1042 1 5 5 false false false -207 25 datconfig 705 -2 6 -2147483645 false false false -208 25 datacl 705 -2 7 -2147483645 false false false -209 25 datdba 23 4 8 8 false false false -210 25 dattablespace 23 4 9 8 false false false -211 26 oid 23 4 1 8 false false false -212 26 indexrelid 23 4 2 8 false false false -213 26 indrelid 23 4 3 8 false false false -214 26 indnatts 21 2 4 6 false false false -215 26 indisclustered 16 1 5 5 false false false -216 26 indisunique 16 1 6 5 false false false -217 26 indisprimary 16 1 7 5 false false false -218 26 indexprs 1043 -1 8 4004 false false false -219 26 indkey 1043 -1 9 4004 false false false -220 27 oid 23 4 1 8 false false false -221 27 nspname 1043 -1 2 4004 false false false -222 28 oid 23 4 1 8 false false false -223 28 proname 1043 -1 2 4004 false false false -224 28 proretset 16 1 3 5 false false false -225 28 prorettype 23 4 4 8 false false false -226 28 pronargs 21 2 5 6 false false false -227 28 proargtypes 705 -2 6 -2147483645 false false false -228 28 proargnames 705 -2 7 -2147483645 false false false -229 28 proargmodes 705 -2 8 -2147483645 false false false -230 28 proallargtypes 705 -2 9 -2147483645 false false false -231 28 pronamespace 23 4 10 8 false false false -232 29 oid 23 4 1 8 false false false -233 29 tgconstrrelid 23 4 2 8 false false false -234 29 tgfoid 23 4 3 8 false false false -235 29 tgargs 23 4 4 8 false false false -236 29 tgnargs 23 4 5 8 false false false -237 29 tgdeferrable 16 1 6 5 false false false -238 29 tginitdeferred 16 1 7 5 false false false -239 29 tgconstrname 1043 -1 8 4004 false false false -240 29 tgrelid 23 4 9 8 false false false -241 30 oid 23 4 1 8 false false false -242 30 typname 1043 -1 2 4004 false false false -243 30 typnamespace 23 4 3 8 false false false -244 30 typlen 21 2 4 6 false false false -245 30 typtype 1042 1 5 5 false false false -246 30 typnotnull 16 1 6 5 false false false -247 30 typbasetype 23 4 7 8 false false false -248 30 typtypmod 23 4 8 8 false false false -249 30 typdelim 1042 1 9 5 false false false -250 30 typrelid 23 4 10 8 false false false -251 30 typelem 23 4 11 8 false false false -252 31 oid 23 4 1 8 false false false -253 31 usename 1043 -1 2 4004 false false false -254 31 usecreatedb 16 1 3 5 false false false -255 31 usesuper 16 1 4 5 false false false -256 32 PART_ID 1043 -1 1 8 true false false -257 33 SHIPPER_ID 21 2 1 4 true false false -258 34 STATUS_ID 21 2 1 4 true false false -259 35 SUPPLIER_ID 1043 -1 1 14 true false false -261 37 SUPPLIER_ID 1043 -1 1 14 true false false -262 37 PART_ID 1043 -1 2 8 true false false -265 40 oid 23 4 1 8 false false false -266 40 name 1043 -1 2 4004 false false false -267 41 typname 1043 -1 1 4004 false false false -268 41 oid 23 4 2 8 false false false -269 42 attname 1043 -1 1 4004 false false false -270 42 relname 1043 -1 2 4004 false false false -271 42 nspname 1043 -1 3 4004 false false false -272 43 attrelid 23 4 1 8 false false false -273 43 attnum 21 2 2 6 false false false -274 44 oid 23 4 1 8 false false false -275 45 oid 23 4 1 8 false false false -276 46 oid 23 4 1 8 false false false -277 47 oid 23 4 1 8 false false false +56 55 PART_ID 1043 -1 1 8 true false false +57 55 PART_NAME 1043 -1 2 259 false false false +58 55 PART_COLOR 1043 -1 3 34 false false false +59 55 PART_WEIGHT 1043 -1 4 259 false false false +61 60 PART_ID 1043 -1 1 8 true false false +63 62 SHIPPER_ID 21 2 1 4 true false false +64 62 SHIPPER_NAME 1043 -1 2 34 false false false +66 65 SHIPPER_ID 21 2 1 4 true false false +68 67 STATUS_ID 21 2 1 4 true false false +69 67 STATUS_NAME 1043 -1 2 34 false false false +71 70 STATUS_ID 21 2 1 4 true false false +73 72 SUPPLIER_ID 1043 -1 1 14 true false false +74 72 SUPPLIER_NAME 1043 -1 2 34 false false false +75 72 SUPPLIER_STATUS 21 2 3 4 false false false +76 72 SUPPLIER_CITY 1043 -1 4 34 false false false +77 72 SUPPLIER_STATE 1043 -1 5 6 false false false +79 78 SUPPLIER_ID 1043 -1 1 14 true false false +83 82 SUPPLIER_ID 1043 -1 1 14 true false false +84 82 PART_ID 1043 -1 2 8 true false false +85 82 QUANTITY 21 2 3 4 false false false +86 82 SHIPPER_ID 21 2 4 4 false false false +88 87 SUPPLIER_ID 1043 -1 1 14 true false false +89 87 PART_ID 1043 -1 2 8 true false false +96 95 VDBName 1043 -1 1 259 true false false +97 95 SchemaName 1043 -1 2 259 false false false +98 95 TableName 1043 -1 3 259 true false false +99 95 Name 1043 -1 4 259 true false false +100 95 Position 23 4 5 8 true false false +101 95 NameInSource 1043 -1 6 259 false false false +102 95 DataType 1043 -1 7 104 true false false +103 95 Scale 23 4 8 8 true false false +104 95 Length 23 4 9 8 true false false +105 95 IsLengthFixed 16 1 10 5 true false false +106 95 SupportsSelect 16 1 11 5 true false false +107 95 SupportsUpdates 16 1 12 5 true false false +108 95 IsCaseSensitive 16 1 13 5 true false false +109 95 IsSigned 16 1 14 5 true false false +110 95 IsCurrency 16 1 15 5 true false false +111 95 IsAutoIncremented 16 1 16 5 true false false +112 95 NullType 1043 -1 17 24 true false false +113 95 MinRange 1043 -1 18 54 false false false +114 95 MaxRange 1043 -1 19 54 false false false +115 95 DistinctCount 23 4 20 8 false false false +116 95 NullCount 23 4 21 8 false false false +117 95 SearchType 1043 -1 22 24 true false false +118 95 Format 1043 -1 23 259 false false false +119 95 DefaultValue 1043 -1 24 259 false false false +120 95 JavaClass 1043 -1 25 504 true false false +121 95 Precision 23 4 26 8 true false false +122 95 CharOctetLength 23 4 27 8 false false false +123 95 Radix 23 4 28 8 true false false +124 95 UID 1043 -1 29 54 true false false +125 95 Description 1043 -1 30 259 false false false +126 95 OID 23 4 31 8 false false false +128 127 Name 1043 -1 1 104 true false false +129 127 IsStandard 16 1 2 5 false false false +130 127 IsPhysical 16 1 3 5 false false false +131 127 TypeName 1043 -1 4 104 true false false +132 127 JavaClass 1043 -1 5 504 true false false +133 127 Scale 23 4 6 8 false false false +134 127 TypeLength 23 4 7 8 true false false +135 127 NullType 1043 -1 8 24 true false false +136 127 IsSigned 16 1 9 5 true false false +137 127 IsAutoIncremented 16 1 10 5 true false false +138 127 IsCaseSensitive 16 1 11 5 true false false +139 127 Precision 23 4 12 8 true false false +140 127 Radix 23 4 13 8 false false false +141 127 SearchType 1043 -1 14 24 true false false +142 127 UID 1043 -1 15 54 true false false +143 127 RuntimeType 1043 -1 16 68 false false false +144 127 BaseType 1043 -1 17 68 false false false +145 127 Description 1043 -1 18 259 false false false +146 127 OID 23 4 19 8 false false false +148 147 VDBName 1043 -1 1 259 true false false +149 147 SchemaName 1043 -1 2 259 false false false +150 147 TableName 1043 -1 3 2052 true false false +151 147 Name 1043 -1 4 259 true false false +152 147 KeyName 1043 -1 5 259 false false false +153 147 KeyType 1043 -1 6 24 true false false +154 147 RefKeyUID 1043 -1 7 54 false false false +155 147 UID 1043 -1 8 54 true false false +156 147 Position 23 4 9 8 false false false +157 147 OID 23 4 10 8 false false false +159 158 VDBName 1043 -1 1 259 true false false +160 158 SchemaName 1043 -1 2 259 false false false +161 158 TableName 1043 -1 3 2052 true false false +162 158 Name 1043 -1 4 259 true false false +163 158 Description 1043 -1 5 259 false false false +164 158 NameInSource 1043 -1 6 259 false false false +165 158 Type 1043 -1 7 24 true false false +166 158 IsIndexed 16 1 8 5 true false false +167 158 RefKeyUID 1043 -1 9 54 false false false +168 158 UID 1043 -1 10 54 true false false +169 158 OID 23 4 11 8 false false false +171 170 VDBName 1043 -1 1 259 true false false +172 170 SchemaName 1043 -1 2 259 false false false +173 170 ProcedureName 1043 -1 3 259 true false false +174 170 Name 1043 -1 4 259 true false false +175 170 DataType 1043 -1 5 29 true false false +176 170 Position 23 4 6 8 true false false +177 170 Type 1043 -1 7 104 true false false +178 170 Optional 16 1 8 5 true false false +179 170 Precision 23 4 9 8 true false false +180 170 TypeLength 23 4 10 8 true false false +181 170 Scale 23 4 11 8 true false false +182 170 Radix 23 4 12 8 true false false +183 170 NullType 1043 -1 13 14 true false false +184 170 UID 1043 -1 14 54 false false false +185 170 Description 1043 -1 15 259 false false false +186 170 OID 23 4 16 8 false false false +188 187 VDBName 1043 -1 1 259 true false false +189 187 SchemaName 1043 -1 2 259 false false false +190 187 Name 1043 -1 3 259 true false false +191 187 NameInSource 1043 -1 4 259 false false false +192 187 ReturnsResults 16 1 5 5 true false false +193 187 UID 1043 -1 6 54 true false false +194 187 Description 1043 -1 7 259 false false false +195 187 OID 23 4 8 8 false false false +197 196 Name 1043 -1 1 259 true false false +198 196 Value 1043 -1 2 259 true false false +199 196 UID 1043 -1 3 54 true false false +200 196 OID 23 4 4 8 false false false +201 196 ClobValue 14939 -1 5 2097156 false false false +203 202 PKTABLE_CAT 1043 -1 1 259 false false false +204 202 PKTABLE_SCHEM 1043 -1 2 259 false false false +205 202 PKTABLE_NAME 1043 -1 3 259 false false false +206 202 PKCOLUMN_NAME 1043 -1 4 259 false false false +207 202 FKTABLE_CAT 1043 -1 5 259 false false false +208 202 FKTABLE_SCHEM 1043 -1 6 259 false false false +209 202 FKTABLE_NAME 1043 -1 7 259 false false false +210 202 FKCOLUMN_NAME 1043 -1 8 259 false false false +211 202 KEY_SEQ 21 2 9 6 false false false +212 202 UPDATE_RULE 23 4 10 8 false false false +213 202 DELETE_RULE 23 4 11 8 false false false +214 202 FK_NAME 1043 -1 12 259 false false false +215 202 PK_NAME 1043 -1 13 259 false false false +216 202 DEFERRABILITY 23 4 14 8 false false false +218 217 VDBName 1043 -1 1 259 false false false +219 217 Name 1043 -1 2 259 false false false +220 217 IsPhysical 16 1 3 5 true false false +221 217 UID 1043 -1 4 54 true false false +222 217 Description 1043 -1 5 259 false false false +223 217 PrimaryMetamodelURI 1043 -1 6 259 true false false +224 217 OID 23 4 7 8 false false false +226 225 VDBName 1043 -1 1 259 false false false +227 225 SchemaName 1043 -1 2 259 false false false +228 225 Name 1043 -1 3 259 true false false +229 225 Type 1043 -1 4 24 true false false +230 225 NameInSource 1043 -1 5 259 false false false +231 225 IsPhysical 16 1 6 5 true false false +232 225 SupportsUpdates 16 1 7 5 true false false +233 225 UID 1043 -1 8 54 true false false +234 225 Cardinality 23 4 9 8 true false false +235 225 Description 1043 -1 10 259 false false false +236 225 IsSystem 16 1 11 5 false false false +237 225 IsMaterialized 16 1 12 5 true false false +238 225 OID 23 4 13 8 false false false +240 239 Name 1043 -1 1 259 true false false +241 239 Version 1043 -1 2 54 true false false +247 246 VDBName 1043 -1 1 259 true false false +248 246 SchemaName 1043 -1 2 259 true false false +249 246 Name 1043 -1 3 259 true false false +250 246 TargetSchemaName 1043 -1 4 259 false false false +251 246 TargetName 1043 -1 5 4004 false false false +252 246 Valid 16 1 6 5 false false false +253 246 LoadState 1043 -1 7 259 false false false +254 246 Updated 1114 8 8 16 false false false +255 246 Cardinality 23 4 9 8 false false false +257 256 resourcePath 1043 -1 1 259 false false false +258 256 contents 14939 -1 2 -2147483645 false false false +293 292 oid 23 4 1 8 false false false +294 292 typname 1043 -1 2 4004 false false false +295 292 name 1043 -1 3 4004 false false false +296 292 uid 1043 -1 4 4004 false false false +297 292 typlen 21 2 5 6 false false false +299 298 oid 23 4 1 8 false false false +300 298 name 1043 -1 2 4004 false false false +302 301 typname 1043 -1 1 4004 false false false +303 301 oid 23 4 2 8 false false false +305 304 attrelid 23 4 1 8 false false false +306 304 attnum 21 2 2 6 false false false +307 304 attname 1043 -1 3 4004 false false false +308 304 relname 1043 -1 4 4004 false false false +309 304 nspname 1043 -1 5 4004 false false false +310 304 autoinc 16 1 6 5 false false false +311 304 typoid 23 4 7 8 false false false +313 312 attname 1043 -1 1 4004 false false false +314 312 relname 1043 -1 2 4004 false false false +315 312 nspname 1043 -1 3 4004 false false false +317 316 attrelid 23 4 1 8 false false false +318 316 attnum 21 2 2 6 false false false +320 319 oid 23 4 1 8 false false false +321 319 amname 1043 -1 2 4004 false false false +323 322 adrelid 23 4 1 8 false false false +324 322 adnum 21 2 2 6 false false false +325 322 adbin 1043 -1 3 4004 false false false +326 322 adsrc 1043 -1 4 4004 false false false +328 327 oid 23 4 1 8 false false false +329 327 attrelid 23 4 2 8 false false false +330 327 attname 1043 -1 3 4004 false false false +331 327 atttypid 23 4 4 8 false false false +332 327 attlen 21 2 5 6 false false false +333 327 attnum 21 2 6 6 false false false +334 327 atttypmod 23 4 7 8 false false false +335 327 attnotnull 16 1 8 5 false false false +336 327 attisdropped 16 1 9 5 false false false +337 327 atthasdef 16 1 10 5 false false false +339 338 oid 23 4 1 8 false false false +341 340 oid 23 4 1 8 false false false +342 340 relname 1043 -1 2 4004 false false false +343 340 relnamespace 23 4 3 8 false false false +344 340 relkind 1042 1 4 5 false false false +345 340 relam 23 4 5 8 false false false +346 340 reltuples 700 4 6 458759 false false false +347 340 relpages 23 4 7 8 false false false +348 340 relhasrules 16 1 8 5 false false false +349 340 relhasoids 16 1 9 5 false false false +351 350 oid 23 4 1 8 false false false +353 352 oid 23 4 1 8 false false false +354 352 datname 1043 -1 2 4004 false false false +355 352 encoding 23 4 3 8 false false false +356 352 datlastsysoid 23 4 4 8 false false false +357 352 datallowconn 1042 1 5 5 false false false +358 352 datconfig 705 -2 6 -2147483645 false false false +359 352 datacl 705 -2 7 -2147483645 false false false +360 352 datdba 23 4 8 8 false false false +361 352 dattablespace 23 4 9 8 false false false +363 362 oid 23 4 1 8 false false false +364 362 indexrelid 23 4 2 8 false false false +365 362 indrelid 23 4 3 8 false false false +366 362 indnatts 21 2 4 6 false false false +367 362 indisclustered 16 1 5 5 false false false +368 362 indisunique 16 1 6 5 false false false +369 362 indisprimary 16 1 7 5 false false false +370 362 indexprs 1043 -1 8 4004 false false false +371 362 indkey 1043 -1 9 4004 false false false +373 372 oid 23 4 1 8 false false false +375 374 oid 23 4 1 8 false false false +376 374 nspname 1043 -1 2 4004 false false false +378 377 oid 23 4 1 8 false false false +379 377 proname 1043 -1 2 4004 false false false +380 377 proretset 16 1 3 5 false false false +381 377 prorettype 23 4 4 8 false false false +382 377 pronargs 21 2 5 6 false false false +383 377 proargtypes 705 -2 6 -2147483645 false false false +384 377 proargnames 705 -2 7 -2147483645 false false false +385 377 proargmodes 705 -2 8 -2147483645 false false false +386 377 proallargtypes 705 -2 9 -2147483645 false false false +387 377 pronamespace 23 4 10 8 false false false +389 388 oid 23 4 1 8 false false false +391 390 oid 23 4 1 8 false false false +392 390 tgconstrrelid 23 4 2 8 false false false +393 390 tgfoid 23 4 3 8 false false false +394 390 tgargs 23 4 4 8 false false false +395 390 tgnargs 23 4 5 8 false false false +396 390 tgdeferrable 16 1 6 5 false false false +397 390 tginitdeferred 16 1 7 5 false false false +398 390 tgconstrname 1043 -1 8 4004 false false false +399 390 tgrelid 23 4 9 8 false false false +401 400 oid 23 4 1 8 false false false +402 400 typname 1043 -1 2 4004 false false false +403 400 typnamespace 23 4 3 8 false false false +404 400 typlen 21 2 4 6 false false false +405 400 typtype 1042 1 5 5 false false false +406 400 typnotnull 16 1 6 5 false false false +407 400 typbasetype 23 4 7 8 false false false +408 400 typtypmod 23 4 8 8 false false false +409 400 typdelim 1042 1 9 5 false false false +410 400 typrelid 23 4 10 8 false false false +411 400 typelem 23 4 11 8 false false false +413 412 oid 23 4 1 8 false false false +414 412 usename 1043 -1 2 4004 false false false +415 412 usecreatedb 16 1 3 5 false false false +416 412 usesuper 16 1 4 5 false false false Row Count : 274 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_attribute 11 10 0 false false false false 1 true true true 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,49 +1,49 @@ integer string integer char integer float integer boolean boolean oid relname relnamespace relkind relam reltuples relpages relhasrules relhasoids -1 PARTSSUPPLIER.PARTS 1 r 0 0.0 0 false false -2 PARTSSUPPLIER.SHIP_VIA 1 r 0 0.0 0 false false -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 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 -22 pg_attrdef 4 v 0 0.0 0 false false -23 pg_attribute 4 v 0 0.0 0 false false -24 pg_class 4 v 0 0.0 0 false false -25 pg_database 4 v 0 0.0 0 false false -26 pg_index 4 v 0 0.0 0 false false -27 pg_namespace 4 v 0 0.0 0 false false -28 pg_proc 4 v 0 0.0 0 false false -29 pg_trigger 4 v 0 0.0 0 false false -30 pg_type 4 v 0 0.0 0 false false -31 pg_user 4 v 0 0.0 0 false false -32 PK_PARTS 1 i 0 0.0 0 false false -33 PK_SHIP_VIA 1 i 0 0.0 0 false false -34 PK_STATUS 1 i 0 0.0 0 false false -35 PK_SUPPLIER 1 i 0 0.0 0 false false -37 PK_SUPPLIER_PARTS 1 i 0 0.0 0 false false -40 matpg_datatype_names 4 i 0 0.0 0 false false -41 matpg_datatype_ids 4 i 0 0.0 0 false false -42 pk_matpg_relatt_names 4 i 0 0.0 0 false false -43 idx_matpg_relatt_ids 4 i 0 0.0 0 false false -44 pk_pg_attr 4 i 0 0.0 0 false false -45 pk_pg_class 4 i 0 0.0 0 false false -46 pk_pg_index 4 i 0 0.0 0 false false -47 pk_pg_proc 4 i 0 0.0 0 false false +55 PARTSSUPPLIER.PARTS 54 r 0 0.0 0 false false +60 PK_PARTS 54 i 0 0.0 0 false false +62 PARTSSUPPLIER.SHIP_VIA 54 r 0 0.0 0 false false +65 PK_SHIP_VIA 54 i 0 0.0 0 false false +67 PARTSSUPPLIER.STATUS 54 r 0 0.0 0 false false +70 PK_STATUS 54 i 0 0.0 0 false false +72 PARTSSUPPLIER.SUPPLIER 54 r 0 0.0 0 false false +78 PK_SUPPLIER 54 i 0 0.0 0 false false +82 PARTSSUPPLIER.SUPPLIER_PARTS 54 r 0 0.0 0 false false +87 PK_SUPPLIER_PARTS 54 i 0 0.0 0 false false +95 Columns 94 r 0 0.0 0 false false +127 DataTypes 94 r 0 0.0 0 false false +147 KeyColumns 94 r 0 0.0 0 false false +158 Keys 94 r 0 0.0 0 false false +170 ProcedureParams 94 r 0 0.0 0 false false +187 Procedures 94 r 0 0.0 0 false false +196 Properties 94 r 0 0.0 0 false false +202 ReferenceKeyColumns 94 r 0 0.0 0 false false +217 Schemas 94 r 0 0.0 0 false false +225 Tables 94 r 0 0.0 0 false false +239 VirtualDatabases 94 r 0 0.0 0 false false +246 MatViews 245 r 0 0.0 0 false false +256 VDBResources 245 r 0 0.0 0 false false +292 matpg_datatype 291 v 0 0.0 0 false false +298 matpg_datatype_names 291 i 0 0.0 0 false false +301 matpg_datatype_ids 291 i 0 0.0 0 false false +304 matpg_relatt 291 v 0 0.0 0 false false +312 pk_matpg_relatt_names 291 i 0 0.0 0 false false +316 idx_matpg_relatt_ids 291 i 0 0.0 0 false false +319 pg_am 291 v 0 0.0 0 false false +322 pg_attrdef 291 v 0 0.0 0 false false +327 pg_attribute 291 v 0 0.0 0 false false +338 pk_pg_attr 291 i 0 0.0 0 false false +340 pg_class 291 v 0 0.0 0 false false +350 pk_pg_class 291 i 0 0.0 0 false false +352 pg_database 291 v 0 0.0 0 false false +362 pg_index 291 v 0 0.0 0 false false +372 pk_pg_index 291 i 0 0.0 0 false false +374 pg_namespace 291 v 0 0.0 0 false false +377 pg_proc 291 v 0 0.0 0 false false +388 pk_pg_proc 291 i 0 0.0 0 false false +390 pg_trigger 291 v 0 0.0 0 false false +400 pg_type 291 v 0 0.0 0 false false +412 pg_user 291 v 0 0.0 0 false false Row Count : 44 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_class 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,21 +1,21 @@ integer integer integer short boolean boolean boolean string short[] oid indexrelid indrelid indnatts indisclustered indisunique indisprimary indexprs indkey -1 32 1 1 false true true [1] -2 33 2 1 false true true [1] -3 34 3 1 false true true [1] -4 35 4 1 false true true [1] -5 36 4 1 false false false [3] -6 37 5 2 false true true [1, 2] -7 38 5 1 false false false [2] -8 39 5 1 false false false [1] -9 40 19 2 false true true [1, 3] -10 41 19 2 false false false [2, 1] -11 42 20 3 false true true [3, 4, 5] -12 43 20 2 false false false [1, 2] -13 44 23 1 false true true [1] -14 45 24 1 false true true [1] -15 46 26 1 false true true [1] -16 47 28 1 false true true [1] +60 60 55 1 false true true [1] +65 65 62 1 false true true [1] +70 70 67 1 false true true [1] +78 78 72 1 false true true [1] +80 80 72 1 false false false [3] +87 87 82 2 false true true [1, 2] +90 90 82 1 false false false [2] +92 92 82 1 false false false [1] +298 298 292 2 false true true [1, 3] +301 301 292 2 false false false [2, 1] +312 312 304 3 false true true [3, 4, 5] +316 316 304 2 false false false [1, 2] +338 338 327 1 false true true [1] +350 350 340 1 false true true [1] +372 372 362 1 false true true [1] +388 388 377 1 false true true [1] Row Count : 16 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_index 11 10 0 false false false false 1 true true true 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,9 +1,9 @@ integer string oid nspname -1 PartsSupplier -2 SYS -3 SYSADMIN -4 pg_catalog +54 PartsSupplier +291 pg_catalog +94 SYS +245 SYSADMIN Row Count : 4 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_namespace 11 10 0 false false false false 1 true true true false 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,42 +1,42 @@ integer string integer short char boolean integer integer char integer integer oid typname typnamespace typlen typtype typnotnull typbasetype typtypmod typdelim typrelid typelem -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 -22 int2vector 2 -1 b false 0 -1 , 0 0 +16 boolean 94 1 b false 0 -1 , 0 0 +1043 string 94 -1 b false 0 -1 , 0 0 +25 text 94 -1 b false 0 -1 , 0 0 +1042 char 94 1 b false 0 -1 , 0 0 +21 short 94 2 b false 0 -1 , 0 0 +20 long 94 8 b false 0 -1 , 0 0 +23 integer 94 4 b false 0 -1 , 0 0 +26 oid 94 4 b false 0 -1 , 0 0 +700 float 94 4 b false 0 -1 , 0 0 +701 double 94 8 b false 0 -1 , 0 0 +705 unknown 94 -2 b false 0 -1 , 0 0 +1082 date 94 4 b false 0 -1 , 0 0 +1083 datetime 94 8 b false 0 -1 , 0 0 +1114 timestamp 94 8 b false 0 -1 , 0 0 +1700 decimal 94 -1 b false 0 -1 , 0 0 +142 xml 94 -1 b false 0 -1 , 0 0 +14939 lo 94 -1 b false 0 -1 , 0 0 +2278 void 94 4 p false 0 -1 , 0 0 +2249 record 94 -1 p false 0 -1 , 0 0 +30 oidvector 94 -1 b false 0 -1 , 0 26 +1000 _bool 94 -1 b false 0 -1 , 0 16 +1002 _char 94 -1 b false 0 -1 , 0 18 +1005 _int2 94 -1 b false 0 -1 , 0 21 +1007 _int4 94 -1 b false 0 -1 , 0 23 +1009 _text 94 -1 b false 0 -1 , 0 25 +1028 _oid 94 -1 b false 0 -1 , 0 26 +1014 _bpchar 94 -1 b false 0 -1 , 0 1042 +1015 _varchar 94 -1 b false 0 -1 , 0 1043 +1016 _int8 94 -1 b false 0 -1 , 0 20 +1021 _float4 94 -1 b false 0 -1 , 0 700 +1022 _float8 94 -1 b false 0 -1 , 0 701 +1115 _timestamp 94 -1 b false 0 -1 , 0 1114 +1182 _date 94 -1 b false 0 -1 , 0 1082 +1183 _time 94 -1 b false 0 -1 , 0 1083 +2287 _record 94 -1 b false 0 -1 , 0 2249 +2283 anyelement 94 4 p false 0 -1 , 0 0 +22 int2vector 94 -1 b false 0 -1 , 0 0 Row Count : 37 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/testPgProc.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,12 +1,12 @@ int4 varchar bool int4 int2 oidvector _text _char _oid int4 oid proname proretset prorettype pronargs proargtypes proargnames proargmodes proallargtypes pronamespace -2 isLoggable false 16 2 1043 1043 {"level","context"} <null> <null> 3 -3 logMsg false 16 3 1043 1043 2$ {"level","context","msg"} <null> {1043,1043,228$ 3 -4 refreshMatView false 23 2 1043 16 {"ViewName","Invalidate"} <null> {1043,16} 3 -5 refreshMatViewRow false 23 2 1043 2283 {"ViewName","Key"} <null> {1043,2283} 3 -6 setColumnStats false 2278 6 1043 1043 2$ {"tableName","columnName","distinctCount","nullCount","max","min"$ <null> {1043,1043,23,$ 3 -7 setProperty false 14939 3 1043 1043 1$ {"UID","Name","Value"} <null> {1043,1043,149$ 3 -8 setTableStats false 2278 2 1043 23 {"tableName","cardinality"} <null> {1043,23} 3 +259 isLoggable false 2278 2 1043 1043 {"level","context"} <null> <null> 245 +263 logMsg false 2278 3 1043 1043 2$ {"level","context","msg"} <null> {1043,1043,228$ 245 +268 refreshMatView false 2278 2 1043 16 {"ViewName","Invalidate"} <null> {1043,16} 245 +272 refreshMatViewRow false 2278 2 1043 2283 {"ViewName","Key"} <null> {1043,2283} 245 +276 setColumnStats false 2278 6 1043 1043 2$ {"tableName","columnName","distinctCount","nullCount","max","min"$ <null> {1043,1043,23,$ 245 +283 setProperty false 2278 3 1043 1043 1$ {"UID","Name","Value"} <null> {1043,1043,149$ 245 +288 setTableStats false 2278 2 1043 23 {"tableName","cardinality"} <null> {1043,23} 245 Row Count : 7 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable oid 4 java.lang.Integer oid int4 11 10 0 false false false false 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,36 +1,36 @@ 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 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 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-00000069 -1 <null> true true 19 -parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true 20 -parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false 21 -parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false 22 -parts pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true 23 -parts pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true 24 -parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false 25 -parts pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true 26 -parts pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false 27 -parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true 28 -parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false 29 -parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true 30 -parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false 31 +parts SYS Columns Table <null> true false tid:2cb59cfd55db-9bd42fbd-00000001 -1 <null> true false <null> +parts SYS DataTypes Table <null> true false tid:2cb59cfd55db-6130d2cf-00000021 -1 <null> true false <null> +parts SYS KeyColumns Table <null> true false tid:2cb59cfd55db-c5c6549e-00000035 -1 <null> true false <null> +parts SYS Keys Table <null> true false tid:2cb59cfd55db-0023a214-00000040 -1 <null> true false <null> +parts SYSADMIN MatViews Table <null> true false tid:60b87e792634-14d6450e-00000001 -1 <null> true false <null> +parts PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false <null> +parts PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false <null> +parts SYS ProcedureParams Table <null> true false tid:2cb59cfd55db-ab347619-0000004c -1 <null> true false <null> +parts SYS Procedures Table <null> true false tid:2cb59cfd55db-8f29b420-0000005d -1 <null> true false <null> +parts SYS Properties Table <null> true false tid:2cb59cfd55db-3f9f6953-00000066 -1 <null> true false <null> +parts SYS ReferenceKeyColumns Table <null> true false tid:2cb59cfd55db-aa92fa09-0000006c -1 <null> true false <null> +parts SYS Schemas Table <null> true false tid:2cb59cfd55db-d57e16d2-0000007b -1 <null> true false <null> +parts SYS Tables Table <null> true false tid:2cb59cfd55db-94dc2a85-00000083 -1 <null> true false <null> +parts SYSADMIN VDBResources Table <null> true false tid:60b87e792634-1e9b1131-0000000b -1 <null> true false <null> +parts SYS VirtualDatabases Table <null> true false tid:2cb59cfd55db-a9e11fad-00000091 -1 <null> true false <null> +parts pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000069 -1 <null> true true <null> +parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true <null> +parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false <null> +parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false <null> +parts pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true <null> +parts pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true <null> +parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false <null> +parts pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true <null> +parts pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false <null> +parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true <null> +parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false <null> +parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true <null> +parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false <null> 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 java.lang.String vdbname varchar 255 255 0 false true false false 1 false true false true @@ -45,4 +45,4 @@ description 12 java.lang.String description varchar 255 255 0 false true false false 1 false true false true issystem -7 java.lang.Boolean issystem bool 1 1 0 false false false false 1 false true false true ismaterialized -7 java.lang.Boolean ismaterialized bool 1 1 0 false false false false 0 false true false true -oid 4 java.lang.Integer oid int4 11 10 0 false false false false 0 false true true true +oid 4 java.lang.Integer oid int4 11 10 0 false false false false 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -30,7 +30,7 @@ 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 Columns OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 31 YES <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 @@ -49,7 +49,7 @@ 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 DataTypes OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 19 YES <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 @@ -59,7 +59,7 @@ 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 KeyColumns OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 10 YES <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 @@ -70,7 +70,7 @@ 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 SYS Keys OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 11 YES <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 @@ -112,7 +112,7 @@ 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 ProcedureParams OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 16 YES <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 @@ -120,11 +120,11 @@ 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 Procedures OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 8 YES <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 OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 4 YES <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 @@ -146,7 +146,7 @@ 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 Schemas OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 7 YES <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 @@ -159,7 +159,7 @@ 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> 0 13 NO <null> <null> <null> ! <null> NO +PartsSupplier SYS Tables OID 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 13 YES <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 Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,260 +1,260 @@ 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 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 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 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 -PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID 1 STATUS_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:201d9600-73ff-! 1edc-a81c-ecf397b10590 <null> 7 -PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_NAME 2 STATUS_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:201d9601-73ff-! 1edc-a81c-ecf397b10590 <null> 8 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_CITY 4 SUPPLIER_CITY 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:2fe92a40-73ff-! 1edc-a81c-ecf397b10590 <null> 12 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID 1 SUPPLIER_ID string 0 10 false true true true true false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 10 10 mmuuid:2f044880-73ff-! 1edc-a81c-ecf397b10590 <null> 9 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID 1 SUPPLIER_ID string 0 10 false true true true true false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 10 10 mmuuid:3ecfdcc0-73ff-! 1edc-a81c-ecf397b10590 <null> 14 -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 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! 89d5-0000004e <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! b854-0000004d <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! c502-0000004c <null> 179 -PartsSupplier pg_catalog pg_attrdef adsrc 4 <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! cab2-0000004f <null> 182 -PartsSupplier pg_catalog pg_am amname 2 <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-a44d! 2701-00000034 <null> 178 -PartsSupplier pg_catalog pg_attribute atthasdef 10 <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-8b55! 8751-00000019 <null> 192 -PartsSupplier pg_catalog pg_attribute attisdropped 9 <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-9c40! 981a-00000018 <null> 191 -PartsSupplier pg_catalog pg_attribute attlen 5 <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-4826! ae19-00000014 <null> 187 -PartsSupplier pg_catalog matpg_relatt attname 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-81f4! e352-00000062 <null> 172 -PartsSupplier pg_catalog pg_attribute attname 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-73cc! 52f1-00000012 <null> 185 -PartsSupplier pg_catalog pg_attribute attnotnull 8 <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-ebd3! e35e-00000017 <null> 190 -PartsSupplier pg_catalog matpg_relatt attnum 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-564f! 47eb-00000061 <null> 171 -PartsSupplier pg_catalog pg_attribute attnum 6 <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-4826! b78a-00000015 <null> 188 -PartsSupplier pg_catalog matpg_relatt attrelid 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-cb3d! 2c19-00000060 <null> 170 -PartsSupplier pg_catalog pg_attribute attrelid 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-bd14! 9bb8-00000011 <null> 184 -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! 4e75-00000065 <null> 175 -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! 352a-00000057 <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! 97d5-00000055 <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! 3530-00000056 <null> 207 -PartsSupplier pg_catalog pg_database datdba 8 <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-dad6! 4043-00000058 <null> 209 -PartsSupplier pg_catalog pg_database datlastsysoid 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-6243! d861-00000054 <null> 205 -PartsSupplier pg_catalog pg_database datname 2 <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-80af! d639-00000052 <null> 203 -PartsSupplier pg_catalog pg_database dattablespace 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:7ff2755e9621-5f2f! 9466-00000059 <null> 210 -PartsSupplier pg_catalog pg_database encoding 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-90a3! a8ea-00000053 <null> 204 -PartsSupplier pg_catalog pg_index indexprs 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-3c90! 62a5-0000002f <null> 218 -PartsSupplier pg_catalog pg_index indexrelid 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-6368! efe8-00000029 <null> 212 -PartsSupplier pg_catalog pg_index indisclustered 5 <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-47ce! 22f6-0000002c <null> 215 -PartsSupplier pg_catalog pg_index indisprimary 7 <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-2c22! f29f-0000002e <null> 217 -PartsSupplier pg_catalog pg_index indisunique 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-56a1! 3c60-0000002d <null> 216 -PartsSupplier pg_catalog pg_index indkey 9 <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-ef45! 6826-00000030 <null> 219 -PartsSupplier pg_catalog pg_index indnatts 4 <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-3d04! d0e7-0000002b <null> 214 -PartsSupplier pg_catalog pg_index indrelid 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-3d3e! e0fb-0000002a <null> 213 -PartsSupplier pg_catalog matpg_datatype name 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-9edf! 60d6-0000006c <null> 167 -PartsSupplier pg_catalog matpg_relatt nspname 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:7ff2755e9621-2fb8! aefc-00000064 <null> 174 -PartsSupplier pg_catalog pg_namespace nspname 2 <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-e055! 7576-00000003 <null> 221 -PartsSupplier pg_catalog matpg_datatype oid 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-9ead! 9415-0000006a <null> 165 -PartsSupplier pg_catalog pg_am oid 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-f895! 4414-00000033 <null> 177 -PartsSupplier pg_catalog pg_attribute oid 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-9c09! 440f-00000010 <null> 183 -PartsSupplier pg_catalog pg_class oid 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-7f51! b3be-00000005 <null> 193 -PartsSupplier pg_catalog pg_database oid 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-2aa6! 2961-00000051 <null> 202 -PartsSupplier pg_catalog pg_index oid 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-35dd! 0fd0-00000028 <null> 211 -PartsSupplier pg_catalog pg_namespace oid 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-5ace! 9aea-00000002 <null> 220 -PartsSupplier pg_catalog pg_proc oid 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-eef9! adf0-00000036 <null> 222 -PartsSupplier pg_catalog pg_trigger oid 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-d272! 8afc-00000042 <null> 232 -PartsSupplier pg_catalog pg_type oid 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-b1cd! f706-0000001c <null> 241 -PartsSupplier pg_catalog pg_user oid 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-a354! 92dc-0000005b <null> 252 -PartsSupplier pg_catalog pg_proc proallargtypes 9 <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-f418! fbdd-0000003e <null> 230 -PartsSupplier pg_catalog pg_proc proargmodes 8 <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-c636! 3c6d-0000003d <null> 229 -PartsSupplier pg_catalog pg_proc proargnames 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-c63e! 1885-0000003c <null> 228 -PartsSupplier pg_catalog pg_proc proargtypes 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-c69d! 99b6-0000003b <null> 227 -PartsSupplier pg_catalog pg_proc proname 2 <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-dc8a! 0ede-00000037 <null> 223 -PartsSupplier pg_catalog pg_proc pronamespace 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:7ff2755e9621-d103! 5574-0000003f <null> 231 -PartsSupplier pg_catalog pg_proc pronargs 5 <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-b3a7! dbe4-0000003a <null> 226 -PartsSupplier pg_catalog pg_proc proretset 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:7ff2755e9621-c750! 7134-00000038 <null> 224 -PartsSupplier pg_catalog pg_proc prorettype 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-21ae! 7034-00000039 <null> 225 -PartsSupplier pg_catalog pg_class relam 5 <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-85c6! 0879-00000009 <null> 197 -PartsSupplier pg_catalog pg_class relhasoids 9 <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-c399! e0be-0000000d <null> 201 -PartsSupplier pg_catalog pg_class relhasrules 8 <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-c471! 5c2a-0000000c <null> 200 -PartsSupplier pg_catalog pg_class relkind 4 <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-c054! 05a1-00000008 <null> 196 -PartsSupplier pg_catalog matpg_relatt relname 4 <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-eb35! 654a-00000063 <null> 173 -PartsSupplier pg_catalog pg_class relname 2 <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-c055! 4498-00000006 <null> 194 -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 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! 4b02-00000045 <null> 235 -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! 985f-00000049 <null> 239 -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! b444-00000043 <null> 233 -PartsSupplier pg_catalog pg_trigger tgdeferrable 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-2e2d! 787f-00000047 <null> 237 -PartsSupplier pg_catalog pg_trigger tgfoid 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-9e3e! 85c9-00000044 <null> 234 -PartsSupplier pg_catalog pg_trigger tginitdeferred 7 <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-cb89! 3414-00000048 <null> 238 -PartsSupplier pg_catalog pg_trigger tgnargs 5 <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-80c2! c8ea-00000046 <null> 236 -PartsSupplier pg_catalog pg_trigger tgrelid 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:7ff2755e9621-80fc! e213-0000004a <null> 240 -PartsSupplier pg_catalog pg_type typbasetype 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-1787! 1652-00000022 <null> 247 -PartsSupplier pg_catalog pg_type typdelim 9 <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-8976! 2000-00000024 <null> 249 -PartsSupplier pg_catalog pg_type typelem 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:7ff2755e9621-7ef3! 59d6-00000026 <null> 251 -PartsSupplier pg_catalog matpg_datatype typlen 5 <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-6b7b! b5f5-0000006e <null> 169 -PartsSupplier pg_catalog pg_type typlen 4 <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-7e9c! 18e6-0000001f <null> 244 -PartsSupplier pg_catalog matpg_datatype typname 2 <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-6bd6! e5e1-0000006b <null> 166 -PartsSupplier pg_catalog pg_type typname 2 <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-7ef7! 48d2-0000001d <null> 242 -PartsSupplier pg_catalog pg_type typnamespace 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-b928! 886c-0000001e <null> 243 -PartsSupplier pg_catalog pg_type typnotnull 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-68dd! 732b-00000021 <null> 246 -PartsSupplier pg_catalog matpg_relatt typoid 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-7700! 0205-00000066 <null> 176 -PartsSupplier pg_catalog pg_type typrelid 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:7ff2755e9621-8a3b! 6905-00000025 <null> 250 -PartsSupplier pg_catalog pg_type typtype 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-7efa! 5d81-00000020 <null> 245 -PartsSupplier pg_catalog pg_type typtypmod 8 <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-ebc6! 8c1e-00000023 <null> 248 -PartsSupplier pg_catalog matpg_datatype uid 4 <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-9ead! aa9b-0000006d <null> 168 -PartsSupplier pg_catalog pg_user usecreatedb 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:7ff2755e9621-5857! 9213-0000005d <null> 254 -PartsSupplier pg_catalog pg_user usename 2 <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-9a8c! 09a4-0000005c <null> 253 -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! eb66-0000005e <null> 255 +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +PartsSupplier SYS Columns OID 31 <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-f9cb! 44e3-00000020 <null> <null> +PartsSupplier SYS DataTypes OID 19 <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-8368! 20df-00000034 <null> <null> +PartsSupplier SYS KeyColumns OID 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-4776! a863-0000003f <null> <null> +PartsSupplier SYS Keys OID 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-885c! cb4e-0000004b <null> <null> +PartsSupplier SYS ProcedureParams OID 16 <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-b904! 416f-0000005c <null> <null> +PartsSupplier SYS Procedures OID 8 <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-3ee7! e90b-00000065 <null> <null> +PartsSupplier SYS Properties OID 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:2cb59cfd55db-0ad0! bcb6-0000006a <null> <null> +PartsSupplier SYS Schemas OID 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:2cb59cfd55db-bd15! 0f9c-00000082 <null> <null> +PartsSupplier SYS Tables OID 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-b8dc! ed60-00000090 <null> <null> +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> <null> +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> <null> +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> <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID 2 PART_ID string 0 4 true true true true true false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 4 10 mmuuid:3fc400c0-73ff-! 1edc-a81c-ecf397b10590 <null> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_ID 1 SHIPPER_ID short 0 0 true true true false true false false No Nulls <null> <null> -1 -1 All Except Like <null> <null> java.lang.Short 2 0 10 mmuuid:121bc540-73ff-! 1edc-a81c-ecf397b10590 <null> <null> +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> <null> +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> <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID 1 STATUS_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:201d9600-73ff-! 1edc-a81c-ecf397b10590 <null> <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_NAME 2 STATUS_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:201d9601-73ff-! 1edc-a81c-ecf397b10590 <null> <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_CITY 4 SUPPLIER_CITY 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:2fe92a40-73ff-! 1edc-a81c-ecf397b10590 <null> <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID 1 SUPPLIER_ID string 0 10 false true true true true false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 10 10 mmuuid:2f044880-73ff-! 1edc-a81c-ecf397b10590 <null> <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID 1 SUPPLIER_ID string 0 10 false true true true true false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 10 10 mmuuid:3ecfdcc0-73ff-! 1edc-a81c-ecf397b10590 <null> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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! 89d5-0000004e <null> <null> +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! b854-0000004d <null> <null> +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! c502-0000004c <null> <null> +PartsSupplier pg_catalog pg_attrdef adsrc 4 <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! cab2-0000004f <null> <null> +PartsSupplier pg_catalog pg_am amname 2 <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-a44d! 2701-00000034 <null> <null> +PartsSupplier pg_catalog pg_attribute atthasdef 10 <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-8b55! 8751-00000019 <null> <null> +PartsSupplier pg_catalog pg_attribute attisdropped 9 <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-9c40! 981a-00000018 <null> <null> +PartsSupplier pg_catalog pg_attribute attlen 5 <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-4826! ae19-00000014 <null> <null> +PartsSupplier pg_catalog matpg_relatt attname 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-81f4! e352-00000062 <null> <null> +PartsSupplier pg_catalog pg_attribute attname 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-73cc! 52f1-00000012 <null> <null> +PartsSupplier pg_catalog pg_attribute attnotnull 8 <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-ebd3! e35e-00000017 <null> <null> +PartsSupplier pg_catalog matpg_relatt attnum 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-564f! 47eb-00000061 <null> <null> +PartsSupplier pg_catalog pg_attribute attnum 6 <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-4826! b78a-00000015 <null> <null> +PartsSupplier pg_catalog matpg_relatt attrelid 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-cb3d! 2c19-00000060 <null> <null> +PartsSupplier pg_catalog pg_attribute attrelid 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-bd14! 9bb8-00000011 <null> <null> +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> <null> +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> <null> +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! 4e75-00000065 <null> <null> +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> <null> +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! 352a-00000057 <null> <null> +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! 97d5-00000055 <null> <null> +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! 3530-00000056 <null> <null> +PartsSupplier pg_catalog pg_database datdba 8 <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-dad6! 4043-00000058 <null> <null> +PartsSupplier pg_catalog pg_database datlastsysoid 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-6243! d861-00000054 <null> <null> +PartsSupplier pg_catalog pg_database datname 2 <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-80af! d639-00000052 <null> <null> +PartsSupplier pg_catalog pg_database dattablespace 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:7ff2755e9621-5f2f! 9466-00000059 <null> <null> +PartsSupplier pg_catalog pg_database encoding 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-90a3! a8ea-00000053 <null> <null> +PartsSupplier pg_catalog pg_index indexprs 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-3c90! 62a5-0000002f <null> <null> +PartsSupplier pg_catalog pg_index indexrelid 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-6368! efe8-00000029 <null> <null> +PartsSupplier pg_catalog pg_index indisclustered 5 <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-47ce! 22f6-0000002c <null> <null> +PartsSupplier pg_catalog pg_index indisprimary 7 <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-2c22! f29f-0000002e <null> <null> +PartsSupplier pg_catalog pg_index indisunique 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-56a1! 3c60-0000002d <null> <null> +PartsSupplier pg_catalog pg_index indkey 9 <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-ef45! 6826-00000030 <null> <null> +PartsSupplier pg_catalog pg_index indnatts 4 <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-3d04! d0e7-0000002b <null> <null> +PartsSupplier pg_catalog pg_index indrelid 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-3d3e! e0fb-0000002a <null> <null> +PartsSupplier pg_catalog matpg_datatype name 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-9edf! 60d6-0000006c <null> <null> +PartsSupplier pg_catalog matpg_relatt nspname 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:7ff2755e9621-2fb8! aefc-00000064 <null> <null> +PartsSupplier pg_catalog pg_namespace nspname 2 <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-e055! 7576-00000003 <null> <null> +PartsSupplier pg_catalog matpg_datatype oid 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-9ead! 9415-0000006a <null> <null> +PartsSupplier pg_catalog pg_am oid 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-f895! 4414-00000033 <null> <null> +PartsSupplier pg_catalog pg_attribute oid 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-9c09! 440f-00000010 <null> <null> +PartsSupplier pg_catalog pg_class oid 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-7f51! b3be-00000005 <null> <null> +PartsSupplier pg_catalog pg_database oid 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-2aa6! 2961-00000051 <null> <null> +PartsSupplier pg_catalog pg_index oid 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-35dd! 0fd0-00000028 <null> <null> +PartsSupplier pg_catalog pg_namespace oid 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-5ace! 9aea-00000002 <null> <null> +PartsSupplier pg_catalog pg_proc oid 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-eef9! adf0-00000036 <null> <null> +PartsSupplier pg_catalog pg_trigger oid 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-d272! 8afc-00000042 <null> <null> +PartsSupplier pg_catalog pg_type oid 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-b1cd! f706-0000001c <null> <null> +PartsSupplier pg_catalog pg_user oid 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-a354! 92dc-0000005b <null> <null> +PartsSupplier pg_catalog pg_proc proallargtypes 9 <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-f418! fbdd-0000003e <null> <null> +PartsSupplier pg_catalog pg_proc proargmodes 8 <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-c636! 3c6d-0000003d <null> <null> +PartsSupplier pg_catalog pg_proc proargnames 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-c63e! 1885-0000003c <null> <null> +PartsSupplier pg_catalog pg_proc proargtypes 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-c69d! 99b6-0000003b <null> <null> +PartsSupplier pg_catalog pg_proc proname 2 <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-dc8a! 0ede-00000037 <null> <null> +PartsSupplier pg_catalog pg_proc pronamespace 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:7ff2755e9621-d103! 5574-0000003f <null> <null> +PartsSupplier pg_catalog pg_proc pronargs 5 <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-b3a7! dbe4-0000003a <null> <null> +PartsSupplier pg_catalog pg_proc proretset 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:7ff2755e9621-c750! 7134-00000038 <null> <null> +PartsSupplier pg_catalog pg_proc prorettype 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-21ae! 7034-00000039 <null> <null> +PartsSupplier pg_catalog pg_class relam 5 <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-85c6! 0879-00000009 <null> <null> +PartsSupplier pg_catalog pg_class relhasoids 9 <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-c399! e0be-0000000d <null> <null> +PartsSupplier pg_catalog pg_class relhasrules 8 <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-c471! 5c2a-0000000c <null> <null> +PartsSupplier pg_catalog pg_class relkind 4 <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-c054! 05a1-00000008 <null> <null> +PartsSupplier pg_catalog matpg_relatt relname 4 <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-eb35! 654a-00000063 <null> <null> +PartsSupplier pg_catalog pg_class relname 2 <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-c055! 4498-00000006 <null> <null> +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> <null> +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> <null> +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> <null> +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> <null> +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! 4b02-00000045 <null> <null> +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! 985f-00000049 <null> <null> +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! b444-00000043 <null> <null> +PartsSupplier pg_catalog pg_trigger tgdeferrable 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-2e2d! 787f-00000047 <null> <null> +PartsSupplier pg_catalog pg_trigger tgfoid 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-9e3e! 85c9-00000044 <null> <null> +PartsSupplier pg_catalog pg_trigger tginitdeferred 7 <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-cb89! 3414-00000048 <null> <null> +PartsSupplier pg_catalog pg_trigger tgnargs 5 <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-80c2! c8ea-00000046 <null> <null> +PartsSupplier pg_catalog pg_trigger tgrelid 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:7ff2755e9621-80fc! e213-0000004a <null> <null> +PartsSupplier pg_catalog pg_type typbasetype 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-1787! 1652-00000022 <null> <null> +PartsSupplier pg_catalog pg_type typdelim 9 <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-8976! 2000-00000024 <null> <null> +PartsSupplier pg_catalog pg_type typelem 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:7ff2755e9621-7ef3! 59d6-00000026 <null> <null> +PartsSupplier pg_catalog matpg_datatype typlen 5 <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-6b7b! b5f5-0000006e <null> <null> +PartsSupplier pg_catalog pg_type typlen 4 <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-7e9c! 18e6-0000001f <null> <null> +PartsSupplier pg_catalog matpg_datatype typname 2 <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-6bd6! e5e1-0000006b <null> <null> +PartsSupplier pg_catalog pg_type typname 2 <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-7ef7! 48d2-0000001d <null> <null> +PartsSupplier pg_catalog pg_type typnamespace 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-b928! 886c-0000001e <null> <null> +PartsSupplier pg_catalog pg_type typnotnull 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-68dd! 732b-00000021 <null> <null> +PartsSupplier pg_catalog matpg_relatt typoid 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-7700! 0205-00000066 <null> <null> +PartsSupplier pg_catalog pg_type typrelid 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:7ff2755e9621-8a3b! 6905-00000025 <null> <null> +PartsSupplier pg_catalog pg_type typtype 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-7efa! 5d81-00000020 <null> <null> +PartsSupplier pg_catalog pg_type typtypmod 8 <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-ebc6! 8c1e-00000023 <null> <null> +PartsSupplier pg_catalog matpg_datatype uid 4 <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-9ead! aa9b-0000006d <null> <null> +PartsSupplier pg_catalog pg_user usecreatedb 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:7ff2755e9621-5857! 9213-0000005d <null> <null> +PartsSupplier pg_catalog pg_user usename 2 <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-9a8c! 09a4-0000005c <null> <null> +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! eb66-0000005e <null> <null> Row Count : 255 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 true false false 0 true true false false @@ -287,4 +287,4 @@ 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS Columns 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,58 +1,58 @@ string boolean boolean string string integer integer string boolean boolean boolean integer integer string string string string string integer Name IsStandard IsPhysical TypeName JavaClass Scale TypeLength NullType IsSigned IsAutoIncremented IsCaseSensitive Precision Radix SearchType UID RuntimeType BaseType Description OID -ENTITIES false false ENTITIES java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:20360100-e742-1e20-8c26-a038c6ed7576 string ENTITY <null> 1 -ENTITY false false ENTITY java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576 string NCName <null> 2 -ID false false ID java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576 string NCName <null> 3 -IDREF false false IDREF java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576 string NCName <null> 4 -IDREFS false false IDREFS java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576 string IDREF <null> 5 -NCName false false NCName java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576 string Name <null> 6 -NMTOKEN false false NMTOKEN java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879 string token <null> 7 -NMTOKENS false false NMTOKENS java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576 string NMTOKEN <null> 8 -NOTATION false false NOTATION java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e string anySimpleType <null> 9 -Name false false Name java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576 string token <null> 10 -QName false false QName java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e string anySimpleType <null> 11 -XMLLiteral true true XMLLiteral org.teiid.core.types.XMLType 0 2147483647 Nullable false false true 0 0 Searchable mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32 xml string <null> 12 -anyURI false false anyURI java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e string anySimpleType <null> 13 -base64Binary false false base64Binary java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7 string anySimpleType <null> 14 -bigdecimal true true bigdecimal java.math.BigDecimal 2147483647 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d bigdecimal decimal <null> 15 -biginteger true true biginteger java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d biginteger decimal <null> 16 -blob true true blob org.teiid.core.types.BlobType 0 2147483647 Nullable false false false 0 0 Unsearchable mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95 blob base64Binary <null> 17 -boolean true true boolean java.lang.Boolean 0 1 Nullable false false false 1 10 Searchable mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7 boolean anySimpleType <null> 18 -byte true true byte java.lang.Byte 0 1 Nullable true false false 3 10 Searchable mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016 byte short <null> 19 -char true true char java.lang.Character 0 1 Nullable false false true 0 0 Searchable mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d char string <null> 20 -clob true true clob org.teiid.core.types.ClobType 0 2147483647 Nullable false false true 0 0 Like Only mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3 clob string <null> 21 -date true true date java.sql.Date 0 4 Nullable false false false 0 0 Searchable mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7 date anySimpleType <null> 22 -dateTime true true dateTime java.sql.Timestamp 0 12 Nullable false false false 0 0 Searchable mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21 timestamp anySimpleType <null> 23 -decimal true true decimal java.math.BigDecimal 2147483647 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7 bigdecimal anySimpleType <null> 24 -double true true double java.lang.Double 4 8 Nullable true false false 17 10 Searchable mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7 double anySimpleType <null> 25 -duration false false duration java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21 string anySimpleType <null> 26 -float true true float java.lang.Float 3 4 Nullable true false false 7 10 Searchable mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7 float anySimpleType <null> 27 -gDay false false gDay java.math.BigInteger 0 2147483647 Nullable false false false 0 10 Searchable mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21 biginteger anySimpleType <null> 28 -gMonth false false gMonth java.math.BigInteger 0 2147483647 Nullable false false false 0 10 Searchable mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21 biginteger anySimpleType <null> 29 -gMonthDay false false gMonthDay java.sql.Timestamp 0 12 Nullable false false false 0 0 Searchable mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21 timestamp anySimpleType <null> 30 -gYear false false gYear java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21 biginteger anySimpleType <null> 31 -gYearMonth false false gYearMonth java.sql.Timestamp 0 12 Nullable false false false 0 0 Searchable mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21 timestamp anySimpleType <null> 32 -hexBinary false false hexBinary java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7 string anySimpleType <null> 33 -int true true int java.lang.Integer 0 4 Nullable true false false 10 10 Searchable mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016 integer long <null> 34 -integer false false integer java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576 biginteger decimal <null> 35 -language false false language java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576 string token <null> 36 -long true true long java.lang.Long 0 8 Nullable true false false 19 10 Searchable mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016 long integer <null> 37 -negativeInteger false false negativeInteger java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016 biginteger nonPositiveInteger <null> 38 -nonNegativeInteger false false nonNegativeInteger java.math.BigInteger 0 2147483647 Nullable false false false 2147483647 10 Searchable mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016 biginteger integer <null> 39 -nonPositiveInteger false false nonPositiveInteger java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576 biginteger integer <null> 40 -normalizedString false false normalizedString java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:4df43700-3b13-1e20-921b-eeee28353879 string string <null> 41 -object true true object java.lang.Object 0 2147483647 Nullable false false false 0 0 Unsearchable mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79 object base64Binary <null> 42 -positiveInteger false false positiveInteger java.math.BigInteger 0 2147483647 Nullable false false false 2147483647 10 Searchable mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016 biginteger nonNegativeInteger <null> 43 -short true true short java.lang.Short 0 2 Nullable true false false 5 10 Searchable mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016 short int <null> 44 -string true true string java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7 string anySimpleType <null> 45 -time true true time java.sql.Time 0 4 Nullable false false false 0 0 Searchable mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7 time anySimpleType <null> 46 -timestamp true true timestamp java.sql.Timestamp 0 12 Nullable false false true 0 0 Searchable mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d timestamp string <null> 47 -token false false token java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a string normalizedString <null> 48 -unsignedByte false false unsignedByte java.lang.Short 0 2 Nullable false false false 5 10 Searchable mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016 short unsignedShort <null> 49 -unsignedInt false false unsignedInt java.lang.Long 0 8 Nullable false false false 19 10 Searchable mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016 long unsignedLong <null> 50 -unsignedLong false false unsignedLong java.math.BigInteger 0 2147483647 Nullable false false false 2147483647 10 Searchable mmuuid:54b98780-ba14-1e21-b812-969c8fc8b016 biginteger nonNegativeInteger <null> 51 -unsignedShort false false unsignedShort java.lang.Integer 0 4 Nullable false false false 10 10 Searchable mmuuid:327093c0-ba88-1e21-b812-969c8fc8b016 integer unsignedInt <null> 52 -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 +ENTITIES false false ENTITIES java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:20360100-e742-1e20-8c26-a038c6ed7576 string ENTITY <null> <null> +ENTITY false false ENTITY java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576 string NCName <null> <null> +ID false false ID java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576 string NCName <null> <null> +IDREF false false IDREF java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576 string NCName <null> <null> +IDREFS false false IDREFS java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576 string IDREF <null> <null> +NCName false false NCName java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576 string Name <null> <null> +NMTOKEN false false NMTOKEN java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879 string token <null> <null> +NMTOKENS false false NMTOKENS java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576 string NMTOKEN <null> <null> +NOTATION false false NOTATION java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e string anySimpleType <null> <null> +Name false false Name java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576 string token <null> <null> +QName false false QName java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e string anySimpleType <null> <null> +XMLLiteral true true XMLLiteral org.teiid.core.types.XMLType 0 2147483647 Nullable false false true 0 0 Searchable mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32 xml string <null> <null> +anyURI false false anyURI java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e string anySimpleType <null> <null> +base64Binary false false base64Binary java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7 string anySimpleType <null> <null> +bigdecimal true true bigdecimal java.math.BigDecimal 2147483647 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d bigdecimal decimal <null> <null> +biginteger true true biginteger java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d biginteger decimal <null> <null> +blob true true blob org.teiid.core.types.BlobType 0 2147483647 Nullable false false false 0 0 Unsearchable mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95 blob base64Binary <null> <null> +boolean true true boolean java.lang.Boolean 0 1 Nullable false false false 1 10 Searchable mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7 boolean anySimpleType <null> <null> +byte true true byte java.lang.Byte 0 1 Nullable true false false 3 10 Searchable mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016 byte short <null> <null> +char true true char java.lang.Character 0 1 Nullable false false true 0 0 Searchable mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d char string <null> <null> +clob true true clob org.teiid.core.types.ClobType 0 2147483647 Nullable false false true 0 0 Like Only mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3 clob string <null> <null> +date true true date java.sql.Date 0 4 Nullable false false false 0 0 Searchable mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7 date anySimpleType <null> <null> +dateTime true true dateTime java.sql.Timestamp 0 12 Nullable false false false 0 0 Searchable mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21 timestamp anySimpleType <null> <null> +decimal true true decimal java.math.BigDecimal 2147483647 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7 bigdecimal anySimpleType <null> <null> +double true true double java.lang.Double 4 8 Nullable true false false 17 10 Searchable mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7 double anySimpleType <null> <null> +duration false false duration java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21 string anySimpleType <null> <null> +float true true float java.lang.Float 3 4 Nullable true false false 7 10 Searchable mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7 float anySimpleType <null> <null> +gDay false false gDay java.math.BigInteger 0 2147483647 Nullable false false false 0 10 Searchable mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21 biginteger anySimpleType <null> <null> +gMonth false false gMonth java.math.BigInteger 0 2147483647 Nullable false false false 0 10 Searchable mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21 biginteger anySimpleType <null> <null> +gMonthDay false false gMonthDay java.sql.Timestamp 0 12 Nullable false false false 0 0 Searchable mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21 timestamp anySimpleType <null> <null> +gYear false false gYear java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21 biginteger anySimpleType <null> <null> +gYearMonth false false gYearMonth java.sql.Timestamp 0 12 Nullable false false false 0 0 Searchable mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21 timestamp anySimpleType <null> <null> +hexBinary false false hexBinary java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7 string anySimpleType <null> <null> +int true true int java.lang.Integer 0 4 Nullable true false false 10 10 Searchable mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016 integer long <null> <null> +integer false false integer java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576 biginteger decimal <null> <null> +language false false language java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576 string token <null> <null> +long true true long java.lang.Long 0 8 Nullable true false false 19 10 Searchable mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016 long integer <null> <null> +negativeInteger false false negativeInteger java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016 biginteger nonPositiveInteger <null> <null> +nonNegativeInteger false false nonNegativeInteger java.math.BigInteger 0 2147483647 Nullable false false false 2147483647 10 Searchable mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016 biginteger integer <null> <null> +nonPositiveInteger false false nonPositiveInteger java.math.BigInteger 0 2147483647 Nullable true false false 2147483647 10 Searchable mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576 biginteger integer <null> <null> +normalizedString false false normalizedString java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:4df43700-3b13-1e20-921b-eeee28353879 string string <null> <null> +object true true object java.lang.Object 0 2147483647 Nullable false false false 0 0 Unsearchable mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79 object base64Binary <null> <null> +positiveInteger false false positiveInteger java.math.BigInteger 0 2147483647 Nullable false false false 2147483647 10 Searchable mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016 biginteger nonNegativeInteger <null> <null> +short true true short java.lang.Short 0 2 Nullable true false false 5 10 Searchable mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016 short int <null> <null> +string true true string java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7 string anySimpleType <null> <null> +time true true time java.sql.Time 0 4 Nullable false false false 0 0 Searchable mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7 time anySimpleType <null> <null> +timestamp true true timestamp java.sql.Timestamp 0 12 Nullable false false true 0 0 Searchable mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d timestamp string <null> <null> +token false false token java.lang.String 0 4000 Nullable false false true 0 0 Searchable mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a string normalizedString <null> <null> +unsignedByte false false unsignedByte java.lang.Short 0 2 Nullable false false false 5 10 Searchable mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016 short unsignedShort <null> <null> +unsignedInt false false unsignedInt java.lang.Long 0 8 Nullable false false false 19 10 Searchable mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016 long unsignedLong <null> <null> +unsignedLong false false unsignedLong java.math.BigInteger 0 2147483647 Nullable false false false 2147483647 10 Searchable mmuuid:54b98780-ba14-1e21-b812-969c8fc8b016 biginteger nonNegativeInteger <null> <null> +unsignedShort false false unsignedShort java.lang.Integer 0 4 Nullable false false false 10 10 Searchable mmuuid:327093c0-ba88-1e21-b812-969c8fc8b016 integer unsignedInt <null> <null> +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> <null> 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 false false @@ -73,4 +73,4 @@ 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS DataTypes 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,27 +1,27 @@ string string string string string string string string integer integer VDBName SchemaName TableName Name KeyName KeyType RefKeyUID UID Position OID -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID FK_SPLIER_PRTS_PRTS Foreign mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590 1 8 -PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID PK_PARTS Primary <null> mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 1 1 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID PK_SUPPLIER_PARTS Primary <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 2 7 -PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_ID PK_SHIP_VIA Primary <null> mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590 1 2 -PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID PK_STATUS Primary <null> mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 1 3 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID FK_SPLY_PRTS_SPLY Foreign mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590 1 9 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID PK_SUPPLIER Primary <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 1 4 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID PK_SUPPLIER_PARTS Primary <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 1 6 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS FK_SPLIER_STATS Foreign mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590 1 5 -PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 1 14 -PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649331-00000068 2 18 -PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649331-00000068 1 17 -PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5960-0000006f 2 11 -PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 3 16 -PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa810-00000070 2 13 -PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5960-0000006f 1 10 -PartsSupplier pg_catalog pg_attribute oid pk_pg_attr Primary <null> tid:7ff2755e9621-db38c73a-0000001a 1 19 -PartsSupplier pg_catalog pg_class oid pk_pg_class Primary <null> tid:7ff2755e9621-265d38e8-0000000e 1 20 -PartsSupplier pg_catalog pg_index oid pk_pg_index Primary <null> tid:7ff2755e9621-dd3e1454-00000031 1 21 -PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary <null> tid:7ff2755e9621-2e2ffa80-00000040 1 22 -PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 2 15 -PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa810-00000070 1 12 +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID FK_SPLIER_PRTS_PRTS Foreign mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PART_ID PK_PARTS Primary <null> mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PART_ID PK_SUPPLIER_PARTS Primary <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 2 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA SHIPPER_ID PK_SHIP_VIA Primary <null> mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS STATUS_ID PK_STATUS Primary <null> mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID FK_SPLY_PRTS_SPLY Foreign mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID PK_SUPPLIER Primary <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID PK_SUPPLIER_PARTS Primary <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS FK_SPLIER_STATS Foreign mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590 1 <null> +PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 1 <null> +PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649331-00000068 2 <null> +PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649331-00000068 1 <null> +PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5960-0000006f 2 <null> +PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 3 <null> +PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa810-00000070 2 <null> +PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5960-0000006f 1 <null> +PartsSupplier pg_catalog pg_attribute oid pk_pg_attr Primary <null> tid:7ff2755e9621-db38c73a-0000001a 1 <null> +PartsSupplier pg_catalog pg_class oid pk_pg_class Primary <null> tid:7ff2755e9621-265d38e8-0000000e 1 <null> +PartsSupplier pg_catalog pg_index oid pk_pg_index Primary <null> tid:7ff2755e9621-dd3e1454-00000031 1 <null> +PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary <null> tid:7ff2755e9621-2e2ffa80-00000040 1 <null> +PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 2 <null> +PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa810-00000070 1 <null> 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 true false false 0 true true false false @@ -33,4 +33,4 @@ 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS KeyColumns 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,21 +1,21 @@ string string string string string string string boolean string string integer VDBName SchemaName TableName Name Description NameInSource Type IsIndexed RefKeyUID UID OID -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS FK_SPLIER_PRTS_PRTS <null> FK_SPLIER_PRTS_PRTS Foreign false mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590 7 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER FK_SPLIER_STATS <null> FK_SPLIER_STATS Foreign false mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590 5 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS FK_SPLY_PRTS_SPLY <null> FK_SPLY_PRTS_SPLY Foreign false mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590 8 -PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PK_PARTS <null> <null> Primary false <null> mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 1 -PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA PK_SHIP_VIA <null> <null> Primary false <null> mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590 2 -PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS PK_STATUS <null> <null> Primary false <null> mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 3 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER PK_SUPPLIER <null> <null> Primary false <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 4 -PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PK_SUPPLIER_PARTS <null> <null> Primary false <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 6 -PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids <null> <null> Index false <null> tid:7ff2755e9621-2a649331-00000068 12 -PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids <null> <null> Index false <null> tid:7ff2755e9621-ed0fa810-00000070 10 -PartsSupplier pg_catalog matpg_datatype matpg_datatype_names <null> <null> Primary false <null> tid:7ff2755e9621-e36b5960-0000006f 9 -PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names <null> <null> Primary false <null> tid:7ff2755e9621-965abf03-00000067 11 -PartsSupplier pg_catalog pg_attribute pk_pg_attr <null> <null> Primary false <null> tid:7ff2755e9621-db38c73a-0000001a 13 -PartsSupplier pg_catalog pg_class pk_pg_class <null> <null> Primary false <null> tid:7ff2755e9621-265d38e8-0000000e 14 -PartsSupplier pg_catalog pg_index pk_pg_index <null> <null> Primary false <null> tid:7ff2755e9621-dd3e1454-00000031 15 -PartsSupplier pg_catalog pg_proc pk_pg_proc <null> <null> Primary false <null> tid:7ff2755e9621-2e2ffa80-00000040 16 +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS FK_SPLIER_PRTS_PRTS <null> FK_SPLIER_PRTS_PRTS Foreign false mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER FK_SPLIER_STATS <null> FK_SPLIER_STATS Foreign false mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS FK_SPLY_PRTS_SPLY <null> FK_SPLY_PRTS_SPLY Foreign false mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS PK_PARTS <null> <null> Primary false <null> mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA PK_SHIP_VIA <null> <null> Primary false <null> mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS PK_STATUS <null> <null> Primary false <null> mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER PK_SUPPLIER <null> <null> Primary false <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PK_SUPPLIER_PARTS <null> <null> Primary false <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 <null> +PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids <null> <null> Index false <null> tid:7ff2755e9621-2a649331-00000068 <null> +PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids <null> <null> Index false <null> tid:7ff2755e9621-ed0fa810-00000070 <null> +PartsSupplier pg_catalog matpg_datatype matpg_datatype_names <null> <null> Primary false <null> tid:7ff2755e9621-e36b5960-0000006f <null> +PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names <null> <null> Primary false <null> tid:7ff2755e9621-965abf03-00000067 <null> +PartsSupplier pg_catalog pg_attribute pk_pg_attr <null> <null> Primary false <null> tid:7ff2755e9621-db38c73a-0000001a <null> +PartsSupplier pg_catalog pg_class pk_pg_class <null> <null> Primary false <null> tid:7ff2755e9621-265d38e8-0000000e <null> +PartsSupplier pg_catalog pg_index pk_pg_index <null> <null> Primary false <null> tid:7ff2755e9621-dd3e1454-00000031 <null> +PartsSupplier pg_catalog pg_proc pk_pg_proc <null> <null> Primary false <null> tid:7ff2755e9621-2e2ffa80-00000040 <null> 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 true false false 0 true true false false @@ -28,4 +28,4 @@ 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 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS Keys 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,32 +1,32 @@ 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 3 In false 1 1 0 10 No Nulls tid:60b87e792634-09a20d5b-0000001a <null> 12 -PartsSupplier SYSADMIN refreshMatViewRow Key object 3 In false 0 2147483647 0 0 No Nulls tid:60b87e792634-0001263f-0000001e <null> 15 -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 1 ReturnValue false 10 4 0 10 No Nulls tid:60b87e792634-884f8882-00000018 <null> 10 -PartsSupplier SYSADMIN refreshMatViewRow RowsUpdated integer 1 ReturnValue false 10 4 0 10 No Nulls tid:60b87e792634-884f8882-0000001c <null> 13 -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 2 In false 0 4000 0 0 No Nulls tid:60b87e792634-4b1eb2f0-00000019 <null> 11 -PartsSupplier SYSADMIN refreshMatViewRow ViewName string 2 In false 0 4000 0 0 No Nulls tid:60b87e792634-4b1eb2f0-0000001d <null> 14 -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 +PartsSupplier SYSADMIN refreshMatView Invalidate boolean 3 In false 1 1 0 10 No Nulls tid:60b87e792634-09a20d5b-0000001a <null> <null> +PartsSupplier SYSADMIN refreshMatViewRow Key object 3 In false 0 2147483647 0 0 No Nulls tid:60b87e792634-0001263f-0000001e <null> <null> +PartsSupplier SYSADMIN setProperty Name string 3 In false 0 4000 0 0 No Nulls tid:60b87e792634-0024eeab-00000029 <null> <null> +PartsSupplier SYSADMIN setProperty OldValue clob 1 ReturnValue false 0 2097152 0 0 No Nulls tid:60b87e792634-0f2c17aa-00000027 <null> <null> +PartsSupplier SYSADMIN refreshMatView RowsUpdated integer 1 ReturnValue false 10 4 0 10 No Nulls tid:60b87e792634-884f8882-00000018 <null> <null> +PartsSupplier SYSADMIN refreshMatViewRow RowsUpdated integer 1 ReturnValue false 10 4 0 10 No Nulls tid:60b87e792634-884f8882-0000001c <null> <null> +PartsSupplier SYSADMIN setProperty UID string 2 In false 0 50 0 0 No Nulls tid:60b87e792634-00014830-00000028 <null> <null> +PartsSupplier SYSADMIN setProperty Value clob 4 In false 0 2097152 0 0 Nullable tid:60b87e792634-04e9a151-0000002a <null> <null> +PartsSupplier SYSADMIN refreshMatView ViewName string 2 In false 0 4000 0 0 No Nulls tid:60b87e792634-4b1eb2f0-00000019 <null> <null> +PartsSupplier SYSADMIN refreshMatViewRow ViewName string 2 In false 0 4000 0 0 No Nulls tid:60b87e792634-4b1eb2f0-0000001d <null> <null> +PartsSupplier SYSADMIN setTableStats cardinality integer 2 In false 10 4 0 10 No Nulls tid:60b87e792634-3260ed8e-0000002d <null> <null> +PartsSupplier SYSADMIN setColumnStats columnName string 2 In false 0 4000 0 0 No Nulls tid:60b87e792634-827e2701-00000021 <null> <null> +PartsSupplier SYSADMIN isLoggable context string 3 In false 0 4000 0 0 No Nulls tid:60b87e792634-38b735af-00000011 <null> <null> +PartsSupplier SYSADMIN logMsg context string 3 In false 0 4000 0 0 No Nulls tid:60b87e792634-38b735af-00000015 <null> <null> +PartsSupplier SYSADMIN setColumnStats distinctCount integer 3 In false 10 4 0 10 Nullable tid:60b87e792634-98c12f73-00000022 <null> <null> +PartsSupplier SYS getXMLSchemas document string 1 In false 0 4000 0 0 No Nulls tid:2cb59cfd55db-335cd11b-00000095 <null> <null> +PartsSupplier SYSADMIN isLoggable level string 2 In false 0 4000 0 0 No Nulls tid:60b87e792634-06219b84-00000010 <null> <null> +PartsSupplier SYSADMIN logMsg level string 2 In false 0 4000 0 0 No Nulls tid:60b87e792634-06219b84-00000014 <null> <null> +PartsSupplier SYSADMIN isLoggable loggable boolean 1 ReturnValue false 1 1 0 10 No Nulls tid:60b87e792634-786ed17d-0000000f <null> <null> +PartsSupplier SYSADMIN logMsg logged boolean 1 ReturnValue false 1 1 0 10 No Nulls tid:60b87e792634-be97f582-00000013 <null> <null> +PartsSupplier SYSADMIN setColumnStats max string 5 In false 0 4000 0 0 Nullable tid:60b87e792634-0001a564-00000024 <null> <null> +PartsSupplier SYSADMIN setColumnStats min string 6 In false 0 4000 0 0 Nullable tid:60b87e792634-0001a652-00000025 <null> <null> +PartsSupplier SYSADMIN logMsg msg object 4 In false 0 2147483647 0 0 No Nulls tid:60b87e792634-0001a781-00000016 <null> <null> +PartsSupplier SYSADMIN setColumnStats nullCount integer 4 In false 10 4 0 10 Nullable tid:60b87e792634-3ca1f7c8-00000023 <null> <null> +PartsSupplier SYS getXMLSchemas schema xml 1 ResultSet false 0 2147483647 0 0 Nullable tid:2cb59cfd55db-98c0b6d9-00000097 <null> <null> +PartsSupplier SYSADMIN setColumnStats tableName string 1 In false 0 4000 0 0 No Nulls tid:60b87e792634-89769379-00000020 <null> <null> +PartsSupplier SYSADMIN setTableStats tableName string 1 In false 0 4000 0 0 No Nulls tid:60b87e792634-89769379-0000002c <null> <null> 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 true false false 0 true true false false @@ -44,4 +44,4 @@ 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS ProcedureParams 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,13 +1,13 @@ string string string string boolean string string integer VDBName SchemaName Name NameInSource ReturnsResults UID Description OID -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 +PartsSupplier SYS getXMLSchemas <null> true tid:2cb59cfd55db-b59a8ad1-00000094 <null> <null> +PartsSupplier SYSADMIN isLoggable <null> false tid:60b87e792634-492678c7-0000000e <null> <null> +PartsSupplier SYSADMIN logMsg <null> false tid:60b87e792634-be97959d-00000012 <null> <null> +PartsSupplier SYSADMIN refreshMatView <null> false tid:60b87e792634-d197ccca-00000017 <null> <null> +PartsSupplier SYSADMIN refreshMatViewRow <null> false tid:60b87e792634-9021c8b0-0000001b <null> <null> +PartsSupplier SYSADMIN setColumnStats <null> false tid:60b87e792634-3dd16127-0000001f <null> <null> +PartsSupplier SYSADMIN setProperty <null> false tid:60b87e792634-3b607c57-00000026 <null> <null> +PartsSupplier SYSADMIN setTableStats <null> false tid:60b87e792634-c20fcf73-0000002b <null> <null> 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 true false false 0 true true false false @@ -17,4 +17,4 @@ 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 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS Procedures 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,14 +1,15 @@ string string string integer clob Name Value UID OID ClobValue -pg_type:oid 22 tid:7ff2755e9621-ef456826-00000030 1 Clob[2] -pg_type:oid 30 tid:7ff2755e9621-c69d99b6-0000003b 2 Clob[2] -pg_type:oid 1009 tid:7ff2755e9621-c63e1885-0000003c 3 Clob[4] -pg_type:oid 1002 tid:7ff2755e9621-c6363c6d-0000003d 4 Clob[4] -pg_type:oid 1028 tid:7ff2755e9621-f418fbdd-0000003e 5 Clob[4] -Row Count : 5 +pg_type:oid 1002 tid:7ff2755e9621-c6363c6d-0000003d <null> Clob[4] +pg_type:oid 1009 tid:7ff2755e9621-c63e1885-0000003c <null> Clob[4] +pg_type:oid 30 tid:7ff2755e9621-c69d99b6-0000003b <null> Clob[2] +teiid:pass-through-type true tid:7ff2755e9621-e548fc4c-00000074 <null> Clob[4] +pg_type:oid 22 tid:7ff2755e9621-ef456826-00000030 <null> Clob[2] +pg_type:oid 1028 tid:7ff2755e9621-f418fbdd-0000003e <null> Clob[4] +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 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS Properties 11 10 0 false false false false 1 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/testSchemas.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,9 +1,9 @@ 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 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 +PartsSupplier PartsSupplier true mmuuid:19c7f380-73d8-1edc-a81c-ecf397b10590 <null> http://www.metamatrix.com/metamodels/Relational <null> +PartsSupplier SYS true tid:2cb59cfd55db-000142ad-00000000 <null> http://www.metamatrix.com/metamodels/Relational <null> +PartsSupplier SYSADMIN true tid:60b87e792634-a3626ca2-00000000 <null> http://www.metamatrix.com/metamodels/Relational <null> +PartsSupplier pg_catalog true tid:7ff2755e9621-35592dd1-00000000 <null> http://www.metamatrix.com/metamodels/Relational <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 VDBName string SYS Schemas 255 255 0 false true false false 1 true true false false @@ -12,4 +12,4 @@ 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS Schemas 11 10 0 false false false false 1 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-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -1,36 +1,36 @@ 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 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 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-00000069 -1 <null> true true 19 -PartsSupplier pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true 20 -PartsSupplier pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false 21 -PartsSupplier pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false 22 -PartsSupplier pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true 23 -PartsSupplier pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true 24 -PartsSupplier pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false 25 -PartsSupplier pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true 26 -PartsSupplier pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false 27 -PartsSupplier pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true 28 -PartsSupplier pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false 29 -PartsSupplier pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true 30 -PartsSupplier pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false 31 +PartsSupplier SYS Columns Table <null> true false tid:2cb59cfd55db-9bd42fbd-00000001 -1 <null> true false <null> +PartsSupplier SYS DataTypes Table <null> true false tid:2cb59cfd55db-6130d2cf-00000021 -1 <null> true false <null> +PartsSupplier SYS KeyColumns Table <null> true false tid:2cb59cfd55db-c5c6549e-00000035 -1 <null> true false <null> +PartsSupplier SYS Keys Table <null> true false tid:2cb59cfd55db-0023a214-00000040 -1 <null> true false <null> +PartsSupplier SYSADMIN MatViews Table <null> true false tid:60b87e792634-14d6450e-00000001 -1 <null> true false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false <null> +PartsSupplier SYS ProcedureParams Table <null> true false tid:2cb59cfd55db-ab347619-0000004c -1 <null> true false <null> +PartsSupplier SYS Procedures Table <null> true false tid:2cb59cfd55db-8f29b420-0000005d -1 <null> true false <null> +PartsSupplier SYS Properties Table <null> true false tid:2cb59cfd55db-3f9f6953-00000066 -1 <null> true false <null> +PartsSupplier SYS ReferenceKeyColumns Table <null> true false tid:2cb59cfd55db-aa92fa09-0000006c -1 <null> true false <null> +PartsSupplier SYS Schemas Table <null> true false tid:2cb59cfd55db-d57e16d2-0000007b -1 <null> true false <null> +PartsSupplier SYS Tables Table <null> true false tid:2cb59cfd55db-94dc2a85-00000083 -1 <null> true false <null> +PartsSupplier SYSADMIN VDBResources Table <null> true false tid:60b87e792634-1e9b1131-0000000b -1 <null> true false <null> +PartsSupplier SYS VirtualDatabases Table <null> true false tid:2cb59cfd55db-a9e11fad-00000091 -1 <null> true false <null> +PartsSupplier pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000069 -1 <null> true true <null> +PartsSupplier pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true <null> +PartsSupplier pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false <null> +PartsSupplier pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false <null> +PartsSupplier pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true <null> +PartsSupplier pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true <null> +PartsSupplier pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false <null> +PartsSupplier pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true <null> +PartsSupplier pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false <null> +PartsSupplier pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true <null> +PartsSupplier pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false <null> +PartsSupplier pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true <null> +PartsSupplier pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false <null> 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 false 1 true true false false @@ -45,4 +45,4 @@ 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 +OID 4 PartsSupplier java.lang.Integer OID integer SYS Tables 11 10 0 false false false false 1 true true true false Added: trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.after.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.after.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.after.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,25 @@ +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 BQT1 HugeA Table <null> true false mmuuid:7c66fc80-33d2-1dfa-9931-e83d04ce10a0 500000 <null> false false <null> +PartsSupplier BQT1 HugeB Table <null> true false mmuuid:b0369400-33f8-1dfa-9931-e83d04ce10a0 500000 <null> false false <null> +PartsSupplier BQT1 LargeA Table <null> true false mmuuid:3976a800-33b2-1dfa-9931-e83d04ce10a0 10000 <null> false false <null> +PartsSupplier BQT1 LargeB Table <null> true false mmuuid:5fb40600-33c3-1dfa-9931-e83d04ce10a0 10000 <null> false false <null> +PartsSupplier BQT1 MediumA Table <null> true false mmuuid:61074980-338d-1dfa-9931-e83d04ce10a0 1000 <null> false false <null> +PartsSupplier BQT1 MediumB Table <null> true false mmuuid:e24bd1c0-33a4-1dfa-9931-e83d04ce10a0 1000 <null> false false <null> +PartsSupplier BQT1 SmallA Table <null> true false mmuuid:0968424f-e6a0-1df9-ac06-b890ff96f710 50 <null> false false <null> +PartsSupplier BQT1 SmallB Table <null> true false mmuuid:06fb8980-3377-1dfa-9931-e83d04ce10a0 50 <null> false false <null> +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 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 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 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 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 1 true true true false Added: trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.before.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.before.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.before.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,17 @@ +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 +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 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 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 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 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 1 true true true false Added: trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.test.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.test.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestVDBMerge/merge.test.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,22 @@ +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 PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false <null> +PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false <null> +Row Count : 5 +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 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 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 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 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 1 true true true false Added: trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.after.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.after.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.after.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,25 @@ +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 +empty BQT1 HugeA Table <null> true false mmuuid:7c66fc80-33d2-1dfa-9931-e83d04ce10a0 500000 <null> false false <null> +empty BQT1 HugeB Table <null> true false mmuuid:b0369400-33f8-1dfa-9931-e83d04ce10a0 500000 <null> false false <null> +empty BQT1 LargeA Table <null> true false mmuuid:3976a800-33b2-1dfa-9931-e83d04ce10a0 10000 <null> false false <null> +empty BQT1 LargeB Table <null> true false mmuuid:5fb40600-33c3-1dfa-9931-e83d04ce10a0 10000 <null> false false <null> +empty BQT1 MediumA Table <null> true false mmuuid:61074980-338d-1dfa-9931-e83d04ce10a0 1000 <null> false false <null> +empty BQT1 MediumB Table <null> true false mmuuid:e24bd1c0-33a4-1dfa-9931-e83d04ce10a0 1000 <null> false false <null> +empty BQT1 SmallA Table <null> true false mmuuid:0968424f-e6a0-1df9-ac06-b890ff96f710 50 <null> false false <null> +empty BQT1 SmallB Table <null> true false mmuuid:06fb8980-3377-1dfa-9931-e83d04ce10a0 50 <null> false false <null> +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 empty java.lang.String VDBName string SYS Tables 255 255 0 false true false false 1 true true false false +SchemaName 12 empty java.lang.String SchemaName string SYS Tables 255 255 0 false true false false 1 true true false false +Name 12 empty java.lang.String Name string SYS Tables 255 255 0 false true false false 0 true true false false +Type 12 empty java.lang.String Type string SYS Tables 20 20 0 false true false false 0 true true false false +NameInSource 12 empty java.lang.String NameInSource string SYS Tables 255 255 0 false true false false 1 true true false false +IsPhysical -7 empty java.lang.Boolean IsPhysical boolean SYS Tables 5 1 0 false false false false 0 true true false false +SupportsUpdates -7 empty java.lang.Boolean SupportsUpdates boolean SYS Tables 5 1 0 false false false false 0 true true false false +UID 12 empty java.lang.String UID string SYS Tables 50 50 0 false true false false 0 true true false false +Cardinality 4 empty java.lang.Integer Cardinality integer SYS Tables 11 10 0 false false false false 0 true true true false +Description 12 empty java.lang.String Description string SYS Tables 255 255 0 false true false false 1 true true false false +IsSystem -7 empty java.lang.Boolean IsSystem boolean SYS Tables 5 1 0 false false false false 1 true true false false +IsMaterialized -7 empty java.lang.Boolean IsMaterialized boolean SYS Tables 5 1 0 false false false false 0 true true false false +OID 4 empty java.lang.Integer OID integer SYS Tables 11 10 0 false false false false 1 true true true false Added: trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.before.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.before.expected (rev 0) +++ trunk/test-integration/common/src/test/resources/TestVDBMerge/mergeEmpty.before.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,17 @@ +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 +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 empty java.lang.String VDBName string SYS Tables 255 255 0 false true false false 1 true true false false +SchemaName 12 empty java.lang.String SchemaName string SYS Tables 255 255 0 false true false false 1 true true false false +Name 12 empty java.lang.String Name string SYS Tables 255 255 0 false true false false 0 true true false false +Type 12 empty java.lang.String Type string SYS Tables 20 20 0 false true false false 0 true true false false +NameInSource 12 empty java.lang.String NameInSource string SYS Tables 255 255 0 false true false false 1 true true false false +IsPhysical -7 empty java.lang.Boolean IsPhysical boolean SYS Tables 5 1 0 false false false false 0 true true false false +SupportsUpdates -7 empty java.lang.Boolean SupportsUpdates boolean SYS Tables 5 1 0 false false false false 0 true true false false +UID 12 empty java.lang.String UID string SYS Tables 50 50 0 false true false false 0 true true false false +Cardinality 4 empty java.lang.Integer Cardinality integer SYS Tables 11 10 0 false false false false 0 true true true false +Description 12 empty java.lang.String Description string SYS Tables 255 255 0 false true false false 1 true true false false +IsSystem -7 empty java.lang.Boolean IsSystem boolean SYS Tables 5 1 0 false false false false 1 true true false false +IsMaterialized -7 empty java.lang.Boolean IsMaterialized boolean SYS Tables 5 1 0 false false false false 0 true true false false +OID 4 empty java.lang.Integer OID integer SYS Tables 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-09-12 20:31:15 UTC (rev 4433) +++ trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-09-13 11:16:46 UTC (rev 4434) @@ -2,12 +2,13 @@ Name Value UID NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1 NugentYAttribute Nuuuuuge44444 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1 +pg_type:oid 1002 tid:7ff2755e9621-c6363c6d-0000003d +pg_type:oid 1009 tid:7ff2755e9621-c63e1885-0000003c +pg_type:oid 30 tid:7ff2755e9621-c69d99b6-0000003b pg_type:oid 22 tid:7ff2755e9621-ef456826-00000030 -pg_type:oid 30 tid:7ff2755e9621-c69d99b6-0000003b -pg_type:oid 1009 tid:7ff2755e9621-c63e1885-0000003c -pg_type:oid 1002 tid:7ff2755e9621-c6363c6d-0000003d pg_type:oid 1028 tid:7ff2755e9621-f418fbdd-0000003e -Row Count : 7 +teiid:pass-through-type true tid:7ff2755e9621-e548fc4c-00000074 +Row Count : 8 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 false false Value 12 xmlvp java.lang.String Value string SYS Properties 255 255 0 false true false false 0 true true false false Added: trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestSystemPerformance.java =================================================================== --- trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestSystemPerformance.java (rev 0) +++ trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestSystemPerformance.java 2012-09-13 11:16:46 UTC (rev 4434) @@ -0,0 +1,98 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (C) 2009 Red Hat, Inc. + * Licensed to Red Hat, Inc. under one or more contributor + * license agreements. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * 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.eval; + +import java.sql.Connection; +import java.sql.DatabaseMetaData; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.teiid.adminapi.impl.ModelMetaData; +import org.teiid.deployers.VirtualDatabaseException; +import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository.ConnectorManagerException; +import org.teiid.jdbc.AbstractQueryTest; +import org.teiid.jdbc.HardCodedExecutionFactory; +import org.teiid.metadata.MetadataFactory; +import org.teiid.metadata.Table; +import org.teiid.runtime.EmbeddedConfiguration; +import org.teiid.runtime.EmbeddedServer; +import org.teiid.translator.TranslatorException; + +@SuppressWarnings({"nls"}) +public class TestSystemPerformance extends AbstractQueryTest { + + private static final int TABLES = 2000; + private static final int COLS = 16; + EmbeddedServer es; + + @Before public void setup() throws VirtualDatabaseException, ConnectorManagerException, TranslatorException { + es = new EmbeddedServer(); + es.start(new EmbeddedConfiguration()); + ModelMetaData mmm = new ModelMetaData(); + mmm.setName("test"); + mmm.setSchemaSourceType("native"); + mmm.addSourceMapping("x", "hardcoded", null); + HardCodedExecutionFactory hardCodedExecutionFactory = new HardCodedExecutionFactory() { + @Override + public void getMetadata(MetadataFactory metadataFactory, Object conn) + throws TranslatorException { + String[] colNames = new String[COLS]; + for (int i = 0; i < colNames.length; i++) { + colNames[i] = "col" + i; + } + for (int i = 0; i < TABLES; i++) { + Table t = metadataFactory.addTable("x" + i); + for (int j = 0; j < COLS; j++) { + metadataFactory.addColumn(colNames[j], "string", t); + } + } + } + + @Override + public boolean isSourceRequiredForMetadata() { + return false; + } + }; + es.addTranslator(hardCodedExecutionFactory); + es.deployVDB("test", mmm); + } + + @After public void teardown() { + es.stop(); + } + + @Test public void testColumnPerformance() throws Exception { + Connection c = es.getDriver().connect("jdbc:teiid:test", null); + setConnection(c); + DatabaseMetaData metadata = c.getMetaData(); + System.out.println("starting"); + for (int i = 0; i < TABLES; i++) { + internalResultSet = metadata.getColumns(null, "test", "x" + i, null); + assertRowCount(COLS); + internalResultSet.close(); + } + } + +} Property changes on: trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestSystemPerformance.java ___________________________________________________________________ Added: svn:mime-type + text/plain