Author: shawkins
Date: 2012-07-18 22:57:49 -0400 (Wed, 18 Jul 2012)
New Revision: 4243
Added:
trunk/engine/src/main/resources/org/teiid/metadata/
trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql
trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
Removed:
trunk/engine/src/main/resources/org/teiid/datatypes/
Modified:
trunk/api/src/main/java/org/teiid/metadata/BaseColumn.java
trunk/api/src/main/java/org/teiid/metadata/Column.java
trunk/api/src/main/java/org/teiid/metadata/Datatype.java
trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java
trunk/api/src/main/java/org/teiid/metadata/Table.java
trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
trunk/engine/src/main/java/org/teiid/datatypes/SystemDataTypes.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingBaseNode.java
trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingElement.java
trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingNode.java
trunk/engine/src/main/java/org/teiid/query/metadata/DDLConstants.java
trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java
trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
trunk/engine/src/main/java/org/teiid/query/processor/relational/ListNestedSortComparator.java
trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
trunk/engine/src/main/resources/org/teiid/metadata/types.dat
trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java
trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.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/TestODBCSchema/test_PG_AM.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_DATABASE.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_TRIGGER.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_USER.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/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-2103 numerous metadata corrections to teiid types and the initial creation of system
vdb ddl
Modified: trunk/api/src/main/java/org/teiid/metadata/BaseColumn.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/BaseColumn.java 2012-07-17 01:00:58 UTC
(rev 4242)
+++ trunk/api/src/main/java/org/teiid/metadata/BaseColumn.java 2012-07-19 02:57:49 UTC
(rev 4243)
@@ -139,10 +139,21 @@
}
public void setDatatype(Datatype datatype) {
+ setDatatype(datatype, false);
+ }
+
+ public void setDatatype(Datatype datatype, boolean copyAttributes) {
this.datatype = datatype;
if (datatype != null) {
this.datatypeUUID = this.datatype.getUUID();
this.runtimeType = this.datatype.getRuntimeTypeName();
+ if (copyAttributes) {
+ this.radix = this.datatype.getRadix();
+ this.length = this.datatype.getLength();
+ this.precision = this.datatype.getPrecision();
+ this.scale = this.datatype.getScale();
+ this.nullType = this.datatype.getNullType();
+ }
}
}
Modified: trunk/api/src/main/java/org/teiid/metadata/Column.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Column.java 2012-07-17 01:00:58 UTC (rev
4242)
+++ trunk/api/src/main/java/org/teiid/metadata/Column.java 2012-07-19 02:57:49 UTC (rev
4243)
@@ -65,12 +65,28 @@
private int nullValues = -1;
private ColumnSet<?> parent;
+
+ @Override
+ public void setDatatype(Datatype datatype, boolean copyAttributes) {
+ super.setDatatype(datatype, copyAttributes);
+ if (datatype != null && copyAttributes) {
+ //if (DefaultDataTypes.STRING.equals(datatype.getRuntimeTypeName())) {
+ //TODO - this is not quite valid since we are dealing with length representing
chars in UTF-16, then there should be twice the bytes
+ //this.charOctetLength = datatype.getLength();
+ //}
+ this.signed = datatype.isSigned();
+ this.autoIncremented = datatype.isAutoIncrement();
+ this.caseSensitive = datatype.isCaseSensitive();
+ this.signed = datatype.isSigned();
+ }
+ }
+
public void setParent(ColumnSet<?> parent) {
this.parent = parent;
}
@Override
- public AbstractMetadataRecord getParent() {
+ public ColumnSet<?> getParent() {
return parent;
}
Modified: trunk/api/src/main/java/org/teiid/metadata/Datatype.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Datatype.java 2012-07-17 01:00:58 UTC (rev
4242)
+++ trunk/api/src/main/java/org/teiid/metadata/Datatype.java 2012-07-19 02:57:49 UTC (rev
4243)
@@ -53,20 +53,35 @@
private boolean isCaseSensitive;
private Type type;
private SearchType searchType;
- private NullType nullType;
+ private NullType nullType = NullType.Nullable;
private String javaClassName = DEFAULT_JAVA_CLASS_NAME;
private String runtimeTypeName;
private String basetypeName;
private Variety varietyType;
+ /**
+ * Get the length of the type.
+ *
+ * For string (binary or character) types, it is the number of characters.
+ * For all other types it is the byte storage size.
+ * @return
+ */
public int getLength() {
return this.length;
}
-
+
+ /**
+ * @deprecated
+ * @see #getPrecision()
+ */
public int getPrecisionLength() {
return this.precisionLength;
}
+ public int getPrecision() {
+ return this.precisionLength;
+ }
+
public int getScale() {
return this.scale;
}
@@ -172,6 +187,14 @@
/**
* @param i
*/
+ public void setPrecision(int i) {
+ precisionLength = i;
+ }
+
+ /**
+ * @deprecated
+ * @see #setPrecision(int)
+ */
public void setPrecisionLength(int i) {
precisionLength = i;
}
Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2012-07-17 01:00:58
UTC (rev 4242)
+++ trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2012-07-19 02:57:49
UTC (rev 4243)
@@ -30,7 +30,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
-import java.util.UUID;
import org.teiid.connector.DataPlugin;
import org.teiid.translator.TranslatorException;
@@ -54,16 +53,37 @@
private String rawMetadata;
private Properties importProperties;
private Schema schema = new Schema();
+ private String idPrefix;
+ private int count;
public MetadataFactory(String vdbName, int vdbVersion, String schemaName, Map<String,
Datatype> dataTypes, Properties importProperties, String rawMetadata) {
this.vdbName = vdbName;
this.vdbVersion = vdbVersion;
this.dataTypes = dataTypes;
schema.setName(schemaName);
+ long msb = longHash(vdbName, 0);
+ msb = 31*msb + vdbVersion;
+ msb = longHash(schemaName, msb);
+ idPrefix = "tid:" + hex(msb, 12); //$NON-NLS-1$
setUUID(schema);
this.importProperties = importProperties;
this.rawMetadata = rawMetadata;
}
+
+ private long longHash(String s, long h) {
+ if (s == null) {
+ return h;
+ }
+ for (int i = 0; i < s.length(); i++) {
+ h = 31*h + s.charAt(i);
+ }
+ return h;
+ }
+
+ private static String hex(long val, int hexLength) {
+ long hi = 1L << (hexLength * 4);
+ return Long.toHexString(hi | (val & (hi - 1))).substring(1);
+ }
public Properties getImportProperties() {
return importProperties;
@@ -72,9 +92,15 @@
public String getRawMetadata() {
return this.rawMetadata;
}
-
+
protected void setUUID(AbstractMetadataRecord record) {
- record.setUUID("mmuuid:" +UUID.randomUUID()); //$NON-NLS-1$
+ int lsb = 0;
+ if (record.getParent() != null) {
+ lsb = record.getParent().getUUID().hashCode();
+ }
+ lsb = 31*lsb + record.getName().hashCode();
+ String uuid = idPrefix+"-"+hex(lsb, 8) + "-" + hex(count++, 8);
//$NON-NLS-1$ //$NON-NLS-2$
+ record.setUUID(uuid);
}
public String getName() {
@@ -122,10 +148,7 @@
column.setName(name);
table.addColumn(column);
column.setPosition(table.getColumns().size()); //1 based indexing
- Datatype datatype = setColumnType(type, column);
- column.setCaseSensitive(datatype.isCaseSensitive());
- column.setAutoIncremented(datatype.isAutoIncrement());
- column.setSigned(datatype.isSigned());
+ setColumnType(type, column);
setUUID(column);
return column;
}
@@ -136,12 +159,7 @@
if (datatype == null) {
throw new TranslatorException(DataPlugin.Event.TEIID60009,
DataPlugin.Util.gs(DataPlugin.Event.TEIID60009, type));
}
- column.setDatatype(datatype);
- column.setDatatypeUUID(datatype.getUUID());
- column.setLength(datatype.getLength());
- column.setPrecision(datatype.getPrecisionLength());
- column.setRadix(datatype.getRadix());
- column.setRuntimeType(datatype.getRuntimeTypeName());
+ column.setDatatype(datatype, true);
return datatype;
}
Modified: trunk/api/src/main/java/org/teiid/metadata/Table.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Table.java 2012-07-17 01:00:58 UTC (rev
4242)
+++ trunk/api/src/main/java/org/teiid/metadata/Table.java 2012-07-19 02:57:49 UTC (rev
4243)
@@ -382,10 +382,30 @@
if (this.attachments == null) {
return null;
}
- Object result = this.attachments.get(type.getName());
+ Object result = this.attachments.get(type);
if (result == null)
return null;
return type.cast(result);
}
+ /**
+ * remove attachment
+ *
+ * @param <T> the expected type
+ * @param type the type
+ * @return the attachment or null if not present
+ * @throws IllegalArgumentException for a null name or type
+ */
+ synchronized public <T> T removeAttachment(Class<T> type) {
+ if (type == null)
+ throw new IllegalArgumentException("Null type"); //$NON-NLS-1$
+ if (this.attachments == null) {
+ return null;
+ }
+ Object result = this.attachments.remove(type);
+ if (result == null)
+ return null;
+ return type.cast(result);
+ }
+
}
\ No newline at end of file
Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-07-17 01:00:58 UTC
(rev 4242)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-07-19 02:57:49 UTC
(rev 4243)
@@ -48,9 +48,11 @@
<li>VDB.getUrl has been removed.
<li>VDB.Status now has three states - LOADING, ACTIVE, REMOVED. To check for
validity use the isValid method, rather than checking for the VALID state.
<li>The standalone and cli configuration files specify a setting for the teiid
subsystem policy-decider-module. If a module is not specified, then data roles will not
be checked.
- <li>local connections specifying a VDB version will wait for their VDB to finish
loading before allowing a connection.
+ <li>local connections specifying a VDB version will wait for their VDB to finish
loading before allowing a connection, see the waitForLoad connection property for more.
<li>jsonToXml document elements will contain xsi:type attribute values of decimal
and boolean respectively for number and boolean json values to allow for differentiation
from string values.
<li>Result set cache entries can now have updatable set to false to indicate that
updates should not purge the entry.
+ <li>Datatype default values have been corrected for Teiid built-in types. All
datatypes are now nullable by default, only character string types are case sensitive,
numeric types have radix 10, and length/precision/scale have been set appropriately.
+ <li>pg catalog and dynamic vdb created metadata will use a generated Teiid id
rather than a random UUID.
<ul>
<h4>from 7.x</h4>
Modified: trunk/engine/src/main/java/org/teiid/datatypes/SystemDataTypes.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/datatypes/SystemDataTypes.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/datatypes/SystemDataTypes.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -26,15 +26,32 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.types.DataTypeManager.DefaultDataTypes;
+import org.teiid.core.util.Assertion;
import org.teiid.core.util.PropertiesUtils;
import org.teiid.metadata.Datatype;
-import org.teiid.metadata.MetadataStore;
public class SystemDataTypes {
- public static void loadSystemDatatypes(MetadataStore ms) throws IOException {
- InputStream is =
SystemDataTypes.class.getClassLoader().getResourceAsStream("org/teiid/datatypes/types.dat");
//$NON-NLS-1$
+
+ private static SystemDataTypes INSTANCE = new SystemDataTypes();
+
+ public static SystemDataTypes getInstance() {
+ return INSTANCE;
+ }
+
+ private List<Datatype> dataTypes = new ArrayList<Datatype>();
+ private Map<String, Datatype> typeMap = new HashMap<String, Datatype>();
+
+ public SystemDataTypes() {
+ InputStream is =
SystemDataTypes.class.getClassLoader().getResourceAsStream("org/teiid/metadata/types.dat");
//$NON-NLS-1$
try {
InputStreamReader isr = new InputStreamReader(is, Charset.forName("UTF-8"));
//$NON-NLS-1$
BufferedReader br = new BufferedReader(isr);
@@ -50,10 +67,46 @@
}
}
PropertiesUtils.setBeanProperties(dt, p, null);
- ms.addDatatype(dt);
+ dataTypes.add(dt);
+ if (dt.isBuiltin()) {
+ typeMap.put(dt.getRuntimeTypeName(), dt);
+ }
}
+ } catch (IOException e) {
+ throw new TeiidRuntimeException(e);
} finally {
- is.close();
+ try {
+ is.close();
+ } catch (IOException e) {
+ throw new TeiidRuntimeException(e);
+ }
}
+ addAliasType(DataTypeManager.DataTypeAliases.BIGINT);
+ addAliasType(DataTypeManager.DataTypeAliases.DECIMAL);
+ addAliasType(DataTypeManager.DataTypeAliases.REAL);
+ addAliasType(DataTypeManager.DataTypeAliases.SMALLINT);
+ addAliasType(DataTypeManager.DataTypeAliases.TINYINT);
+ addAliasType(DataTypeManager.DataTypeAliases.VARCHAR);
+ for (String name : DataTypeManager.getAllDataTypeNames()) {
+ if (!name.equals(DefaultDataTypes.NULL)) {
+ Assertion.isNotNull(typeMap.get(name), name);
+ }
+ }
}
+
+ private void addAliasType(String alias) {
+ Class<?> typeClass = DataTypeManager.getDataTypeClass(alias);
+ String primaryType = DataTypeManager.getDataTypeName(typeClass);
+ Datatype dt = typeMap.get(primaryType);
+ Assertion.isNotNull(dt, alias);
+ typeMap.put(alias, dt);
+ }
+
+ public List<Datatype> getDataTypes() {
+ return dataTypes;
+ }
+
+ public Map<String, Datatype> getBuiltinTypeMap() {
+ return typeMap;
+ }
}
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-07-17
01:00:58 UTC (rev 4242)
+++
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -310,7 +310,7 @@
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.getPrecisionLength(),
+ 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++));
}
break;
Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingBaseNode.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingBaseNode.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingBaseNode.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -223,6 +223,16 @@
}
tables.add(tablename);
setProperty(MappingNodeConstants.Properties.TEMP_GROUP_NAMES, tables);
- }
+ }
+ @Override
+ public MappingNode clone() {
+ MappingBaseNode clone = (MappingBaseNode) super.clone();
+ List<String> staging = getStagingTables();
+ if (getStagingTables() != null && staging !=
MappingNodeConstants.Defaults.DEFAULT_VALUES.get(MappingNodeConstants.Properties.TEMP_GROUP_NAMES))
{
+ clone.setStagingTables(new ArrayList<String>(staging));
+ }
+ return clone;
+ }
+
}
Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingElement.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingElement.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingElement.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -333,6 +333,19 @@
}
return super.getSourceNode();
}
+
+ @Override
+ public MappingNode clone() {
+ MappingElement node = (MappingElement)super.clone();
+ if (namespace != null) {
+ node.namespace = new Namespace(namespace.getPrefix(), namespace.getUri());
+ }
+ Properties p =
(Properties)getProperty(MappingNodeConstants.Properties.NAMESPACE_DECLARATIONS);
+ if (p != null) {
+ node.setProperty(MappingNodeConstants.Properties.NAMESPACE_DECLARATIONS,
p.clone());
+ }
+ return node;
+ }
}
Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingNode.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingNode.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingNode.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -25,6 +25,7 @@
import java.io.PrintStream;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -482,9 +483,13 @@
MappingNode clone = (MappingNode) super.clone();
clone.children = new ArrayList<MappingNode>(children);
for (int i = 0; i < clone.children.size(); i++) {
- clone.children.set(i, clone.children.get(i).clone());
- clone.children.get(i).setParent(clone);
+ MappingNode childClone = clone.children.get(i).clone();
+ childClone.setParent(clone);
+ clone.children.set(i, childClone);
}
+ if (this.nodeProperties != null) {
+ this.nodeProperties = new HashMap<MappingNodeConstants.Properties,
Object>(this.nodeProperties);
+ }
return clone;
} catch (CloneNotSupportedException e) {
throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30463, e);
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/DDLConstants.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/DDLConstants.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/DDLConstants.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -56,4 +56,5 @@
public static final String INSTEAD_OF = "INSTEAD OF";//$NON-NLS-1$
public static final String CREATE_TRIGGER_ON = "CREATE TRIGGER
ON";//$NON-NLS-1$
public static final String FOREIGN_TABLE = "FOREIGN TABLE";//$NON-NLS-1$
+ public static final String UDT = "UDT";//$NON-NLS-1$
}
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -26,21 +26,40 @@
import static org.teiid.language.SQLConstants.Tokens.*;
import static org.teiid.query.metadata.DDLConstants.*;
+import java.util.Arrays;
import java.util.EnumSet;
+import java.util.HashSet;
import java.util.List;
import java.util.regex.Pattern;
import org.teiid.adminapi.Admin.SchemaObjectType;
+import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.util.StringUtil;
import org.teiid.language.SQLConstants;
import org.teiid.language.SQLConstants.NonReserved;
import org.teiid.metadata.*;
import org.teiid.metadata.BaseColumn.NullType;
import org.teiid.metadata.FunctionMethod.Determinism;
import org.teiid.metadata.ProcedureParameter.Type;
+import org.teiid.query.sql.visitor.SQLStringVisitor;
public class DDLStringVisitor {
private static final String TAB = "\t"; //$NON-NLS-1$
private static final String NEWLINE = "\n";//$NON-NLS-1$
+
+ private static final HashSet<String> LENGTH_DATATYPES = new
HashSet<String>(
+ Arrays.asList(
+ DataTypeManager.DefaultDataTypes.CHAR,
+ DataTypeManager.DefaultDataTypes.CLOB,
+ DataTypeManager.DefaultDataTypes.BLOB,
+ DataTypeManager.DefaultDataTypes.OBJECT,
+ DataTypeManager.DefaultDataTypes.XML,
+ DataTypeManager.DefaultDataTypes.STRING,
+ DataTypeManager.DefaultDataTypes.VARBINARY,
+ DataTypeManager.DefaultDataTypes.BIG_INTEGER));
+
+ private static final HashSet<String> PRECISION_DATATYPES = new
HashSet<String>(
+ Arrays.asList(DataTypeManager.DefaultDataTypes.BIG_DECIMAL));
protected StringBuilder buffer = new StringBuilder();
private boolean includeTables = true;
@@ -206,7 +225,7 @@
}
private void addCommonOptions(StringBuilder sb, AbstractMetadataRecord record) {
- if (record.getUUID() != null &&
!record.getUUID().startsWith("mmuuid:")) { //$NON-NLS-1$
+ if (record.getUUID() != null && !record.getUUID().startsWith("tid:"))
{ //$NON-NLS-1$
addOption(sb, UUID, record.getUUID());
}
if (record.getAnnotation() != null) {
@@ -361,7 +380,7 @@
}
if (column.getDefaultValue() != null) {
- buffer.append(SPACE).append(DEFAULT).append(SPACE).append(TICK).append(column.getDefaultValue()).append(TICK);
+ buffer.append(SPACE).append(DEFAULT).append(SPACE).append(TICK).append(StringUtil.replaceAll(column.getDefaultValue(),
TICK, TICK + TICK)).append(TICK);
}
// options
@@ -373,11 +392,17 @@
builder.append(column.getName());
}
if (includeType) {
- builder.append(SPACE).append(column.getDatatype().getName());
- if (column.getLength() != 0) {
- builder.append(LPAREN).append(column.getLength()).append(RPAREN);
+ String runtimeTypeName = column.getDatatype().getRuntimeTypeName();
+ if (includeName) {
+ builder.append(SPACE);
}
- else if (column.getPrecision() != 0){
+ builder.append(runtimeTypeName);
+ if (LENGTH_DATATYPES.contains(runtimeTypeName)) {
+ if (column.getLength() != 0 && column.getLength() !=
column.getDatatype().getLength()) {
+ builder.append(LPAREN).append(column.getLength()).append(RPAREN);
+ }
+ } else if (PRECISION_DATATYPES.contains(runtimeTypeName)
+ && (column.getPrecision() != column.getDatatype().getPrecision() ||
column.getScale() != column.getDatatype().getScale())) {
builder.append(LPAREN).append(column.getPrecision());
if (column.getScale() != 0) {
builder.append(COMMA).append(column.getScale());
@@ -394,8 +419,11 @@
StringBuilder options = new StringBuilder();
addCommonOptions(options, column);
- // 10 is default assumed
- if (column.getRadix() != column.getDatatype().getRadix()) {
+ if (!column.getDatatype().isBuiltin()) {
+ addOption(options, UDT, column.getDatatype().getName() +
"("+column.getLength()+ ", " +column.getPrecision()+", " +
column.getScale()+ ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
//$NON-NLS-4$
+ }
+
+ if (column.getDatatype().getRadix() != 0 && column.getRadix() !=
column.getDatatype().getRadix()) {
addOption(options, RADIX, column.getRadix());
}
@@ -423,17 +451,18 @@
}
// only record if not default
- if (column.isCaseSensitive() && !column.getDatatype().isCaseSensitive()) {
- addOption(options, CASE_SENSITIVE, String.valueOf(column.isCaseSensitive()));
+ if (!column.isCaseSensitive() && column.getDatatype().isCaseSensitive()) {
+ addOption(options, CASE_SENSITIVE, column.isCaseSensitive());
}
- if (column.isSigned() && !column.getDatatype().isSigned()) {
- addOption(options, SIGNED, String.valueOf(column.isSigned()));
+ if (!column.isSigned() && column.getDatatype().isSigned()) {
+ addOption(options, SIGNED, column.isSigned());
}
if (column.isFixedLength()) {
- addOption(options, FIXED_LENGTH, String.valueOf(column.isFixedLength()));
+ addOption(options, FIXED_LENGTH, column.isFixedLength());
}
// length and octet length should be same. so this should be never be true.
+ //TODO - this is not quite valid since we are dealing with length representing chars in
UTF-16, then there should be twice the bytes
if (column.getCharOctetLength() != 0 && column.getLength() !=
column.getCharOctetLength()) {
addOption(options, CHAR_OCTET_LENGTH, column.getCharOctetLength());
}
@@ -474,16 +503,12 @@
if (sb.length() != 0) {
sb.append(COMMA).append(SPACE);
}
- sb.append(key).append(SPACE).append(TICK).append(value).append(TICK);
+ if (value instanceof String) {
+ value = TICK + StringUtil.replaceAll((String)value, TICK, TICK + TICK) + TICK;
+ }
+ sb.append(SQLStringVisitor.escapeSinglePart(key)).append(SPACE).append(value);
}
- private void addOption(StringBuilder sb, String key, int value) {
- if (sb.length() != 0) {
- sb.append(COMMA).append(SPACE);
- }
- sb.append(key).append(SPACE).append(value);
- }
-
private void visit(Procedure procedure) {
if (this.filter != null && !filter.matcher(procedure.getName()).matches()) {
return;
@@ -501,16 +526,13 @@
boolean first = true;
for (ProcedureParameter pp:procedure.getParameters()) {
- Type type = pp.getType();
- if (type == Type.In || type == Type.InOut || type == Type.Out) {
- if (first) {
- first = false;
- }
- else {
- buffer.append(COMMA).append(SPACE);
- }
- visit(pp);
+ if (first) {
+ first = false;
}
+ else {
+ buffer.append(COMMA).append(SPACE);
+ }
+ visit(pp);
}
buffer.append(RPAREN);
@@ -518,13 +540,14 @@
buffer.append(SPACE).append(RETURNS).append(SPACE).append(TABLE).append(SPACE);
addColumns(buffer, procedure.getResultSet().getColumns(), true);
}
- for (ProcedureParameter pp: procedure.getParameters()) {
+ /* The parser treats the RETURN clause as optional for a procedure if using the RESULT
param
+ for (ProcedureParameter pp: procedure.getParameters()) {
if (pp.getType().equals(Type.ReturnValue)) {
buffer.append(SPACE).append(RETURNS).append(SPACE);
appendColumn(buffer, pp, false, true);
break;
}
- }
+ }*/
//options
String options = buildProcedureOptions(procedure);
@@ -538,7 +561,6 @@
buffer.append(plan);
}
}
-
private String buildProcedureOptions(Procedure procedure) {
StringBuilder options = new StringBuilder();
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -21,15 +21,14 @@
*/
package org.teiid.query.metadata;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.core.TeiidException;
+import org.teiid.core.types.DataTypeManager;
import org.teiid.language.SQLConstants;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
@@ -170,7 +169,7 @@
metadataValidator.log(report, model,
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31079, t.getName(), model.getName()));
}
else {
- metadataValidator.validate(vdb, model, t, store, report);
+ metadataValidator.validate(vdb, model, t, report);
}
}
}
@@ -181,7 +180,7 @@
metadataValidator.log(report, model,
QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31081, p.getName(), model.getName()));
}
else {
- metadataValidator.validate(vdb, model, p, store, report);
+ metadataValidator.validate(vdb, model, p, report);
}
}
}
@@ -195,7 +194,7 @@
report.handleValidationError(msg);
}
- private void validate(VDBMetaData vdb, ModelMetaData model, AbstractMetadataRecord
record, MetadataStore store, ValidatorReport report) {
+ private void validate(VDBMetaData vdb, ModelMetaData model, AbstractMetadataRecord
record, ValidatorReport report) {
QueryMetadataInterface metadata = vdb.getAttachment(QueryMetadataInterface.class);
metadata = new TempMetadataAdapter(metadata, new TempMetadataStore()); //TODO:
optimize this
ValidatorReport resolverReport = null;
@@ -214,9 +213,10 @@
resolverReport = Validator.validate(command, metadata);
if(!resolverReport.hasItems()) {
List<Expression> symbols = command.getProjectedSymbols();
+ MetadataFactory mf = t.removeAttachment(MetadataFactory.class);
for (Expression column:symbols) {
try {
- addColumn(Symbol.getShortName(column), getDataType(store.getDatatypes().values(),
column.getType()), t);
+ addColumn(Symbol.getShortName(column), column.getType(), t, mf);
} catch (TranslatorException e) {
log(report, model, e.getMessage());
}
@@ -242,37 +242,12 @@
}
}
- private Datatype getDataType(Collection<Datatype> dataTypes, Class<?> clazz)
{
- for (Datatype type:dataTypes) {
- if (type.getJavaClassName().equals(clazz.getName())) {
- return type;
- }
- }
- return null;
- }
-
- private Column addColumn(String name, Datatype type, Table table) throws
TranslatorException {
- Column column = new Column();
- column.setName(name);
- if (table.getColumnByName(name) != null) {
- throw new TranslatorException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31087, name,
table.getFullName()));
- }
- column.setUpdatable(table.supportsUpdate());
- table.addColumn(column);
- column.setPosition(table.getColumns().size()); //1 based indexing
+ private Column addColumn(String name, Class<?> type, Table table, MetadataFactory
mf) throws TranslatorException {
if (type == null) {
throw new TranslatorException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31086, name,
table.getFullName()));
}
- column.setDatatype(type);
- column.setDatatypeUUID(type.getUUID());
- column.setLength(type.getLength());
- column.setPrecision(type.getPrecisionLength());
- column.setRadix(type.getRadix());
- column.setRuntimeType(type.getRuntimeTypeName());
- column.setCaseSensitive(type.isCaseSensitive());
- column.setAutoIncremented(type.isAutoIncrement());
- column.setSigned(type.isSigned());
- column.setUUID("mmuuid:" +UUID.randomUUID()); //$NON-NLS-1$
+ Column column = mf.addColumn(name, DataTypeManager.getDataTypeName(type), table);
+ column.setUpdatable(table.supportsUpdate());
return column;
}
Modified: trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-07-17 01:00:58
UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-07-19 02:57:49
UTC (rev 4243)
@@ -22,6 +22,7 @@
package org.teiid.query.parser;
+import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
@@ -77,14 +78,17 @@
}
/**
- * Helper method to get a SQLParser instace for given sql string.
+ * Helper method to get a SQLParser instance for given sql string.
*/
private SQLParser getSqlParser(String sql) {
- sql = sql != null ? sql : ""; //$NON-NLS-1$
+ return getSqlParser(new StringReader(sql));
+ }
+
+ private SQLParser getSqlParser(Reader sql) {
if(parser == null) {
- parser = new SQLParser(new StringReader(sql));
+ parser = new SQLParser(sql);
} else {
- parser.ReInit(new StringReader(sql));
+ parser.ReInit(sql);
}
return parser;
}
@@ -352,6 +356,10 @@
}
public void parseDDL(MetadataFactory factory, String ddl) throws ParseException {
+ parseDDL(factory, new StringReader(ddl));
+ }
+
+ public void parseDDL(MetadataFactory factory, Reader ddl) throws ParseException {
getSqlParser(ddl).parseMetadata(factory);
HashSet<FunctionMethod> functions = new HashSet<FunctionMethod>();
for (FunctionMethod functionMethod : factory.getSchema().getFunctions().values()) {
Modified: trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -494,7 +494,7 @@
throw new
ParseException(QueryPlugin.Util.getString("SQLParser.function_in",
proc.getName())); //$NON-NLS-1$
}
- FunctionParameter fp = new FunctionParameter(pp.getName(), pp.getDatatype().getName(),
pp.getAnnotation());
+ FunctionParameter fp = new FunctionParameter(pp.getName(), pp.getRuntimeType(),
pp.getAnnotation());
if (pp.getType() == ProcedureParameter.Type.In) {
fp.setVarArg(pp.isVarArg());
ins.add(fp);
Modified:
trunk/engine/src/main/java/org/teiid/query/processor/relational/ListNestedSortComparator.java
===================================================================
---
trunk/engine/src/main/java/org/teiid/query/processor/relational/ListNestedSortComparator.java 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/engine/src/main/java/org/teiid/query/processor/relational/ListNestedSortComparator.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -156,10 +156,10 @@
// param1 = null, so is less than a non-null
compare = -1;
NullOrdering no = getNullOrdering(k);
- if (no != null) {
- if (nullOrdering.get(k) == NullOrdering.FIRST) {
- return -1;
- }
+ if (no == NullOrdering.FIRST) {
+ return -1;
+ }
+ if (no == NullOrdering.LAST) {
return 1;
}
}
@@ -167,10 +167,10 @@
// param1 != null, param2 == null
compare = 1;
NullOrdering no = getNullOrdering(k);
- if (no != null) {
- if (nullOrdering.get(k) == NullOrdering.FIRST) {
- return 1;
- }
+ if (no == NullOrdering.FIRST) {
+ return 1;
+ }
+ if (no == NullOrdering.LAST) {
return -1;
}
} else {
Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
===================================================================
--- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-07-17 01:00:58
UTC (rev 4242)
+++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-07-19 02:57:49
UTC (rev 4243)
@@ -3920,18 +3920,18 @@
(typeToken = <STRING>
([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} ) |
(typeToken = <VARCHAR>
([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} ) |
typeToken = <BOOLEAN> |
- (typeToken = <BYTE>
([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} ) |
- (typeToken = <TINYINT>
[<LPAREN>lengthToken=<INTEGERVAL><RPAREN>] ) |
- (typeToken = <SHORT> [<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]
) |
- (typeToken = <SMALLINT>
[<LPAREN>lengthToken=<INTEGERVAL><RPAREN>] ) |
+ typeToken = <BYTE> |
+ typeToken = <TINYINT> |
+ typeToken = <SHORT> |
+ typeToken = <SMALLINT> |
(typeToken = <CHAR>
([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} ) |
- (typeToken = <INTEGER>
[<LPAREN>lengthToken=<INTEGERVAL><RPAREN>] ) |
- (typeToken = <LONG> [<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]
) |
- (typeToken = <BIGINT>
[<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) |
+ typeToken = <INTEGER> |
+ typeToken = <LONG> |
+ typeToken = <BIGINT> |
(typeToken = <BIGINTEGER>
[<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) |
- (typeToken = <FLOAT>
[<LPAREN>lengthToken=<INTEGERVAL>[<COMMA>scaleToken=<INTEGERVAL>]<RPAREN>])
|
- (typeToken = <REAL>
[<LPAREN>lengthToken=<INTEGERVAL>[<COMMA>scaleToken=<INTEGERVAL>]<RPAREN>])|
- (typeToken = <DOUBLE>
[<LPAREN>lengthToken=<INTEGERVAL>[<COMMA>scaleToken=<INTEGERVAL>]<RPAREN>])|
+ typeToken = <FLOAT> |
+ typeToken = <REAL> |
+ typeToken = <DOUBLE> |
(typeToken = <BIGDECIMAL>
[<LPAREN>lengthToken=<INTEGERVAL>[<COMMA>scaleToken=<INTEGERVAL>]<RPAREN>])|
(typeToken = <DECIMAL>
[<LPAREN>lengthToken=<INTEGERVAL>[<COMMA>scaleToken=<INTEGERVAL>]<RPAREN>])|
typeToken = <DATE> |
@@ -4280,7 +4280,9 @@
}
table.setSelectTransformation((comment != null?comment.image+"
":"") + query.toString());
}
- if (!table.supportsUpdate() && table.getColumns() != null) {
+ if (table.getColumns() == null) {
+ table.addAttchment(MetadataFactory.class, factory);
+ } else if (!table.supportsUpdate()) {
for (Column c : table.getColumns()) {
c.setUpdatable(false);
}
Added: trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql
===================================================================
--- trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql
(rev 0)
+++ trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql 2012-07-19 02:57:49 UTC
(rev 4243)
@@ -0,0 +1,171 @@
+CREATE FOREIGN TABLE Columns (
+ VDBName string(255) NOT NULL,
+ SchemaName string(255),
+ TableName string(255) NOT NULL,
+ Name string(255) NOT NULL,
+ Position integer NOT NULL,
+ NameInSource string(255),
+ DataType string(100) NOT NULL,
+ Scale integer NOT NULL,
+ Length integer NOT NULL,
+ IsLengthFixed boolean NOT NULL,
+ SupportsSelect boolean NOT NULL,
+ SupportsUpdates boolean NOT NULL,
+ IsCaseSensitive boolean NOT NULL,
+ IsSigned boolean NOT NULL,
+ IsCurrency boolean NOT NULL,
+ IsAutoIncremented boolean NOT NULL,
+ NullType string(20) NOT NULL,
+ MinRange string(50),
+ MaxRange string(50),
+ DistinctCount integer,
+ NullCount integer,
+ SearchType string(20) NOT NULL,
+ Format string(255),
+ DefaultValue string(255),
+ JavaClass string(500) NOT NULL,
+ Precision integer NOT NULL,
+ CharOctetLength integer,
+ Radix integer NOT NULL,
+ UID string(50) NOT NULL,
+ Description string(255),
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE DataTypes (
+ Name string(100) NOT NULL,
+ IsStandard boolean,
+ IsPhysical boolean,
+ TypeName string(100) NOT NULL,
+ JavaClass string(500) NOT NULL,
+ Scale integer,
+ TypeLength integer NOT NULL,
+ NullType string(20) NOT NULL,
+ IsSigned boolean NOT NULL,
+ IsAutoIncremented boolean NOT NULL,
+ IsCaseSensitive boolean NOT NULL,
+ Precision integer NOT NULL,
+ Radix integer,
+ SearchType string(20) NOT NULL,
+ UID string(50) NOT NULL,
+ RuntimeType string(64),
+ BaseType string(64),
+ Description string(255),
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE KeyColumns (
+ VDBName string(255) NOT NULL,
+ SchemaName string(255),
+ TableName string(2048) NOT NULL,
+ Name string(255) NOT NULL,
+ KeyName string(255),
+ KeyType string(20) NOT NULL,
+ RefKeyUID string(50),
+ UID string(50) NOT NULL,
+ Position integer,
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE Keys (
+ VDBName string(255) NOT NULL,
+ SchemaName string(255),
+ TableName string(2048) NOT NULL,
+ Name string(255) NOT NULL,
+ Description string(255),
+ NameInSource string(255),
+ Type string(20) NOT NULL,
+ IsIndexed boolean NOT NULL,
+ RefKeyUID string(50),
+ UID string(50) NOT NULL,
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE ProcedureParams (
+ VDBName string(255) NOT NULL,
+ SchemaName string(255),
+ ProcedureName string(255) NOT NULL,
+ Name string(255) NOT NULL,
+ DataType string(25) NOT NULL,
+ Position integer NOT NULL,
+ Type string(100) NOT NULL,
+ Optional boolean NOT NULL,
+ Precision integer NOT NULL,
+ TypeLength integer NOT NULL,
+ Scale integer NOT NULL,
+ Radix integer NOT NULL,
+ NullType string(10) NOT NULL,
+ UID string(50),
+ Description string(255),
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE Procedures (
+ VDBName string(255) NOT NULL,
+ SchemaName string(255),
+ Name string(255) NOT NULL,
+ NameInSource string(255),
+ ReturnsResults boolean NOT NULL,
+ UID string(50) NOT NULL,
+ Description string(255),
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE Properties (
+ Name string(255) NOT NULL,
+ Value string(255) NOT NULL,
+ UID string(50) NOT NULL,
+ OID integer NOT NULL,
+ ClobValue clob(2097152)
+);
+
+CREATE FOREIGN TABLE ReferenceKeyColumns (
+ PKTABLE_CAT string(255),
+ PKTABLE_SCHEM string(255),
+ PKTABLE_NAME string(255),
+ PKCOLUMN_NAME string(255),
+ FKTABLE_CAT string(255),
+ FKTABLE_SCHEM string(255),
+ FKTABLE_NAME string(255),
+ FKCOLUMN_NAME string(255),
+ KEY_SEQ short,
+ UPDATE_RULE integer,
+ DELETE_RULE integer,
+ FK_NAME string(255),
+ PK_NAME string(255),
+ DEFERRABILITY integer
+);
+
+CREATE FOREIGN TABLE Schemas (
+ VDBName string(255),
+ Name string(255),
+ IsPhysical boolean NOT NULL,
+ UID string(50) NOT NULL,
+ Description string(255),
+ PrimaryMetamodelURI string(255) NOT NULL,
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE Tables (
+ VDBName string(255),
+ SchemaName string(255),
+ Name string(255) NOT NULL,
+ Type string(20) NOT NULL,
+ NameInSource string(255),
+ IsPhysical boolean NOT NULL,
+ SupportsUpdates boolean NOT NULL,
+ UID string(50) NOT NULL,
+ Cardinality integer NOT NULL,
+ Description string(255),
+ IsSystem boolean,
+ IsMaterialized boolean NOT NULL,
+ OID integer NOT NULL
+);
+
+CREATE FOREIGN TABLE VirtualDatabases (
+ Name string(255) NOT NULL,
+ Version string(50) NOT NULL
+);
+
+CREATE FOREIGN PROCEDURE getXMLSchemas(IN document string NOT NULL) RETURNS TABLE (schema
xml)
+OPTIONS (UPDATECOUNT 0)
Added: trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
===================================================================
--- trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
(rev 0)
+++ trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql 2012-07-19 02:57:49
UTC (rev 4243)
@@ -0,0 +1,37 @@
+CREATE FOREIGN TABLE MatViews (
+ VDBName string(255) NOT NULL,
+ SchemaName string(255) NOT NULL,
+ Name string(255) NOT NULL,
+ TargetSchemaName string(255),
+ TargetName string,
+ Valid boolean,
+ LoadState string(255),
+ Updated timestamp,
+ Cardinality integer
+);
+
+CREATE FOREIGN TABLE VDBResources (
+ resourcePath string(255),
+ contents blob
+);
+
+CREATE FOREIGN PROCEDURE isLoggable(OUT loggable boolean NOT NULL RESULT, IN level string
NOT NULL, IN context string NOT NULL)
+OPTIONS (UPDATECOUNT 0)
+
+CREATE FOREIGN PROCEDURE logMsg(OUT logged boolean NOT NULL RESULT, IN level string NOT
NULL, IN context string NOT NULL, IN msg object NOT NULL)
+OPTIONS (UPDATECOUNT 0)
+
+CREATE FOREIGN PROCEDURE refreshMatView(IN ViewName string NOT NULL, IN Invalidate
boolean NOT NULL, OUT RowsUpdated integer NOT NULL RESULT)
+OPTIONS (UPDATECOUNT 0)
+
+CREATE FOREIGN PROCEDURE refreshMatViewRow(IN ViewName string NOT NULL, IN Key object NOT
NULL, OUT RowsUpdated integer NOT NULL RESULT)
+OPTIONS (UPDATECOUNT 0)
+
+CREATE FOREIGN PROCEDURE setColumnStats(IN tableName string NOT NULL, IN columnName
string NOT NULL, IN distinctCount integer, IN nullCount integer, IN max string, IN min
string)
+OPTIONS (UPDATECOUNT 0)
+
+CREATE FOREIGN PROCEDURE setProperty(OUT OldValue clob(2097152) NOT NULL RESULT, IN UID
string(50) NOT NULL, IN Name string NOT NULL, IN Value clob(2097152))
+OPTIONS (UPDATECOUNT 0)
+
+CREATE FOREIGN PROCEDURE setTableStats(IN tableName string NOT NULL, IN cardinality
integer NOT NULL)
+OPTIONS (UPDATECOUNT 0)
Modified: trunk/engine/src/main/resources/org/teiid/metadata/types.dat
===================================================================
--- trunk/engine/src/main/resources/org/teiid/datatypes/types.dat 2012-07-13 13:14:44 UTC
(rev 4237)
+++ trunk/engine/src/main/resources/org/teiid/metadata/types.dat 2012-07-19 02:57:49 UTC
(rev 4243)
@@ -1,54 +1,54 @@
-UUID|annotation|autoIncrement|basetypeName|caseSensitive|javaClassName|length|name|nameInSource|nullType|precisionLength|radix|runtimeTypeName|scale|searchType|signed|type|varietyType
-mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32||false|string|false|org.teiid.core.types.XMLType|0|XMLLiteral|XMLLiteral|No_Nulls|0|0|xml|0|Searchable|false|UserDefined|Atomic
-mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d||false|decimal|false|java.math.BigDecimal|0|bigdecimal|bigdecimal|No_Nulls|0|0|bigdecimal|0|Searchable|false|UserDefined|Atomic
-mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d||false|decimal|false|java.math.BigInteger|0|biginteger|biginteger|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95||false|base64Binary|false|org.teiid.core.types.BlobType|0|blob|blob|No_Nulls|0|0|blob|0|Searchable|false|UserDefined|Atomic
-mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d||false|string|false|java.lang.Character|0|char|char|No_Nulls|0|0|char|0|Searchable|false|UserDefined|Atomic
-mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3||false|string|false|org.teiid.core.types.ClobType|0|clob|clob|No_Nulls|0|0|clob|0|Searchable|false|UserDefined|Atomic
-mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79||false|base64Binary|false|java.lang.Object|0|object|object|No_Nulls|0|0|object|0|Searchable|false|UserDefined|Atomic
-mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d||false|string|false|java.sql.Timestamp|0|timestamp|timestamp|No_Nulls|0|0|timestamp|0|Searchable|false|UserDefined|Atomic
-mmuuid:20360100-e742-1e20-8c26-a038c6ed7576||false|ENTITY|false|java.lang.String|0|ENTITIES|ENTITIES|No_Nulls|0|0|string|0|Searchable|false|UserDefined|List
-mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576||false|NCName|false|java.lang.String|0|ENTITY|ENTITY|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576||false|IDREF|false|java.lang.String|0|IDREFS|IDREFS|No_Nulls|0|0|string|0|Searchable|false|UserDefined|List
-mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576||false|NCName|false|java.lang.String|0|IDREF|IDREF|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576||false|NCName|false|java.lang.String|0|ID|ID|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576||false|Name|false|java.lang.String|0|NCName|NCName|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576||false|NMTOKEN|false|java.lang.String|0|NMTOKENS|NMTOKENS|No_Nulls|0|0|string|0|Searchable|false|UserDefined|List
-mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879||false|token|false|java.lang.String|0|NMTOKEN|NMTOKEN|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e||false|anySimpleType|false|java.lang.String|0|NOTATION|NOTATION|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576||false|token|false|java.lang.String|0|Name|Name|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e||false|anySimpleType|false|java.lang.String|0|QName|QName|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e||false|anySimpleType|false|java.lang.String|0|anyURI|anyURI|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7||false|anySimpleType|false|java.lang.String|0|base64Binary|base64Binary|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7||false|anySimpleType|false|java.lang.Boolean|0|boolean|boolean|No_Nulls|0|0|boolean|0|Searchable|false|UserDefined|Atomic
-mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016||false|short|false|java.lang.Byte|0|byte|byte|No_Nulls|0|0|byte|0|Searchable|false|UserDefined|Atomic
-mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21||false|anySimpleType|false|java.sql.Timestamp|0|dateTime|dateTime|No_Nulls|0|0|timestamp|0|Searchable|false|UserDefined|Atomic
-mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7||false|anySimpleType|false|java.sql.Date|0|date|date|No_Nulls|0|0|date|0|Searchable|false|UserDefined|Atomic
-mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7||false|anySimpleType|false|java.math.BigDecimal|0|decimal|decimal|No_Nulls|0|0|bigdecimal|0|Searchable|false|UserDefined|Atomic
-mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7||false|anySimpleType|false|java.lang.Double|0|double|double|No_Nulls|0|0|double|0|Searchable|false|UserDefined|Atomic
-mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21||false|anySimpleType|false|java.lang.String|0|duration|duration|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7||false|anySimpleType|false|java.lang.Float|0|float|float|No_Nulls|0|0|float|0|Searchable|false|UserDefined|Atomic
-mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21||false|anySimpleType|false|java.math.BigInteger|0|gDay|gDay|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21||false|anySimpleType|false|java.sql.Timestamp|0|gMonthDay|gMonthDay|No_Nulls|0|0|timestamp|0|Searchable|false|UserDefined|Atomic
-mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21||false|anySimpleType|false|java.math.BigInteger|0|gMonth|gMonth|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21||false|anySimpleType|false|java.sql.Timestamp|0|gYearMonth|gYearMonth|No_Nulls|0|0|timestamp|0|Searchable|false|UserDefined|Atomic
-mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21||false|anySimpleType|false|java.math.BigInteger|0|gYear|gYear|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7||false|anySimpleType|false|java.lang.String|0|hexBinary|hexBinary|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576||false|decimal|false|java.math.BigInteger|0|integer|integer|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016||false|long|false|java.lang.Integer|0|int|int|No_Nulls|0|0|integer|0|Searchable|false|UserDefined|Atomic
-mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576||false|token|false|java.lang.String|0|language|language|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016||false|integer|false|java.lang.Long|0|long|long|No_Nulls|0|0|long|0|Searchable|false|UserDefined|Atomic
-mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016||false|nonPositiveInteger|false|java.math.BigInteger|0|negativeInteger|negativeInteger|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016||false|integer|false|java.math.BigInteger|0|nonNegativeInteger|nonNegativeInteger|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576||false|integer|false|java.math.BigInteger|0|nonPositiveInteger|nonPositiveInteger|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:4df43700-3b13-1e20-921b-eeee28353879||false|string|false|java.lang.String|0|normalizedString|normalizedString|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016||false|nonNegativeInteger|false|java.math.BigInteger|0|positiveInteger|positiveInteger|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016||false|int|false|java.lang.Short|0|short|short|No_Nulls|0|0|short|0|Searchable|false|UserDefined|Atomic
-mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7||false|anySimpleType|false|java.lang.String|0|string|string|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7||false|anySimpleType|false|java.sql.Time|0|time|time|No_Nulls|0|0|time|0|Searchable|false|UserDefined|Atomic
-mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a||false|normalizedString|false|java.lang.String|0|token|token|No_Nulls|0|0|string|0|Searchable|false|UserDefined|Atomic
-mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016||false|unsignedShort|false|java.lang.Short|0|unsignedByte|unsignedByte|No_Nulls|0|0|short|0|Searchable|false|UserDefined|Atomic
-mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016||false|unsignedLong|false|java.lang.Long|0|unsignedInt|unsignedInt|No_Nulls|0|0|long|0|Searchable|false|UserDefined|Atomic
-mmuuid:54b98780-ba14-1e21-b812-969c8fc8b016||false|nonNegativeInteger|false|java.math.BigInteger|0|unsignedLong|unsignedLong|No_Nulls|0|0|biginteger|0|Searchable|false|UserDefined|Atomic
-mmuuid:327093c0-ba88-1e21-b812-969c8fc8b016||false|unsignedInt|false|java.lang.Integer|0|unsignedShort|unsignedShort|No_Nulls|0|0|integer|0|Searchable|false|UserDefined|Atomic
-mmuuid:182fd511-1a3e-447a-a6ea-72569d6a22ec||false|base64Binary|false|org.teiid.core.types.BinaryType|0|varbinary|varbinary|No_Nulls|0|0|varbinary|0|Searchable|false|UserDefined|Atomic
\ No newline at end of file
+UUID|annotation|autoIncrement|basetypeName|caseSensitive|javaClassName|length|name|nameInSource|nullType|precision|radix|runtimeTypeName|scale|searchType|signed|type|varietyType
+mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32|||string|true|org.teiid.core.types.XMLType|2147483647|XMLLiteral|XMLLiteral||0||xml|0|Searchable||Basic|Atomic
+mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7|||anySimpleType|false|java.math.BigDecimal|2147483647|decimal|decimal||2147483647|10|bigdecimal|2147483647|Searchable|true|Basic|Atomic
+mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d|||decimal|false|java.math.BigDecimal|2147483647|bigdecimal|bigdecimal||2147483647|10|bigdecimal|2147483647|Searchable|true|Basic|Atomic
+mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d|||decimal|false|java.math.BigInteger|2147483647|biginteger|biginteger||2147483647|10|biginteger|0|Searchable|true|Basic|Atomic
+mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95|||base64Binary|false|org.teiid.core.types.BlobType|2147483647|blob|blob||0||blob|0|Unsearchable||Basic|Atomic
+mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d|||string|true|java.lang.Character|1|char|char||0||char|0|Searchable||Basic|Atomic
+mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3|||string|true|org.teiid.core.types.ClobType|2147483647|clob|clob||0||clob|0|Like_Only||Basic|Atomic
+mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79|||base64Binary|false|java.lang.Object|2147483647|object|object||0||object|0|Unsearchable||Basic|Atomic
+mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d|||string|true|java.sql.Timestamp|12|timestamp|timestamp||0||timestamp|0|Searchable||Basic|Atomic
+mmuuid:20360100-e742-1e20-8c26-a038c6ed7576|||ENTITY|true|java.lang.String|4000|ENTITIES|ENTITIES||0||string|0|Searchable||UserDefined|List
+mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576|||NCName|true|java.lang.String|4000|ENTITY|ENTITY||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576|||IDREF|true|java.lang.String|4000|IDREFS|IDREFS||0||string|0|Searchable||UserDefined|List
+mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576|||NCName|true|java.lang.String|4000|IDREF|IDREF||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576|||NCName|true|java.lang.String|4000|ID|ID||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576|||Name|true|java.lang.String|4000|NCName|NCName||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576|||NMTOKEN|true|java.lang.String|4000|NMTOKENS|NMTOKENS||0||string|0|Searchable||UserDefined|List
+mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879|||token|true|java.lang.String|4000|NMTOKEN|NMTOKEN||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e|||anySimpleType|true|java.lang.String|4000|NOTATION|NOTATION||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576|||token|true|java.lang.String|4000|Name|Name||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e|||anySimpleType|true|java.lang.String|4000|QName|QName||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e|||anySimpleType|true|java.lang.String|4000|anyURI|anyURI||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7|||anySimpleType|true|java.lang.String|4000|base64Binary|base64Binary||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7|||anySimpleType|false|java.lang.Boolean|1|boolean|boolean||1|10|boolean|0|Searchable||Basic|Atomic
+mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016|||short|false|java.lang.Byte|1|byte|byte||3|10|byte|0|Searchable|true|Basic|Atomic
+mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21|||anySimpleType|false|java.sql.Timestamp|12|dateTime|dateTime||0||timestamp|0|Searchable||Basic|Atomic
+mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7|||anySimpleType|false|java.sql.Date|4|date|date||0||date|0|Searchable||Basic|Atomic
+mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7|||anySimpleType|false|java.lang.Double|8|double|double||17|10|double|4|Searchable|true|Basic|Atomic
+mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21|||anySimpleType|true|java.lang.String|4000|duration|duration||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7|||anySimpleType|false|java.lang.Float|4|float|float||7|10|float|3|Searchable|true|Basic|Atomic
+mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21|||anySimpleType|false|java.math.BigInteger|2147483647|gDay|gDay||0|10|biginteger|0|Searchable|false|UserDefined|Atomic
+mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21|||anySimpleType|false|java.sql.Timestamp|12|gMonthDay|gMonthDay||0||timestamp|0|Searchable||UserDefined|Atomic
+mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21|||anySimpleType|false|java.math.BigInteger|2147483647|gMonth|gMonth||0|10|biginteger|0|Searchable|false|UserDefined|Atomic
+mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21|||anySimpleType|false|java.sql.Timestamp|12|gYearMonth|gYearMonth||0||timestamp|0|Searchable||UserDefined|Atomic
+mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21|||anySimpleType|false|java.math.BigInteger|2147483647|gYear|gYear||2147483647|10|biginteger|0|Searchable|true|UserDefined|Atomic
+mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7|||anySimpleType|true|java.lang.String|4000|hexBinary|hexBinary||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576|||decimal|false|java.math.BigInteger|2147483647|integer|integer||2147483647|10|biginteger|0|Searchable|true|UserDefined|Atomic
+mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016|||long|false|java.lang.Integer|4|int|int||10|10|integer|0|Searchable|true|Basic|Atomic
+mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576|||token|true|java.lang.String|4000|language|language||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016|||integer|false|java.lang.Long|8|long|long||19|10|long|0|Searchable|true|Basic|Atomic
+mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016|||nonPositiveInteger|false|java.math.BigInteger|2147483647|negativeInteger|negativeInteger||2147483647|10|biginteger|0|Searchable|true|UserDefined|Atomic
+mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016|||integer|false|java.math.BigInteger|2147483647|nonNegativeInteger|nonNegativeInteger||2147483647|10|biginteger|0|Searchable|false|UserDefined|Atomic
+mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576|||integer|false|java.math.BigInteger|2147483647|nonPositiveInteger|nonPositiveInteger||2147483647|10|biginteger|0|Searchable|true|UserDefined|Atomic
+mmuuid:4df43700-3b13-1e20-921b-eeee28353879|||string|true|java.lang.String|4000|normalizedString|normalizedString||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016|||nonNegativeInteger|false|java.math.BigInteger|2147483647|positiveInteger|positiveInteger||2147483647|10|biginteger|0|Searchable|false|UserDefined|Atomic
+mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016|||int|false|java.lang.Short|2|short|short||5|10|short|0|Searchable|true|Basic|Atomic
+mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7|||anySimpleType|true|java.lang.String|4000|string|string||0||string|0|Searchable||Basic|Atomic
+mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7|||anySimpleType|false|java.sql.Time|4|time|time||0||time|0|Searchable||Basic|Atomic
+mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a|||normalizedString|true|java.lang.String|4000|token|token||0||string|0|Searchable||UserDefined|Atomic
+mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016|||unsignedShort|false|java.lang.Short|2|unsignedByte|unsignedByte||5|10|short|0|Searchable|false|UserDefined|Atomic
+mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016|||unsignedLong|false|java.lang.Long|8|unsignedInt|unsignedInt||19|10|long|0|Searchable|false|UserDefined|Atomic
+mmuuid:54b98780-ba14-1e21-b812-969c8fc8b016|||nonNegativeInteger|false|java.math.BigInteger|2147483647|unsignedLong|unsignedLong||2147483647|10|biginteger|0|Searchable|false|UserDefined|Atomic
+mmuuid:327093c0-ba88-1e21-b812-969c8fc8b016|||unsignedInt|false|java.lang.Integer|4|unsignedShort|unsignedShort||10|10|integer|0|Searchable|false|UserDefined|Atomic
+mmuuid:182fd511-1a3e-447a-a6ea-72569d6a22ec|||base64Binary|false|org.teiid.core.types.BinaryType|8196|varbinary|varbinary||0||varbinary|0|Searchable||Basic|Atomic
\ No newline at end of file
Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java
===================================================================
---
trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -48,7 +48,7 @@
" e2 string(10) UNIQUE,\n" +
" e3 date NOT NULL UNIQUE,\n" +
" e4 bigdecimal(12,3),\n" +
- " e5 integer AUTO_INCREMENT INDEX OPTIONS (UUID 'uuid', NAMEINSOURCE
'nis', SELECTABLE 'false'),\n" +
+ " e5 integer AUTO_INCREMENT INDEX OPTIONS (UUID 'uuid', NAMEINSOURCE
'nis', SELECTABLE false),\n" +
" e6 string INDEX DEFAULT 'hello'\n" +
") OPTIONS (ANNOTATION 'Test Table', CARDINALITY '12', FOO
'BAR', UPDATABLE 'true', UUID 'uuid2');";
Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -24,7 +24,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -32,8 +31,8 @@
import org.junit.Test;
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.datatypes.SystemDataTypes;
import org.teiid.metadata.*;
import org.teiid.metadata.BaseColumn.NullType;
import org.teiid.query.metadata.MetadataValidator;
@@ -85,7 +84,7 @@
Column e6 = columns.get(5);
assertEquals("e1", e1.getName());
- assertEquals("integer", e1.getDatatype().getName());
+ assertEquals("int", e1.getDatatype().getName());
assertEquals("primary key not same", e1,
table.getPrimaryKey().getColumns().get(0));
assertEquals("e2", e2.getName());
@@ -107,7 +106,7 @@
assertEquals(3, e4.getScale());
assertEquals("e5", e5.getName());
- assertEquals("integer", e5.getDatatype().getName());
+ assertEquals("int", e5.getDatatype().getName());
assertEquals(true, e5.isAutoIncremented());
assertEquals("uuid", e5.getUUID());
assertEquals("nis", e5.getNameInSource());
@@ -630,20 +629,8 @@
return mf;
}
- //TODO: could elevate type logic out of metadata
public static Map<String, Datatype> getDataTypes() {
- Map<String, Datatype> datatypes = new HashMap<String, Datatype>();
- for (String name:DataTypeManager.getAllDataTypeNames()) {
- Datatype dt = new Datatype();
- dt.setName(name);
- Class<?> dataTypeClass = DataTypeManager.getDataTypeClass(name);
- dt.setJavaClassName(dataTypeClass.getName());
- dt.setRuntimeTypeName(DataTypeManager.getDataTypeName(dataTypeClass));
- datatypes.put(name, dt);
- }
- datatypes.put("varchar",
datatypes.get(DataTypeManager.DefaultDataTypes.STRING));
- datatypes.put("decimal",
datatypes.get(DataTypeManager.DefaultDataTypes.BIG_DECIMAL));
- return datatypes;
+ return SystemDataTypes.getInstance().getBuiltinTypeMap();
}
@Test public void testKeyResolve() {
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
===================================================================
---
trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -24,7 +24,14 @@
import java.io.IOException;
import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import org.jboss.vfs.VirtualFile;
import org.jboss.vfs.VirtualFileFilter;
@@ -213,9 +220,7 @@
// optimized for multi-thread loading this locking to sync will work
synchronized (this) {
if (!this.loaded) {
- if (systemDatatypes == null) {
- SystemDataTypes.loadSystemDatatypes(this);
- }
+
ArrayList<Index> tmp = new ArrayList<Index>();
for (VirtualFile f : indexFiles) {
Index index = new Index(f, true);
@@ -234,7 +239,7 @@
uuidToRecord.put(datatype.getUUID(), datatype);
}
} else {
- for (Datatype datatype : getDatatypes().values()) {
+ for (Datatype datatype : SystemDataTypes.getInstance().getDataTypes()) {
uuidToRecord.put(datatype.getUUID(), datatype);
}
}
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -672,7 +672,7 @@
dt.setLength( Integer.parseInt(tokens.get(tokenIndex++)) );
// Append the precision length
- dt.setPrecisionLength( Integer.parseInt(tokens.get(tokenIndex++)) );
+ dt.setPrecision( Integer.parseInt(tokens.get(tokenIndex++)) );
// Append the scale
dt.setScale( Integer.parseInt(tokens.get(tokenIndex++)) );
Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-07-17
01:00:58 UTC (rev 4242)
+++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -22,15 +22,11 @@
package org.teiid.deployers;
import java.lang.reflect.Method;
-import java.math.BigInteger;
import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
-import java.util.Random;
-import java.util.UUID;
import org.teiid.core.types.DataTypeManager;
-import org.teiid.metadata.AbstractMetadataRecord;
import org.teiid.metadata.Column;
import org.teiid.metadata.Datatype;
import org.teiid.metadata.FunctionMethod;
@@ -48,11 +44,8 @@
public static final int PG_TYPE_CHARARRAY = 1002;
public static final int PG_TYPE_TEXTARRAY = 1009;
- private Random random;
-
public PgCatalogMetadataStore(String modelName, Map<String, Datatype> dataTypes)
throws TranslatorException {
super(modelName, 1, modelName, dataTypes, new Properties(), null);
-
add_pg_namespace();
add_pg_class();
add_pg_attribute();
@@ -71,23 +64,6 @@
addFunction("getExpr3", "pg_get_expr"); //$NON-NLS-1$
//$NON-NLS-2$
}
- @Override
- protected void setUUID(AbstractMetadataRecord record) {
- byte[] randomBytes = new byte[8];
- if (random == null) {
- random = new Random(2010);
- }
- random.nextBytes(randomBytes);
- randomBytes[6] &= 0x0f; /* clear version */
- randomBytes[6] |= 0x40; /* set to version 4 */
- long msb = new BigInteger(randomBytes).longValue();
- random.nextBytes(randomBytes);
- randomBytes[0] &= 0x3f; /* clear variant */
- randomBytes[0] |= 0x80; /* set to IETF variant */
- long lsb = new BigInteger(randomBytes).longValue();
- record.setUUID("mmuid:"+new UUID(msb, lsb)); //$NON-NLS-1$
- }
-
private Table createView(String name) throws TranslatorException {
Table t = addTable(name);
t.setSystem(true);
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-07-17 01:00:58
UTC (rev 4242)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-07-19 02:57:49
UTC (rev 4243)
@@ -23,8 +23,6 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -40,8 +38,8 @@
import org.teiid.adminapi.impl.SourceMappingMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.core.CoreConstants;
-import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.PropertiesUtils;
+import org.teiid.datatypes.SystemDataTypes;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.logging.LogConstants;
@@ -71,7 +69,7 @@
private boolean odbcEnabled = false;
private List<VDBLifeCycleListener> listeners = new
CopyOnWriteArrayList<VDBLifeCycleListener>();
private SystemFunctionManager systemFunctionManager;
- private Map<String, Datatype> datatypeMap = new HashMap<String,
Datatype>();
+ private Map<String, Datatype> datatypeMap =
SystemDataTypes.getInstance().getBuiltinTypeMap();
private ReentrantLock lock = new ReentrantLock();
private Condition vdbAdded = lock.newCondition();
@@ -209,55 +207,14 @@
public void setSystemStore(MetadataStore store) {
this.systemStore = store;
- Collection<Datatype> datatypes = this.systemStore.getDatatypes().values();
-
- for (String typeName : DataTypeManager.getAllDataTypeNames()) {
-
- boolean found = false;
- for (Datatype datatypeRecordImpl : datatypes) {
- if (datatypeRecordImpl.getRuntimeTypeName().equalsIgnoreCase(typeName)) {
- datatypeMap.put(typeName, datatypeRecordImpl);
- found = true;
- break;
- }
- }
-
- if (!found) {
- for (Datatype datatypeRecordImpl : datatypes) {
- if
(datatypeRecordImpl.getJavaClassName().equals(DataTypeManager.getDataTypeClass(typeName)))
{
- datatypeMap.put(typeName, datatypeRecordImpl);
- break;
- }
- }
- }
- }
-
- // add alias types
- addAliasType(datatypes, DataTypeManager.DataTypeAliases.BIGINT);
- addAliasType(datatypes, DataTypeManager.DataTypeAliases.DECIMAL);
- addAliasType(datatypes, DataTypeManager.DataTypeAliases.REAL);
- addAliasType(datatypes, DataTypeManager.DataTypeAliases.SMALLINT);
- addAliasType(datatypes, DataTypeManager.DataTypeAliases.TINYINT);
- addAliasType(datatypes, DataTypeManager.DataTypeAliases.VARCHAR);
-
}
- private void addAliasType(Collection<Datatype> datatypes, String alias) {
- Class<?> typeClass = DataTypeManager.getDataTypeClass(alias);
- for (Datatype datatypeRecordImpl : datatypes) {
- if (datatypeRecordImpl.getJavaClassName().equals(typeClass.getName())) {
- datatypeMap.put(alias, datatypeRecordImpl);
- break;
- }
- }
- }
-
private MetadataStore getODBCMetadataStore() {
try {
PgCatalogMetadataStore pg = new PgCatalogMetadataStore(CoreConstants.ODBC_MODEL,
getBuiltinDatatypes());
return pg.asMetadataStore();
} catch (TranslatorException e) {
- LogManager.logError(LogConstants.CTX_DQP,
RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40002));
+ LogManager.logError(LogConstants.CTX_DQP, e,
RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40002));
}
return null;
}
Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-07-17 01:00:58
UTC (rev 4242)
+++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-07-19 02:57:49
UTC (rev 4243)
@@ -22,15 +22,23 @@
package org.teiid.runtime;
-import java.io.IOException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.transaction.*;
+import javax.transaction.RollbackException;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
import org.teiid.Replicated;
import org.teiid.Replicated.ReplicationMode;
@@ -38,21 +46,29 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.cache.Cache;
import org.teiid.cache.CacheConfiguration;
+import org.teiid.cache.DefaultCacheFactory;
import org.teiid.cache.CacheConfiguration.Policy;
-import org.teiid.cache.DefaultCacheFactory;
import org.teiid.client.DQP;
import org.teiid.client.security.ILogon;
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.TupleBufferCache;
+import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.BundleUtil.Event;
-import org.teiid.core.TeiidRuntimeException;
import org.teiid.datatypes.SystemDataTypes;
-import org.teiid.deployers.*;
+import org.teiid.deployers.CompositeVDB;
+import org.teiid.deployers.UDFMetaData;
+import org.teiid.deployers.VDBLifeCycleListener;
+import org.teiid.deployers.VDBRepository;
+import org.teiid.deployers.VirtualDatabaseException;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import
org.teiid.dqp.internal.datamgr.ConnectorManagerRepository.ConnectorManagerException;
import
org.teiid.dqp.internal.datamgr.ConnectorManagerRepository.ExecutionFactoryProvider;
-import org.teiid.dqp.internal.process.*;
+import org.teiid.dqp.internal.process.CachedResults;
+import org.teiid.dqp.internal.process.DQPCore;
+import org.teiid.dqp.internal.process.PreparedPlan;
+import org.teiid.dqp.internal.process.SessionAwareCache;
+import org.teiid.dqp.internal.process.TransactionServerImpl;
import org.teiid.dqp.service.BufferService;
import org.teiid.dqp.service.TransactionContext;
import org.teiid.dqp.service.TransactionContext.Scope;
@@ -291,11 +307,7 @@
this.replicator = dqpConfiguration.getObjectReplicator();
if (dqpConfiguration.getSystemStore() == null) {
MetadataStore ms = new MetadataStore();
- try {
- SystemDataTypes.loadSystemDatatypes(ms);
- } catch (IOException e) {
- throw new TeiidRuntimeException(e);
- }
+ ms.addDataTypes(SystemDataTypes.getInstance().getDataTypes());
this.repo.setSystemStore(ms);
} else {
this.repo.setSystemStore(dqpConfiguration.getSystemStore());
Modified:
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.java
===================================================================
---
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.java 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/BaseQueryTest.java 2012-07-19
02:57:49 UTC (rev 4243)
@@ -56,14 +56,16 @@
protected void doProcess(QueryMetadataInterface metadata, String sql,
CapabilitiesFinder capFinder, ProcessorDataManager dataManager, List[] expectedResults,
boolean debug) throws Exception {
CommandContext context = createCommandContext();
- context.setMetadata(metadata);
+ if (context.getMetadata() == null) {
+ context.setMetadata(metadata);
+ }
Command command = TestOptimizer.helpGetCommand(sql, metadata, null);
// plan
AnalysisRecord analysisRecord = new AnalysisRecord(false, debug);
ProcessorPlan plan = null;
try {
- plan = QueryOptimizer.optimizePlan(command, metadata, null, capFinder,
analysisRecord, createCommandContext());
+ plan = QueryOptimizer.optimizePlan(command, metadata, null, capFinder,
analysisRecord, context);
} finally {
if(debug) {
System.out.println(analysisRecord.getDebugLog());
Modified:
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -18,19 +18,19 @@
parts SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null>
true false 17
parts SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null>
true false 7
parts SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null>
true false 18
-parts pg_catalog
matpg_datatype
Table <null>
false false
mmuid:0f312b3c-98ca-4a09-81fa-f1ff83f0a6c1 -1 <null>
true true 19
-parts pg_catalog
matpg_relatt
Table <null>
false false
mmuid:0b0894ba-e1ea-4eaf-bcd2-ea9ebd05e47d -1 <null>
true true 20
-parts pg_catalog
pg_am
Table <null>
false false
mmuid:da4b747e-7d87-403a-8309-2cdf1399031b -1 <null>
true false 21
-parts pg_catalog
pg_attrdef
Table <null>
false false
mmuid:e9b278d4-49af-442f-9a5a-b699fe3b102b -1 <null>
true false 22
-parts pg_catalog
pg_attribute
Table <null>
false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null>
true true 23
-parts pg_catalog
pg_class
Table <null>
false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null>
true true 24
-parts pg_catalog
pg_database
Table <null>
false false
mmuid:1aedd02c-5801-41e7-accd-da1f257c26e8 -1 <null>
true false 25
-parts pg_catalog
pg_index
Table <null>
false false
mmuid:8709e084-48df-417d-b3f8-f4e9b7d8802b -1 <null>
true true 26
-parts pg_catalog
pg_namespace
Table <null>
false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null>
true false 27
-parts pg_catalog
pg_proc
Table <null>
false false
mmuid:b288b3aa-37f2-4a8e-8b1b-e932a2ce3e25 -1 <null>
true true 28
-parts pg_catalog
pg_trigger
Table <null>
false false
mmuid:64977f3e-f2a0-466e-a5d1-80bb058cbe08 -1 <null>
true false 29
-parts pg_catalog
pg_type
Table <null>
false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null>
true false 30
-parts pg_catalog
pg_user
Table <null>
false false
mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -1 <null>
true false 31
+parts pg_catalog
matpg_datatype
Table <null>
false false tid:7ff2755e9621-e544c1cc-00000068
-1 <null>
true true 19
+parts pg_catalog
matpg_relatt
Table <null>
false false tid:7ff2755e9621-75d65150-0000005e
-1 <null>
true true 20
+parts pg_catalog
pg_am
Table <null>
false false tid:7ff2755e9621-065a8b74-00000031
-1 <null>
true false 21
+parts pg_catalog
pg_attrdef
Table <null>
false false tid:7ff2755e9621-ec00662c-0000004a
-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-0000004f
-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-00000034
-1 <null>
true true 28
+parts pg_catalog
pg_trigger
Table <null>
false false tid:7ff2755e9621-d50d2370-00000040
-1 <null>
true false 29
+parts pg_catalog
pg_type
Table <null>
false false tid:7ff2755e9621-d9ee5c82-0000001b
-1 <null>
true false 30
+parts pg_catalog
pg_user
Table <null>
false false tid:7ff2755e9621-d9eeb913-00000059
-1 <null>
true false 31
Row Count : 31
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
VDBName 12 parts java.lang.String VDBName
string SYS Tables 255 255 0
false true false true 1 false
true true true
Modified:
trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -760,18 +760,18 @@
QT_Ora9DS XQTRecursiveDoc
groupDocument.MappingClasses.supervisor
ID 2
biginteger 19
<null> 0 0
1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTRecursiveDoc
groupDocument.MappingClasses.supervisor
code 2
biginteger 19
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTRecursiveDoc
groupDocument.MappingClasses.supervisor
groupID 2
biginteger 19
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_datatype
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_datatype
typname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_datatype
name 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_datatype
uid 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_datatype
typlen 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_relatt
attrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_relatt
attnum 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_relatt
attname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_relatt
relname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_relatt
nspname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_relatt
autoinc -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
matpg_relatt
typoid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_datatype
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_datatype
typname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_datatype
name 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_datatype
uid 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_datatype
typlen 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_relatt
attrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_relatt
attnum 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_relatt
attname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_relatt
relname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_relatt
nspname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_relatt
autoinc -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
matpg_relatt
typoid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTDoc
mixedContentTestDocument
mixedContentTest.wrapper3.key3.data3 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 0
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTDoc
mixedContentTestDocument
mixedContentTest.wrapper3.key3 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 0
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTDoc
mixedContentTestDocument
mixedContentTest.wrapper3 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 0
YES <null>
<null>
<null> !
<null>
NO
@@ -789,84 +789,84 @@
QT_Ora9DS XQTDoc
nillableTestDocument
nillableTest 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 0
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTDoc
nillableTestDocument.MappingClasses.wrapper
key 2
biginteger 19
<null> 0 0
1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTDoc
nillableTestDocument.MappingClasses.wrapper
nillableField 2
biginteger 19
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_am
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_am
amname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attrdef
adrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attrdef
adnum 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attrdef
adbin 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attrdef
adsrc 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
attrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
attname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
atttypid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
attlen 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
attnum 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
atttypmod 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
attnotnull -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
attisdropped -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_attribute
atthasdef -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 10
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
relname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
relnamespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
relkind 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
relam 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
reltuples 7
float 20
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
relpages 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
relhasrules -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_class
relhasoids -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
datname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
encoding 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
datlastsysoid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
datallowconn 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
datconfig
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
datacl
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
datdba 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_database
dattablespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
indexrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
indrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
indisclustered -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
indisunique -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
indisprimary -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
indexprs 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_index
indkey 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_namespace
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_namespace
nspname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
proname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
proretset -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
prorettype 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
pronargs 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
proargtypes
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
proargnames
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
proargmodes
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
proallargtypes
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_proc
pronamespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 10
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tgconstrrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tgfoid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tgargs 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tgnargs 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tgdeferrable -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tginitdeferred -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tgconstrname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_trigger
tgrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typnamespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typlen 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typtype 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typnotnull -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typbasetype 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typtypmod 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typdelim 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 10
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_type
typelem 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 11
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_user
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_user
usename 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_user
usecreatedb -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-QT_Ora9DS pg_catalog
pg_user
usesuper -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_am
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_am
amname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attrdef
adrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attrdef
adnum 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attrdef
adbin 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attrdef
adsrc 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
attrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
attname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
atttypid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
attlen 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
attnum 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
atttypmod 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
attnotnull -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
attisdropped -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_attribute
atthasdef -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 10
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
relname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
relnamespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
relkind 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
relam 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
reltuples 7
float 7
<null> 3
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
relpages 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
relhasrules -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_class
relhasoids -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
datname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
encoding 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
datlastsysoid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
datallowconn 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
datconfig
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
datacl
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
datdba 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_database
dattablespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
indexrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
indrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
indisclustered -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
indisunique -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
indisprimary -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
indexprs 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_index
indkey 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_namespace
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_namespace
nspname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
proname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
proretset -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
prorettype 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
pronargs 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
proargtypes
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
proargnames
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
proargmodes
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
proallargtypes
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_proc
pronamespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 10
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tgconstrrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tgfoid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tgargs 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tgnargs 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tgdeferrable -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tginitdeferred -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tgconstrname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_trigger
tgrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typnamespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typlen 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typtype 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typnotnull -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typbasetype 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typtypmod 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typdelim 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 10
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_type
typelem 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 11
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_user
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_user
usename 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_user
usecreatedb -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+QT_Ora9DS pg_catalog
pg_user
usesuper -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTNestedDoc
testBoundTempTable
testSimple.recursiveRoot.data 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 0
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTNestedDoc
testBoundTempTable
testSimple.recursiveRoot.key 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 0
YES <null>
<null>
<null> !
<null>
NO
QT_Ora9DS XQTNestedDoc
testBoundTempTable
testSimple.recursiveRoot.nextKey 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 0
YES <null>
<null>
<null> !
<null>
NO
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_AM.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_AM.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_AM.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -3,5 +3,5 @@
0 btree
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 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_am 11 10 0
false false false false 2 true
true false false
-amname 12 PartsSupplier java.lang.String amname string
pg_catalog pg_am 4000 4000 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_am 11 10 0
false false false false 1 true
true true false
+amname 12 PartsSupplier java.lang.String amname string
pg_catalog pg_am 4000 4000 0
false true false false 1 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -256,7 +256,7 @@
31 4 <null>
<null>
Row Count : 254
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 2 true
true false false
-adnum 5 PartsSupplier java.lang.Short adnum short
pg_catalog pg_attrdef 6 5 0
false false false false 2 true
true false false
-adbin 12 PartsSupplier java.lang.String adbin string
pg_catalog pg_attrdef 4000 4000 0
false false false false 2 true
true false false
-adsrc 12 PartsSupplier java.lang.String adsrc string
pg_catalog pg_attrdef 4000 4000 0
false false false false 2 true
true false false
+adrelid 4 PartsSupplier java.lang.Integer adrelid integer
pg_catalog pg_attrdef 11 10 0
false false false false 1 true
true true false
+adnum 5 PartsSupplier java.lang.Short adnum short
pg_catalog pg_attrdef 6 5 0
false false false false 1 true
true true false
+adbin 12 PartsSupplier java.lang.String adbin string
pg_catalog pg_attrdef 4000 4000 0
false true false false 1 true
true false false
+adsrc 12 PartsSupplier java.lang.String adsrc string
pg_catalog pg_attrdef 4000 4000 0
false true false false 1 true
true false 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-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -164,105 +164,105 @@
162 17 OID
23 4 13 14 true false false
163 18 Name
1043 -1 1 259 true false false
164 18 Version
1043 -1 2 54 true false false
-165 19 oid
23 4 1 4 false false false
-166 19 typname
1043 -1 2 4 false false false
-167 19 name
1043 -1 3 4 false false false
-168 19 uid
1043 -1 4 4 false false false
-169 19 typlen
21 2 5 4 false false false
-170 20 attrelid
23 4 1 4 false false false
-171 20 attnum
21 2 2 4 false false false
-172 20 attname
1043 -1 3 4 false false false
-173 20 relname
1043 -1 4 4 false false false
-174 20 nspname
1043 -1 5 4 false false false
-175 20 autoinc
16 1 6 4 false false false
-176 20 typoid
23 4 7 4 false false false
-177 21 oid
23 4 1 4 false false false
-178 21 amname
1043 -1 2 4 false false false
-179 22 adrelid
23 4 1 4 false false false
-180 22 adnum
21 2 2 4 false false false
-181 22 adbin
1043 -1 3 4 false false false
-182 22 adsrc
1043 -1 4 4 false false false
-183 23 oid
23 4 1 4 false false false
-184 23 attrelid
23 4 2 4 false false false
-185 23 attname
1043 -1 3 4 false false false
-186 23 atttypid
23 4 4 4 false false false
-187 23 attlen
21 2 5 4 false false false
-188 23 attnum
21 2 6 4 false false false
-189 23 atttypmod
23 4 7 4 false false false
-190 23 attnotnull
16 1 8 4 false false false
-191 23 attisdropped
16 1 9 4 false false false
-192 23 atthasdef
16 1 10 4 false false false
-193 24 oid
23 4 1 4 false false false
-194 24 relname
1043 -1 2 4 false false false
-195 24 relnamespace
23 4 3 4 false false false
-196 24 relkind
1042 1 4 4 false false false
-197 24 relam
23 4 5 4 false false false
-198 24 reltuples
700 4 6 4 false false false
-199 24 relpages
23 4 7 4 false false false
-200 24 relhasrules
16 1 8 4 false false false
-201 24 relhasoids
16 1 9 4 false false false
-202 25 oid
23 4 1 4 false false false
-203 25 datname
1043 -1 2 4 false false false
-204 25 encoding
23 4 3 4 false false false
-205 25 datlastsysoid
23 4 4 4 false false false
-206 25 datallowconn
1042 1 5 4 false false false
-207 25 datconfig
705 -2 6 4 false false false
-208 25 datacl
705 -2 7 4 false false false
-209 25 datdba
23 4 8 4 false false false
-210 25 dattablespace
23 4 9 4 false false false
-211 26 oid
23 4 1 4 false false false
-212 26 indexrelid
23 4 2 4 false false false
-213 26 indrelid
23 4 3 4 false false false
-214 26 indisclustered
16 1 4 4 false false false
-215 26 indisunique
16 1 5 4 false false false
-216 26 indisprimary
16 1 6 4 false false false
-217 26 indexprs
1043 -1 7 4 false false false
-218 26 indkey
1043 -1 8 4 false false false
-219 27 oid
23 4 1 4 false false false
-220 27 nspname
1043 -1 2 4 false false false
-221 28 oid
23 4 1 4 false false false
-222 28 proname
1043 -1 2 4 false false false
-223 28 proretset
16 1 3 4 false false false
-224 28 prorettype
23 4 4 4 false false false
-225 28 pronargs
21 2 5 4 false false false
-226 28 proargtypes
705 -2 6 4 false false false
-227 28 proargnames
705 -2 7 4 false false false
-228 28 proargmodes
705 -2 8 4 false false false
-229 28 proallargtypes
705 -2 9 4 false false false
-230 28 pronamespace
23 4 10 4 false false false
-231 29 oid
23 4 1 4 false false false
-232 29 tgconstrrelid
23 4 2 4 false false false
-233 29 tgfoid
23 4 3 4 false false false
-234 29 tgargs
23 4 4 4 false false false
-235 29 tgnargs
23 4 5 4 false false false
-236 29 tgdeferrable
16 1 6 4 false false false
-237 29 tginitdeferred
16 1 7 4 false false false
-238 29 tgconstrname
1043 -1 8 4 false false false
-239 29 tgrelid
23 4 9 4 false false false
-240 30 oid
23 4 1 4 false false false
-241 30 typname
1043 -1 2 4 false false false
-242 30 typnamespace
23 4 3 4 false false false
-243 30 typlen
21 2 4 4 false false false
-244 30 typtype
1042 1 5 4 false false false
-245 30 typnotnull
16 1 6 4 false false false
-246 30 typbasetype
23 4 7 4 false false false
-247 30 typtypmod
23 4 8 4 false false false
-248 30 typdelim
1042 1 9 4 false false false
-249 30 typrelid
23 4 10 4 false false false
-250 30 typelem
23 4 11 4 false false false
-251 31 oid
23 4 1 4 false false false
-252 31 usename
1043 -1 2 4 false false false
-253 31 usecreatedb
16 1 3 4 false false false
-254 31 usesuper
16 1 4 4 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 indisclustered
16 1 4 5 false false false
+215 26 indisunique
16 1 5 5 false false false
+216 26 indisprimary
16 1 6 5 false false false
+217 26 indexprs
1043 -1 7 4004 false false false
+218 26 indkey
1043 -1 8 4004 false false false
+219 27 oid
23 4 1 8 false false false
+220 27 nspname
1043 -1 2 4004 false false false
+221 28 oid
23 4 1 8 false false false
+222 28 proname
1043 -1 2 4004 false false false
+223 28 proretset
16 1 3 5 false false false
+224 28 prorettype
23 4 4 8 false false false
+225 28 pronargs
21 2 5 6 false false false
+226 28 proargtypes
705 -2 6 -2147483645 false false false
+227 28 proargnames
705 -2 7 -2147483645 false false false
+228 28 proargmodes
705 -2 8 -2147483645 false false false
+229 28 proallargtypes
705 -2 9 -2147483645 false false false
+230 28 pronamespace
23 4 10 8 false false false
+231 29 oid
23 4 1 8 false false false
+232 29 tgconstrrelid
23 4 2 8 false false false
+233 29 tgfoid
23 4 3 8 false false false
+234 29 tgargs
23 4 4 8 false false false
+235 29 tgnargs
23 4 5 8 false false false
+236 29 tgdeferrable
16 1 6 5 false false false
+237 29 tginitdeferred
16 1 7 5 false false false
+238 29 tgconstrname
1043 -1 8 4004 false false false
+239 29 tgrelid
23 4 9 8 false false false
+240 30 oid
23 4 1 8 false false false
+241 30 typname
1043 -1 2 4004 false false false
+242 30 typnamespace
23 4 3 8 false false false
+243 30 typlen
21 2 4 6 false false false
+244 30 typtype
1042 1 5 5 false false false
+245 30 typnotnull
16 1 6 5 false false false
+246 30 typbasetype
23 4 7 8 false false false
+247 30 typtypmod
23 4 8 8 false false false
+248 30 typdelim
1042 1 9 5 false false false
+249 30 typrelid
23 4 10 8 false false false
+250 30 typelem
23 4 11 8 false false false
+251 31 oid
23 4 1 8 false false false
+252 31 usename
1043 -1 2 4004 false false false
+253 31 usecreatedb
16 1 3 5 false false false
+254 31 usesuper
16 1 4 5 false false false
Row Count : 254
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 2 true
true false false
-attrelid 4 PartsSupplier java.lang.Integer attrelid integer
pg_catalog pg_attribute 11 10 0
false false false false 2 true
true false false
-attname 12 PartsSupplier java.lang.String attname string
pg_catalog pg_attribute 4000 4000 0
false false false false 2 true
true false false
-atttypid 4 PartsSupplier java.lang.Integer atttypid integer
pg_catalog pg_attribute 11 10 0
false false false false 2 true
true false false
-attlen 5 PartsSupplier java.lang.Short attlen short
pg_catalog pg_attribute 6 5 0
false false false false 2 true
true false false
-attnum 5 PartsSupplier java.lang.Short attnum short
pg_catalog pg_attribute 6 5 0
false false false false 2 true
true false false
-atttypmod 4 PartsSupplier java.lang.Integer atttypmod integer
pg_catalog pg_attribute 11 10 0
false false false false 2 true
true false false
-attnotnull -7 PartsSupplier java.lang.Boolean attnotnull boolean
pg_catalog pg_attribute 5 1 0
false false false false 2 true
true false false
-attisdropped -7 PartsSupplier java.lang.Boolean attisdropped boolean
pg_catalog pg_attribute 5 1 0
false false false false 2 true
true false false
-atthasdef -7 PartsSupplier java.lang.Boolean atthasdef boolean
pg_catalog pg_attribute 5 1 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_attribute 11 10 0
false false false false 1 true
true true false
+attrelid 4 PartsSupplier java.lang.Integer attrelid integer
pg_catalog pg_attribute 11 10 0
false false false false 1 true
true true false
+attname 12 PartsSupplier java.lang.String attname string
pg_catalog pg_attribute 4000 4000 0
false true false false 1 true
true false false
+atttypid 4 PartsSupplier java.lang.Integer atttypid integer
pg_catalog pg_attribute 11 10 0
false false false false 1 true
true true false
+attlen 5 PartsSupplier java.lang.Short attlen short
pg_catalog pg_attribute 6 5 0
false false false false 1 true
true true false
+attnum 5 PartsSupplier java.lang.Short attnum short
pg_catalog pg_attribute 6 5 0
false false false false 1 true
true true false
+atttypmod 4 PartsSupplier java.lang.Integer atttypmod integer
pg_catalog pg_attribute 11 10 0
false false false false 1 true
true true false
+attnotnull -7 PartsSupplier java.lang.Boolean attnotnull boolean
pg_catalog pg_attribute 5 1 0
false false false false 1 true
true false false
+attisdropped -7 PartsSupplier java.lang.Boolean attisdropped boolean
pg_catalog pg_attribute 5 1 0
false false false false 1 true
true false false
+atthasdef -7 PartsSupplier java.lang.Boolean atthasdef boolean
pg_catalog pg_attribute 5 1 0
false false false false 1 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -1,44 +1,44 @@
-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 MatViews 2
r 0 0.0 0 false false
-7 VDBResources 2
r 0 0.0 0 false false
-8 Columns 3
r 0 0.0 0 false false
-9 DataTypes 3
r 0 0.0 0 false false
-10 KeyColumns 3
r 0 0.0 0 false false
-11 Keys 3
r 0 0.0 0 false false
-12 ProcedureParams 3
r 0 0.0 0 false false
-13 Procedures 3
r 0 0.0 0 false false
-14 Properties 3
r 0 0.0 0 false false
-15 ReferenceKeyColumns 3
r 0 0.0 0 false false
-16 Schemas 3
r 0 0.0 0 false false
-17 Tables 3
r 0 0.0 0 false false
-18 VirtualDatabases 3
r 0 0.0 0 false false
-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
+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 MatViews 2
r 0 0.0 0 false false
+7 VDBResources 2
r 0 0.0 0 false false
+8 Columns 3
r 0 0.0 0 false false
+9 DataTypes 3
r 0 0.0 0 false false
+10 KeyColumns 3
r 0 0.0 0 false false
+11 Keys 3
r 0 0.0 0 false false
+12 ProcedureParams 3
r 0 0.0 0 false false
+13 Procedures 3
r 0 0.0 0 false false
+14 Properties 3
r 0 0.0 0 false false
+15 ReferenceKeyColumns 3
r 0 0.0 0 false false
+16 Schemas 3
r 0 0.0 0 false false
+17 Tables 3
r 0 0.0 0 false false
+18 VirtualDatabases 3
r 0 0.0 0 false false
+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
Row Count : 31
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 2 true
true false false
-relname 12 PartsSupplier java.lang.String relname string
pg_catalog pg_class 4000 4000 0
false false false false 2 true
true false false
-relnamespace 4 PartsSupplier java.lang.Integer relnamespace integer
pg_catalog pg_class 11 10 0
false false false false 2 true
true false false
-relkind 1 PartsSupplier java.lang.String relkind char
pg_catalog pg_class 1 1 0
false false false false 2 true
true false false
-relam 4 PartsSupplier java.lang.Integer relam integer
pg_catalog pg_class 11 10 0
false false false false 2 true
true false false
-reltuples 7 PartsSupplier java.lang.Float reltuples float
pg_catalog pg_class 22 20 0
false false false false 2 true
true false false
-relpages 4 PartsSupplier java.lang.Integer relpages integer
pg_catalog pg_class 11 10 0
false false false false 2 true
true false false
-relhasrules -7 PartsSupplier java.lang.Boolean relhasrules boolean
pg_catalog pg_class 5 1 0
false false false false 2 true
true false false
-relhasoids -7 PartsSupplier java.lang.Boolean relhasoids boolean
pg_catalog pg_class 5 1 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_class 11 10 0
false false false false 1 true
true true false
+relname 12 PartsSupplier java.lang.String relname string
pg_catalog pg_class 4000 4000 0
false true false false 1 true
true false false
+relnamespace 4 PartsSupplier java.lang.Integer relnamespace integer
pg_catalog pg_class 11 10 0
false false false false 1 true
true true false
+relkind 1 PartsSupplier java.lang.String relkind char
pg_catalog pg_class 1 1 0
false true false false 1 true
true false false
+relam 4 PartsSupplier java.lang.Integer relam integer
pg_catalog pg_class 11 10 0
false false false false 1 true
true true false
+reltuples 7 PartsSupplier java.lang.Float reltuples float
pg_catalog pg_class 9 7 3
false false false false 1 true
true true false
+relpages 4 PartsSupplier java.lang.Integer relpages integer
pg_catalog pg_class 11 10 0
false false false false 1 true
true true false
+relhasrules -7 PartsSupplier java.lang.Boolean relhasrules boolean
pg_catalog pg_class 5 1 0
false false false false 1 true
true false false
+relhasoids -7 PartsSupplier java.lang.Boolean relhasoids boolean
pg_catalog pg_class 5 1 0
false false false false 1 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_DATABASE.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_DATABASE.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_DATABASE.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -3,12 +3,12 @@
0 teiid 6
100000 t <null>
<null> 0
0
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 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_database 11 10 0
false false false false 2 true
true false false
-datname 12 PartsSupplier java.lang.String datname string
pg_catalog pg_database 4000 4000 0
false false false false 2 true
true false false
-encoding 4 PartsSupplier java.lang.Integer encoding integer
pg_catalog pg_database 11 10 0
false false false false 2 true
true false false
-datlastsysoid 4 PartsSupplier java.lang.Integer datlastsysoid integer
pg_catalog pg_database 11 10 0
false false false false 2 true
true false false
-datallowconn 1 PartsSupplier java.lang.String datallowconn char
pg_catalog pg_database 1 1 0
false false false false 2 true
true false false
-datconfig 2000 PartsSupplier java.lang.Object datconfig object
pg_catalog pg_database 2147483647 2147483647 0
false false false false 2 true
true false false
-datacl 2000 PartsSupplier java.lang.Object datacl object
pg_catalog pg_database 2147483647 2147483647 0
false false false false 2 true
true false false
-datdba 4 PartsSupplier java.lang.Integer datdba integer
pg_catalog pg_database 11 10 0
false false false false 2 true
true false false
-dattablespace 4 PartsSupplier java.lang.Integer dattablespace integer
pg_catalog pg_database 11 10 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_database 11 10 0
false false false false 1 true
true true false
+datname 12 PartsSupplier java.lang.String datname string
pg_catalog pg_database 4000 4000 0
false true false false 1 true
true false false
+encoding 4 PartsSupplier java.lang.Integer encoding integer
pg_catalog pg_database 11 10 0
false false false false 1 true
true true false
+datlastsysoid 4 PartsSupplier java.lang.Integer datlastsysoid integer
pg_catalog pg_database 11 10 0
false false false false 1 true
true true false
+datallowconn 1 PartsSupplier java.lang.String datallowconn char
pg_catalog pg_database 1 1 0
false true false false 1 true
true false false
+datconfig 2000 PartsSupplier java.lang.Object datconfig object
pg_catalog pg_database 2147483647 2147483647 0
false false false false 1 true
false false false
+datacl 2000 PartsSupplier java.lang.Object datacl object
pg_catalog pg_database 2147483647 2147483647 0
false false false false 1 true
false false false
+datdba 4 PartsSupplier java.lang.Integer datdba integer
pg_catalog pg_database 11 10 0
false false false false 1 true
true true false
+dattablespace 4 PartsSupplier java.lang.Integer dattablespace integer
pg_catalog pg_database 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-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -24,11 +24,11 @@
22 22 28 false false true
0
Row Count : 22
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 2 true
true false false
-indexrelid 4 PartsSupplier java.lang.Integer indexrelid
integer pg_catalog pg_index 11 10 0
false false false false 2 true
true false false
-indrelid 4 PartsSupplier java.lang.Integer indrelid
integer pg_catalog pg_index 11 10 0
false false false false 2 true
true false false
-indisclustered -7 PartsSupplier java.lang.Boolean indisclustered
boolean pg_catalog pg_index 5 1 0
false false false false 2 true
true false false
-indisunique -7 PartsSupplier java.lang.Boolean indisunique
boolean pg_catalog pg_index 5 1 0
false false false false 2 true
true false false
-indisprimary -7 PartsSupplier java.lang.Boolean indisprimary
boolean pg_catalog pg_index 5 1 0
false false false false 2 true
true false false
-indexprs 12 PartsSupplier java.lang.String indexprs string
pg_catalog pg_index 4000 4000 0
false false false false 2 true
true false false
-indkey 12 PartsSupplier java.lang.String indkey string
pg_catalog pg_index 4000 4000 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid
integer pg_catalog pg_index 11 10 0
false false false false 1 true
true true false
+indexrelid 4 PartsSupplier java.lang.Integer indexrelid
integer pg_catalog pg_index 11 10 0
false false false false 1 true
true true false
+indrelid 4 PartsSupplier java.lang.Integer indrelid
integer pg_catalog pg_index 11 10 0
false false false false 1 true
true true false
+indisclustered -7 PartsSupplier java.lang.Boolean indisclustered
boolean pg_catalog pg_index 5 1 0
false false false false 1 true
true false false
+indisunique -7 PartsSupplier java.lang.Boolean indisunique
boolean pg_catalog pg_index 5 1 0
false false false false 1 true
true false false
+indisprimary -7 PartsSupplier java.lang.Boolean indisprimary
boolean pg_catalog pg_index 5 1 0
false false false false 1 true
true false false
+indexprs 12 PartsSupplier java.lang.String indexprs string
pg_catalog pg_index 4000 4000 0
false true false false 1 true
true false false
+indkey 12 PartsSupplier java.lang.String indkey string
pg_catalog pg_index 4000 4000 0
false true false false 1 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -6,5 +6,5 @@
4 pg_catalog
Row Count : 4
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
-oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_namespace 11 10 0
false false false false 2 true
true false false
-nspname 12 PartsSupplier java.lang.String nspname string
pg_catalog pg_namespace 4000 4000 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_namespace 11 10 0
false false false false 1 true
true true false
+nspname 12 PartsSupplier java.lang.String nspname string
pg_catalog pg_namespace 4000 4000 0
false true false false 1 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TRIGGER.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TRIGGER.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TRIGGER.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -2,12 +2,12 @@
oid tgconstrrelid tgfoid tgargs tgnargs tgdeferrable
tginitdeferred tgconstrname tgrelid
Row Count : 0
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_trigger 11 10 0
false false false false 2 true
true false false
-tgconstrrelid 4 PartsSupplier java.lang.Integer tgconstrrelid
integer pg_catalog pg_trigger 11 10 0
false false false false 2 true
true false false
-tgfoid 4 PartsSupplier java.lang.Integer tgfoid
integer pg_catalog pg_trigger 11 10 0
false false false false 2 true
true false false
-tgargs 4 PartsSupplier java.lang.Integer tgargs
integer pg_catalog pg_trigger 11 10 0
false false false false 2 true
true false false
-tgnargs 4 PartsSupplier java.lang.Integer tgnargs
integer pg_catalog pg_trigger 11 10 0
false false false false 2 true
true false false
-tgdeferrable -7 PartsSupplier java.lang.Boolean tgdeferrable
boolean pg_catalog pg_trigger 5 1 0
false false false false 2 true
true false false
-tginitdeferred -7 PartsSupplier java.lang.Boolean tginitdeferred
boolean pg_catalog pg_trigger 5 1 0
false false false false 2 true
true false false
-tgconstrname 12 PartsSupplier java.lang.String tgconstrname string
pg_catalog pg_trigger 4000 4000 0
false false false false 2 true
true false false
-tgrelid 4 PartsSupplier java.lang.Integer tgrelid
integer pg_catalog pg_trigger 11 10 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid
integer pg_catalog pg_trigger 11 10 0
false false false false 1 true
true true false
+tgconstrrelid 4 PartsSupplier java.lang.Integer tgconstrrelid
integer pg_catalog pg_trigger 11 10 0
false false false false 1 true
true true false
+tgfoid 4 PartsSupplier java.lang.Integer tgfoid
integer pg_catalog pg_trigger 11 10 0
false false false false 1 true
true true false
+tgargs 4 PartsSupplier java.lang.Integer tgargs
integer pg_catalog pg_trigger 11 10 0
false false false false 1 true
true true false
+tgnargs 4 PartsSupplier java.lang.Integer tgnargs
integer pg_catalog pg_trigger 11 10 0
false false false false 1 true
true true false
+tgdeferrable -7 PartsSupplier java.lang.Boolean tgdeferrable
boolean pg_catalog pg_trigger 5 1 0
false false false false 1 true
true false false
+tginitdeferred -7 PartsSupplier java.lang.Boolean tginitdeferred
boolean pg_catalog pg_trigger 5 1 0
false false false false 1 true
true false false
+tgconstrname 12 PartsSupplier java.lang.String tgconstrname string
pg_catalog pg_trigger 4000 4000 0
false true false false 1 true
true false false
+tgrelid 4 PartsSupplier java.lang.Integer tgrelid
integer pg_catalog pg_trigger 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-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -38,14 +38,14 @@
2283 anyelement 3
4 p false 0 -1 , 0 0
Row Count : 36
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
-oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_type 11 10 0
false false false false 2 true
true false false
-typname 12 PartsSupplier java.lang.String typname string
pg_catalog pg_type 4000 4000 0
false false false false 2 true
true false false
-typnamespace 4 PartsSupplier java.lang.Integer typnamespace integer
pg_catalog pg_type 11 10 0
false false false false 2 true
true false false
-typlen 5 PartsSupplier java.lang.Short typlen short
pg_catalog pg_type 6 5 0
false false false false 2 true
true false false
-typtype 1 PartsSupplier java.lang.String typtype char
pg_catalog pg_type 1 1 0
false false false false 2 true
true false false
-typnotnull -7 PartsSupplier java.lang.Boolean typnotnull boolean
pg_catalog pg_type 5 1 0
false false false false 2 true
true false false
-typbasetype 4 PartsSupplier java.lang.Integer typbasetype integer
pg_catalog pg_type 11 10 0
false false false false 2 true
true false false
-typtypmod 4 PartsSupplier java.lang.Integer typtypmod integer
pg_catalog pg_type 11 10 0
false false false false 2 true
true false false
-typdelim 1 PartsSupplier java.lang.String typdelim char
pg_catalog pg_type 1 1 0
false false false false 2 true
true false false
-typrelid 4 PartsSupplier java.lang.Integer typrelid integer
pg_catalog pg_type 11 10 0
false false false false 2 true
true false false
-typelem 4 PartsSupplier java.lang.Integer typelem integer
pg_catalog pg_type 11 10 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_type 11 10 0
false false false false 1 true
true true false
+typname 12 PartsSupplier java.lang.String typname string
pg_catalog pg_type 4000 4000 0
false true false false 1 true
true false false
+typnamespace 4 PartsSupplier java.lang.Integer typnamespace integer
pg_catalog pg_type 11 10 0
false false false false 1 true
true true false
+typlen 5 PartsSupplier java.lang.Short typlen short
pg_catalog pg_type 6 5 0
false false false false 1 true
true true false
+typtype 1 PartsSupplier java.lang.String typtype char
pg_catalog pg_type 1 1 0
false true false false 1 true
true false false
+typnotnull -7 PartsSupplier java.lang.Boolean typnotnull boolean
pg_catalog pg_type 5 1 0
false false false false 1 true
true false false
+typbasetype 4 PartsSupplier java.lang.Integer typbasetype integer
pg_catalog pg_type 11 10 0
false false false false 1 true
true true false
+typtypmod 4 PartsSupplier java.lang.Integer typtypmod integer
pg_catalog pg_type 11 10 0
false false false false 1 true
true true false
+typdelim 1 PartsSupplier java.lang.String typdelim char
pg_catalog pg_type 1 1 0
false true false false 1 true
true false false
+typrelid 4 PartsSupplier java.lang.Integer typrelid integer
pg_catalog pg_type 11 10 0
false false false false 1 true
true true false
+typelem 4 PartsSupplier java.lang.Integer typelem 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/TestODBCSchema/test_PG_USER.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_USER.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_USER.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -3,7 +3,7 @@
0 <null>
false false
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 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_user 11 10 0
false false false false 2 true
true false false
-usename 12 PartsSupplier java.lang.String usename string
pg_catalog pg_user 4000 4000 0
false false false false 2 true
true false false
-usecreatedb -7 PartsSupplier java.lang.Boolean usecreatedb boolean
pg_catalog pg_user 5 1 0
false false false false 2 true
true false false
-usesuper -7 PartsSupplier java.lang.Boolean usesuper boolean
pg_catalog pg_user 5 1 0
false false false false 2 true
true false false
+oid 4 PartsSupplier java.lang.Integer oid integer
pg_catalog pg_user 11 10 0
false false false false 1 true
true true false
+usename 12 PartsSupplier java.lang.String usename string
pg_catalog pg_user 4000 4000 0
false true false false 1 true
true false false
+usecreatedb -7 PartsSupplier java.lang.Boolean usecreatedb boolean
pg_catalog pg_user 5 1 0
false false false false 1 true
true false false
+usesuper -7 PartsSupplier java.lang.Boolean usesuper boolean
pg_catalog pg_user 5 1 0
false false false false 1 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -18,19 +18,19 @@
parts SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null>
true false 17
parts SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null>
true false 7
parts SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null>
true false 18
-parts pg_catalog
matpg_datatype
Table <null>
false false
mmuid:0f312b3c-98ca-4a09-81fa-f1ff83f0a6c1 -1 <null>
true true 19
-parts pg_catalog
matpg_relatt
Table <null>
false false
mmuid:0b0894ba-e1ea-4eaf-bcd2-ea9ebd05e47d -1 <null>
true true 20
-parts pg_catalog
pg_am
Table <null>
false false
mmuid:da4b747e-7d87-403a-8309-2cdf1399031b -1 <null>
true false 21
-parts pg_catalog
pg_attrdef
Table <null>
false false
mmuid:e9b278d4-49af-442f-9a5a-b699fe3b102b -1 <null>
true false 22
-parts pg_catalog
pg_attribute
Table <null>
false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null>
true true 23
-parts pg_catalog
pg_class
Table <null>
false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null>
true true 24
-parts pg_catalog
pg_database
Table <null>
false false
mmuid:1aedd02c-5801-41e7-accd-da1f257c26e8 -1 <null>
true false 25
-parts pg_catalog
pg_index
Table <null>
false false
mmuid:8709e084-48df-417d-b3f8-f4e9b7d8802b -1 <null>
true true 26
-parts pg_catalog
pg_namespace
Table <null>
false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null>
true false 27
-parts pg_catalog
pg_proc
Table <null>
false false
mmuid:b288b3aa-37f2-4a8e-8b1b-e932a2ce3e25 -1 <null>
true true 28
-parts pg_catalog
pg_trigger
Table <null>
false false
mmuid:64977f3e-f2a0-466e-a5d1-80bb058cbe08 -1 <null>
true false 29
-parts pg_catalog
pg_type
Table <null>
false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null>
true false 30
-parts pg_catalog
pg_user
Table <null>
false false
mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -1 <null>
true false 31
+parts pg_catalog
matpg_datatype
Table <null>
false false tid:7ff2755e9621-e544c1cc-00000068
-1 <null>
true true 19
+parts pg_catalog
matpg_relatt
Table <null>
false false tid:7ff2755e9621-75d65150-0000005e
-1 <null>
true true 20
+parts pg_catalog
pg_am
Table <null>
false false tid:7ff2755e9621-065a8b74-00000031
-1 <null>
true false 21
+parts pg_catalog
pg_attrdef
Table <null>
false false tid:7ff2755e9621-ec00662c-0000004a
-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-0000004f
-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-00000034
-1 <null>
true true 28
+parts pg_catalog
pg_trigger
Table <null>
false false tid:7ff2755e9621-d50d2370-00000040
-1 <null>
true false 29
+parts pg_catalog
pg_type
Table <null>
false false tid:7ff2755e9621-d9ee5c82-0000001b
-1 <null>
true false 30
+parts pg_catalog
pg_user
Table <null>
false false tid:7ff2755e9621-d9eeb913-00000059
-1 <null>
true false 31
Row Count : 31
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
vdbname 12 java.lang.String vdbname
varchar 255 255 0
false true false false 1 false
true false true
Modified:
trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -164,96 +164,96 @@
PartsSupplier SYSADMIN
VDBResources
contents
2004 blob 2147483647
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
PartsSupplier SYS
VirtualDatabases
Name 12
string 255
<null> 0
10 0 <null>
<null>
<null> <null>
255 1
NO <null>
<null>
<null> !
<null>
NO
PartsSupplier SYS
VirtualDatabases
Version 12
string 50
<null> 0
10 0 <null>
<null>
<null> <null>
50 2
NO <null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_datatype
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_datatype
typname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_datatype
name 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_datatype
uid 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_datatype
typlen 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_relatt
attrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_relatt
attnum 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_relatt
attname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_relatt
relname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_relatt
nspname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_relatt
autoinc -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
matpg_relatt
typoid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_am
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_am
amname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attrdef
adrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attrdef
adnum 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attrdef
adbin 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attrdef
adsrc 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
attrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
attname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
atttypid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
attlen 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
attnum 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
atttypmod 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
attnotnull -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
attisdropped -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_attribute
atthasdef -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 10
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
relname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
relnamespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
relkind 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
relam 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
reltuples 7
float 20
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
relpages 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
relhasrules -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_class
relhasoids -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
datname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
encoding 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
datlastsysoid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
datallowconn 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
datconfig
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
datacl
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
datdba 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_database
dattablespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
indexrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
indrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
indisclustered -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
indisunique -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
indisprimary -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
indexprs 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_index
indkey 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_namespace
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_namespace
nspname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
proname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
proretset -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
prorettype 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
pronargs 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
proargtypes
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
proargnames
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
proargmodes
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
proallargtypes
2000 object 2147483647
<null> 0
0 2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_proc
pronamespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 10
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tgconstrrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tgfoid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tgargs 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tgnargs 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tgdeferrable -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tginitdeferred -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tgconstrname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_trigger
tgrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typname 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typnamespace 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typlen 5
short 5
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typtype 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 5
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typnotnull -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 6
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typbasetype 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 7
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typtypmod 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 8
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typdelim 1
char 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 9
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typrelid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 10
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_type
typelem 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 11
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_user
oid 4
integer 10
<null> 0 0
2 <null>
<null>
<null> <null>
0 1
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_user
usename 12
string 4000
<null> 0 0
2 <null>
<null>
<null> <null>
0 2
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_user
usecreatedb -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 3
<null>
<null>
<null> !
<null>
NO
-PartsSupplier pg_catalog
pg_user
usesuper -7
boolean 1
<null> 0 0
2 <null>
<null>
<null> <null>
0 4
<null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_datatype
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_datatype
typname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_datatype
name 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_datatype
uid 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_datatype
typlen 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_relatt
attrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_relatt
attnum 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_relatt
attname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_relatt
relname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_relatt
nspname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_relatt
autoinc -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
matpg_relatt
typoid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_am
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_am
amname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attrdef
adrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attrdef
adnum 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attrdef
adbin 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attrdef
adsrc 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
attrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
attname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
atttypid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
attlen 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
attnum 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
atttypmod 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
attnotnull -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
attisdropped -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_attribute
atthasdef -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 10
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
relname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
relnamespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
relkind 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
relam 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
reltuples 7
float 7
<null> 3
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
relpages 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
relhasrules -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_class
relhasoids -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
datname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
encoding 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
datlastsysoid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
datallowconn 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
datconfig
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
datacl
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
datdba 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_database
dattablespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
indexrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
indrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
indisclustered -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
indisunique -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
indisprimary -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
indexprs 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_index
indkey 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_namespace
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_namespace
nspname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
proname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
proretset -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
prorettype 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
pronargs 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
proargtypes
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
proargnames
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
proargmodes
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
proallargtypes
2000 object 2147483647
<null> 0
0 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_proc
pronamespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 10
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tgconstrrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tgfoid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tgargs 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tgnargs 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tgdeferrable -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tginitdeferred -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tgconstrname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_trigger
tgrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typname 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typnamespace 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typlen 5
short 5
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typtype 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 5
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typnotnull -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 6
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typbasetype 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 7
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typtypmod 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 8
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typdelim 1
char 1
<null> 0 0
1 <null>
<null>
<null> <null>
0 9
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typrelid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 10
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_type
typelem 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 11
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_user
oid 4
integer 10
<null> 0
10 1 <null>
<null>
<null> <null>
0 1
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_user
usename 12
string 4000
<null> 0 0
1 <null>
<null>
<null> <null>
0 2
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_user
usecreatedb -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 3
YES <null>
<null>
<null> !
<null>
NO
+PartsSupplier pg_catalog
pg_user
usesuper -7
boolean 1
<null> 0
10 1 <null>
<null>
<null> <null>
0 4
YES <null>
<null>
<null> !
<null>
NO
Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String TABLE_CAT
string SYS Columns 255 255 0
false false false false 0 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -162,98 +162,98 @@
PartsSupplier SYSADMIN
MatViews
Valid 6
<null> boolean
0 0 false
true false true true false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
10 mmuuid:13098912-bce2-!
4842-9ea9-b162fcd7383e <null>
23
PartsSupplier SYS
Properties
Value 2
<null> string
0 255 true
true false true true false false
No Nulls <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 255 255
10 mmuuid:c917257d-06b7-!
41dd-a6cb-44c0ff0f897e <null>
125
PartsSupplier SYS
VirtualDatabases
Version 2
<null> string
0 50 true
true false true false false false
No Nulls <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 50 50
10 mmuuid:c876d749-a512-!
4810-9910-3034ca524c45 <null>
164
-PartsSupplier pg_catalog
pg_attrdef
adbin 3
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:382f9fc9-8c96-4!
df7-ab5d-04dfb47ee142 <null>
181
-PartsSupplier pg_catalog
pg_attrdef
adnum 2
<null> short
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 0 0
0 mmuid:492dd834-907f-4!
29b-aa6e-958ad65204c6 <null>
180
-PartsSupplier pg_catalog
pg_attrdef
adrelid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:e22c521a-e208-4!
181-9dbd-89f5de7014b9 <null>
179
-PartsSupplier pg_catalog
pg_attrdef
adsrc 4
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:689cde3b-a631-4!
f25-94b4-ff2ffe022b0f <null>
182
-PartsSupplier pg_catalog
pg_am
amname 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:bdf3ee1e-b5b7-4!
8ab-b43c-4bbb2c8ae1e2 <null>
178
-PartsSupplier pg_catalog
pg_attribute
atthasdef 10
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:5868e549-4bbe-4!
79e-bc7e-632c05cc2329 <null>
192
-PartsSupplier pg_catalog
pg_attribute
attisdropped 9
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:7beb42a9-dfe6-4!
3de-98b6-7e8948b1a666 <null>
191
-PartsSupplier pg_catalog
pg_attribute
attlen 5
<null> short
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 0 0
0 mmuid:d1214249-95cd-4!
26f-b8f6-4bf68c0504c7 <null>
187
-PartsSupplier pg_catalog
matpg_relatt
attname 3
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:f1998229-2c1a-4!
7b7-8f46-9dda81446db6 <null>
172
-PartsSupplier pg_catalog
pg_attribute
attname 3
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:6064d149-4102-4!
c2d-9132-582342f25e90 <null>
185
-PartsSupplier pg_catalog
pg_attribute
attnotnull 8
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:91ce8bde-8570-4!
867-be17-80acfa9275a6 <null>
190
-PartsSupplier pg_catalog
matpg_relatt
attnum 2
<null> short
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 0 0
0 mmuid:ffbf69c1-2e34-4!
764-a9b3-9a1b61bfd4af <null>
171
-PartsSupplier pg_catalog
pg_attribute
attnum 6
<null> short
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 0 0
0 mmuid:141fd911-f2dd-4!
edd-8f08-ad8a67ffd0fb <null>
188
-PartsSupplier pg_catalog
matpg_relatt
attrelid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:5cfb2b62-a912-4!
bfb-bf4f-51e107fe210c <null>
170
-PartsSupplier pg_catalog
pg_attribute
attrelid 2
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:3be6b5de-2287-4!
279-93f3-4f5064799118 <null>
184
-PartsSupplier pg_catalog
pg_attribute
atttypid 4
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:99782493-1cce-4!
e14-9c1b-4de7ce50e2c8 <null>
186
-PartsSupplier pg_catalog
pg_attribute
atttypmod 7
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:2e2bae3c-ab93-4!
9f5-b96c-7a7b9d66782d <null>
189
-PartsSupplier pg_catalog
matpg_relatt
autoinc 6
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:559efade-b320-4!
9bd-8524-1d325ae11c82 <null>
175
+PartsSupplier pg_catalog
pg_attrdef
adbin 3
<null> string
0 4000 false
true false true false false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 tid:7ff2755e9621-b094!
89b6-0000004d <null>
181
+PartsSupplier pg_catalog
pg_attrdef
adnum 2
<null> short
0 2 false
true false false true false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 5 0
10 tid:7ff2755e9621-b094!
b835-0000004c <null>
180
+PartsSupplier pg_catalog
pg_attrdef
adrelid 1
<null> integer
0 4 false
true false false true false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 10 0
10 tid:7ff2755e9621-6765!
c4e3-0000004b <null>
179
+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!
ca93-0000004e <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!
26e2-00000033 <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!
e333-00000061 <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!
47cc-00000060 <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!
2bfa-0000005f <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!
4e56-00000064 <null>
175
PartsSupplier SYSADMIN
VDBResources
contents 2
<null> blob
0 0 false
true false true true false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
org.teiid.core.types.BlobType 0 0
10 mmuuid:f9421669-3564-!
451d-9293-96c1e5e72c4f <null>
28
-PartsSupplier pg_catalog
pg_database
datacl 7
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Object 0 0
0 mmuid:28d034eb-6f39-4!
02f-b642-9c9560e57247 <null>
208
-PartsSupplier pg_catalog
pg_database
datallowconn 5
<null> char
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Character 0 0
0 mmuid:8b993c11-de2b-4!
8bc-beb1-3e44c46811b4 <null>
206
-PartsSupplier pg_catalog
pg_database
datconfig 6
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Object 0 0
0 mmuid:36db343d-e99a-4!
27c-a4e2-763a720ce4a4 <null>
207
-PartsSupplier pg_catalog
pg_database
datdba 8
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:e63613cb-01ee-4!
b37-8b91-99d1aac4dfcb <null>
209
-PartsSupplier pg_catalog
pg_database
datlastsysoid 4
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:4b5beb14-03a0-4!
652-9d6f-5f8cc74d470c <null>
205
-PartsSupplier pg_catalog
pg_database
datname 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:c2bdf40c-ec58-4!
39c-a403-7adf604ceadd <null>
203
-PartsSupplier pg_catalog
pg_database
dattablespace 9
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:bb78401d-d10c-4!
3b1-af84-e4fa6b95db42 <null>
210
-PartsSupplier pg_catalog
pg_database
encoding 3
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:5c9d54b2-433f-4!
43a-85ce-821f42ed109e <null>
204
-PartsSupplier pg_catalog
pg_index
indexprs 7
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:1462b28e-0bab-4!
36f-9654-013821506337 <null>
217
-PartsSupplier pg_catalog
pg_index
indexrelid 2
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:9f873e0f-903d-4!
c9d-8c37-1073b5ec4c67 <null>
212
-PartsSupplier pg_catalog
pg_index
indisclustered 4
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:9ea3b6d2-b27b-4!
bb1-a99d-b703c3308384 <null>
214
-PartsSupplier pg_catalog
pg_index
indisprimary 6
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:347ec08c-6b41-4!
1d0-8475-031ce7d99ac0 <null>
216
-PartsSupplier pg_catalog
pg_index
indisunique 5
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:1e6dbecd-9a2d-4!
aef-afbe-665de7acb9d6 <null>
215
-PartsSupplier pg_catalog
pg_index
indkey 8
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:f6517a63-8c14-4!
b73-a18d-afaa5dfb35d9 <null>
218
-PartsSupplier pg_catalog
pg_index
indrelid 3
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:a52c714d-dfe9-4!
06c-906b-fadd53ac4e98 <null>
213
-PartsSupplier pg_catalog
matpg_datatype
name 3
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:0e9c4439-48d0-4!
115-a343-5baab7a236b6 <null>
167
-PartsSupplier pg_catalog
matpg_relatt
nspname 5
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:595a823f-cec1-4!
2dc-b8b2-c95c8b4e4e66 <null>
174
-PartsSupplier pg_catalog
pg_namespace
nspname 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:0e513513-b35a-4!
8be-975d-5dbed6ace7e9 <null>
220
-PartsSupplier pg_catalog
matpg_datatype
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:b4e04928-9a59-4!
718-a7f1-3a60bcae7449 <null>
165
-PartsSupplier pg_catalog
pg_am
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:f20c9489-10ca-4!
596-8a37-24218b67f764 <null>
177
-PartsSupplier pg_catalog
pg_attribute
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:f735e545-a81c-4!
ee2-84d0-3ea35d4083a2 <null>
183
-PartsSupplier pg_catalog
pg_class
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:c1e736ac-c9d4-4!
026-8904-23c90e6eb1c0 <null>
193
-PartsSupplier pg_catalog
pg_database
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:3b621b25-171c-4!
05b-8bf9-635cf93f2273 <null>
202
-PartsSupplier pg_catalog
pg_index
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:16998907-e1dd-4!
47e-898d-780994d30619 <null>
211
-PartsSupplier pg_catalog
pg_namespace
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:688e5112-4083-4!
b67-b42c-62d9a614c59a <null>
219
-PartsSupplier pg_catalog
pg_proc
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:e0244e1d-431c-4!
1fa-8194-1e357e2b688b <null>
221
-PartsSupplier pg_catalog
pg_trigger
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:250d7c06-728a-4!
b2a-b557-91f2a69bb184 <null>
231
-PartsSupplier pg_catalog
pg_type
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:b6f64d16-b147-4!
59d-8e84-1bd3048fb900 <null>
240
-PartsSupplier pg_catalog
pg_user
oid 1
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:6da98878-b46e-4!
ed1-b032-1bc72da595f4 <null>
251
-PartsSupplier pg_catalog
pg_proc
proallargtypes 9
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Object 0 0
0 mmuid:9569efdb-21b2-4!
b4f-a2db-e7406267b8ed <null>
229
-PartsSupplier pg_catalog
pg_proc
proargmodes 8
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Object 0 0
0 mmuid:e5715456-245f-4!
846-b90b-01d06d1c3672 <null>
228
-PartsSupplier pg_catalog
pg_proc
proargnames 7
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Object 0 0
0 mmuid:a385751f-a31a-4!
d5d-9197-3fbd390b0251 <null>
227
-PartsSupplier pg_catalog
pg_proc
proargtypes 6
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Object 0 0
0 mmuid:bcbed548-176c-4!
116-a5d6-7638cb0206e1 <null>
226
-PartsSupplier pg_catalog
pg_proc
proname 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:9fb5a34a-3a7e-4!
d38-b7cd-239f28a3504e <null>
222
-PartsSupplier pg_catalog
pg_proc
pronamespace 10
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:2b75f0b1-7475-4!
ed5-9da3-d37a8a25f26a <null>
230
-PartsSupplier pg_catalog
pg_proc
pronargs 5
<null> short
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 0 0
0 mmuid:d9f36bdc-7b25-4!
af0-b9f5-a96aac6d3094 <null>
225
-PartsSupplier pg_catalog
pg_proc
proretset 3
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:6796c2e7-48a4-4!
f9f-bc98-d47913e2491c <null>
223
-PartsSupplier pg_catalog
pg_proc
prorettype 4
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:ffa4ac73-b549-4!
70e-931f-dc36330cb8c4 <null>
224
-PartsSupplier pg_catalog
pg_class
relam 5
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:c2f92b1a-6ba0-4!
486-8936-f5185d926178 <null>
197
-PartsSupplier pg_catalog
pg_class
relhasoids 9
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:3ac5a14a-1f9e-4!
55b-8ea1-cf0878774fd7 <null>
201
-PartsSupplier pg_catalog
pg_class
relhasrules 8
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:6c26fd66-2a4a-4!
ccf-949a-a06a858db7f6 <null>
200
-PartsSupplier pg_catalog
pg_class
relkind 4
<null> char
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Character 0 0
0 mmuid:ef4359eb-6d51-4!
249-bfea-40bc0f407d10 <null>
196
-PartsSupplier pg_catalog
matpg_relatt
relname 4
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:23454408-0347-4!
0d2-a3f9-3faa664fb5e9 <null>
173
-PartsSupplier pg_catalog
pg_class
relname 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:5f9b50fa-8188-4!
048-93c2-3ad1587915df <null>
194
-PartsSupplier pg_catalog
pg_class
relnamespace 3
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:4591ef08-bff8-4!
f3b-9de7-420f9c7f9d2b <null>
195
-PartsSupplier pg_catalog
pg_class
relpages 7
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:44dee7d6-b6ae-4!
4c7-85f2-e87364d8d059 <null>
199
-PartsSupplier pg_catalog
pg_class
reltuples 6
<null> float
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Float 0 0
0 mmuid:b9ed4b49-5a7b-4!
ba4-863a-37fd95b2a34c <null>
198
+PartsSupplier pg_catalog
pg_database
datacl 7
<null> object
0 2147483647 false
true false false false false false
Nullable <null>
<null> -1 -1
Unsearchable <null>
<null>
java.lang.Object 0 0
0 tid:7ff2755e9621-dad6!
37f3-00000056 <null>
208
+PartsSupplier pg_catalog
pg_database
datallowconn 5
<null> char
0 1 false
true false true false false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Character 0 0
0 tid:7ff2755e9621-5e2b!
9a9e-00000054 <null>
206
+PartsSupplier pg_catalog
pg_database
datconfig 6
<null> object
0 2147483647 false
true false false false false false
Nullable <null>
<null> -1 -1
Unsearchable <null>
<null>
java.lang.Object 0 0
0 tid:7ff2755e9621-1944!
37f9-00000055 <null>
207
+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!
430c-00000057 <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!
db2a-00000053 <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!
d902-00000051 <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!
972f-00000058 <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!
abb3-00000052 <null>
204
+PartsSupplier pg_catalog
pg_index
indexprs 7
<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-0000002e <null>
217
+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 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-47ce!
22f6-0000002b <null>
214
+PartsSupplier pg_catalog
pg_index
indisprimary 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-2c22!
f29f-0000002d <null>
216
+PartsSupplier pg_catalog
pg_index
indisunique 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-56a1!
3c60-0000002c <null>
215
+PartsSupplier pg_catalog
pg_index
indkey 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-ef45!
6826-0000002f <null>
218
+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!
60b7-0000006b <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!
aedd-00000063 <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>
220
+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!
93f6-00000069 <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!
43f5-00000032 <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!
2c2a-00000050 <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>
219
+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!
add1-00000035 <null>
221
+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!
8add-00000041 <null>
231
+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>
240
+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!
8e04-0000005a <null>
251
+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!
fbbe-0000003d <null>
229
+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!
3c4e-0000003c <null>
228
+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!
1866-0000003b <null>
227
+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!
9997-0000003a <null>
226
+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!
0ebf-00000036 <null>
222
+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!
5555-0000003e <null>
230
+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!
dbc5-00000039 <null>
225
+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!
7115-00000037 <null>
223
+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!
7015-00000038 <null>
224
+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!
652b-00000062 <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 true false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 255
10 mmuuid:b1bc5150-3dcc-!
452e-9e75-4a506997f612 <null>
27
-PartsSupplier pg_catalog
pg_trigger
tgargs 4
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:bfbff036-caf2-4!
652-80cf-398af17ed7d1 <null>
234
-PartsSupplier pg_catalog
pg_trigger
tgconstrname 8
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:76a7dd05-9a7d-4!
243-b561-f3056500dcaf <null>
238
-PartsSupplier pg_catalog
pg_trigger
tgconstrrelid 2
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:0c20dbe7-5d89-4!
11f-a8ab-3d77b999595b <null>
232
-PartsSupplier pg_catalog
pg_trigger
tgdeferrable 6
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:c010d12f-2074-4!
5db-8e18-979cee2c45da <null>
236
-PartsSupplier pg_catalog
pg_trigger
tgfoid 3
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:d70f020b-658c-4!
f58-86dc-0fbb12e2d8af <null>
233
-PartsSupplier pg_catalog
pg_trigger
tginitdeferred 7
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:71091853-c65e-4!
6a9-9947-aa024f806e2d <null>
237
-PartsSupplier pg_catalog
pg_trigger
tgnargs 5
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:da4b59ca-ebff-4!
5a8-ad68-9777bc587813 <null>
235
-PartsSupplier pg_catalog
pg_trigger
tgrelid 9
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:4589389f-4abd-4!
2a6-818f-ff1f2a085dfb <null>
239
-PartsSupplier pg_catalog
pg_type
typbasetype 7
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:cee3559d-1ce6-4!
b17-ad57-2ecb79a9e1d2 <null>
246
-PartsSupplier pg_catalog
pg_type
typdelim 9
<null> char
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Character 0 0
0 mmuid:22ac431d-e6e6-4!
eef-9d74-b31795424e97 <null>
248
-PartsSupplier pg_catalog
pg_type
typelem 11
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:83ae2247-7eec-4!
59f-b037-ffd3cdca0627 <null>
250
-PartsSupplier pg_catalog
matpg_datatype
typlen 5
<null> short
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 0 0
0 mmuid:443a2ab3-8257-4!
c4c-838e-9a47deaf4cf9 <null>
169
-PartsSupplier pg_catalog
pg_type
typlen 4
<null> short
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Short 0 0
0 mmuid:931c09e1-937a-4!
37e-aab2-2360f8d90e2b <null>
243
-PartsSupplier pg_catalog
matpg_datatype
typname 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:87826ebc-98a5-4!
f19-a6d8-6b7b96cbed48 <null>
166
-PartsSupplier pg_catalog
pg_type
typname 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:d600d818-2aad-4!
c92-9343-267d044dd97d <null>
241
-PartsSupplier pg_catalog
pg_type
typnamespace 3
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:e47217d2-2b07-4!
353-bfbd-d7c883a5e7e0 <null>
242
-PartsSupplier pg_catalog
pg_type
typnotnull 6
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:a17d2f61-cd68-4!
c0d-8d25-132f68eb3b67 <null>
245
-PartsSupplier pg_catalog
matpg_relatt
typoid 7
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:349f0c8c-7c64-4!
e0a-a84a-aee3deaf83af <null>
176
-PartsSupplier pg_catalog
pg_type
typrelid 10
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:09daed8d-b0b8-4!
552-a261-2b6c775b46b0 <null>
249
-PartsSupplier pg_catalog
pg_type
typtype 5
<null> char
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Character 0 0
0 mmuid:83199eba-7af4-4!
4a9-822f-006677b1b895 <null>
244
-PartsSupplier pg_catalog
pg_type
typtypmod 8
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 0 0
0 mmuid:bec25882-b292-4!
ed1-a610-cad5d504837d <null>
247
-PartsSupplier pg_catalog
matpg_datatype
uid 4
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:eda814fb-0a5a-4!
fbf-87bc-b57952292038 <null>
168
-PartsSupplier pg_catalog
pg_user
usecreatedb 3
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:8c0714d6-1c72-4!
0b4-8528-3b2c63059107 <null>
253
-PartsSupplier pg_catalog
pg_user
usename 2
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 mmuid:9bfddc66-af75-4!
366-8eac-b9fef3421219 <null>
252
-PartsSupplier pg_catalog
pg_user
usesuper 4
<null> boolean
0 0 false
true false false false false false
Unknown <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 0 0
0 mmuid:5c7bf056-ecc5-4!
1ea-a122-7a4b1de9908a <null>
254
+PartsSupplier pg_catalog
pg_trigger
tgargs 4
<null> integer
0 4 false
true false false true false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 10 0
10 tid:7ff2755e9621-9e3c!
4ae3-00000044 <null>
234
+PartsSupplier pg_catalog
pg_trigger
tgconstrname 8
<null> string
0 4000 false
true false true false false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.String 0 0
0 tid:7ff2755e9621-2ba0!
9840-00000048 <null>
238
+PartsSupplier pg_catalog
pg_trigger
tgconstrrelid 2
<null> integer
0 4 false
true false false true false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Integer 10 0
10 tid:7ff2755e9621-9f72!
b425-00000042 <null>
232
+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!
7860-00000046 <null>
236
+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!
85aa-00000043 <null>
233
+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!
33f5-00000047 <null>
237
+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!
c8cb-00000045 <null>
235
+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!
e1f4-00000049 <null>
239
+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>
246
+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>
248
+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>
250
+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!
b5d6-0000006d <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>
243
+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!
e5c2-0000006a <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>
241
+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>
242
+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>
245
+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!
01e6-00000065 <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>
249
+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>
244
+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>
247
+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!
aa7c-0000006c <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!
8d3b-0000005c <null>
253
+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!
04cc-0000005b <null>
252
+PartsSupplier pg_catalog
pg_user
usesuper 4
<null> boolean
0 1 false
true false false false false false
Nullable <null>
<null> -1 -1
Searchable <null>
<null>
java.lang.Boolean 1 0
10 tid:7ff2755e9621-938d!
e68e-0000005d <null>
254
Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName
string SYS Columns 255 255 0
false false false false 0 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -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 0 No Nulls
false false false 0 0 Searchable
mmuuid:20360100-e742-1e20-8c26-a038c6ed7576 string
ENTITY
<null> 1
-ENTITY false false
ENTITY java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576 string
NCName
<null> 2
-ID false false
ID java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576 string
NCName
<null> 3
-IDREF false false
IDREF java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576 string
NCName
<null> 4
-IDREFS false false
IDREFS java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576 string
IDREF
<null> 5
-NCName false false
NCName java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576 string
Name
<null> 6
-NMTOKEN false false
NMTOKEN java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879 string
token
<null> 7
-NMTOKENS false false
NMTOKENS java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576 string
NMTOKEN
<null> 8
-NOTATION false false
NOTATION java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e string
anySimpleType
<null> 9
-Name false false
Name java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576 string
token
<null> 10
-QName false false
QName java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e string
anySimpleType
<null> 11
-XMLLiteral false false
XMLLiteral
org.teiid.core.types.XMLType 0 0
No Nulls false false false 0 0
Searchable mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32 xml
string
<null>
12
-anyURI false false
anyURI java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e string
anySimpleType
<null> 13
-base64Binary false false
base64Binary java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7 string
anySimpleType
<null> 14
-bigdecimal false false
bigdecimal java.math.BigDecimal
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d bigdecimal
decimal
<null> 15
-biginteger false false
biginteger java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d biginteger
decimal
<null> 16
-blob false false
blob
org.teiid.core.types.BlobType 0 0
No Nulls false false false 0 0
Searchable mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95 blob
base64Binary
<null>
17
-boolean false false
boolean java.lang.Boolean
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7 boolean
anySimpleType
<null> 18
-byte false false
byte java.lang.Byte
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016 byte
short
<null> 19
-char false false
char java.lang.Character
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d char
string
<null> 20
-clob false false
clob
org.teiid.core.types.ClobType 0 0
No Nulls false false false 0 0
Searchable mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3 clob
string
<null>
21
-date false false
date java.sql.Date
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7 date
anySimpleType
<null> 22
-dateTime false false
dateTime java.sql.Timestamp
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21 timestamp
anySimpleType
<null> 23
-decimal false false
decimal java.math.BigDecimal
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7 bigdecimal
anySimpleType
<null> 24
-double false false
double java.lang.Double
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7 double
anySimpleType
<null> 25
-duration false false
duration java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21 string
anySimpleType
<null> 26
-float false false
float java.lang.Float
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7 float
anySimpleType
<null> 27
-gDay false false
gDay java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21 biginteger
anySimpleType
<null> 28
-gMonth false false
gMonth java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21 biginteger
anySimpleType
<null> 29
-gMonthDay false false
gMonthDay java.sql.Timestamp
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21 timestamp
anySimpleType
<null> 30
-gYear false false
gYear java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21 biginteger
anySimpleType
<null> 31
-gYearMonth false false
gYearMonth java.sql.Timestamp
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21 timestamp
anySimpleType
<null> 32
-hexBinary false false
hexBinary java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7 string
anySimpleType
<null> 33
-int false false
int java.lang.Integer
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016 integer
long
<null> 34
-integer false false
integer java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576 biginteger
decimal
<null> 35
-language false false
language java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576 string
token
<null> 36
-long false false
long java.lang.Long
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016 long
integer
<null> 37
-negativeInteger false false
negativeInteger java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016 biginteger
nonPositiveInteger
<null> 38
-nonNegativeInteger false false
nonNegativeInteger java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016 biginteger
integer
<null> 39
-nonPositiveInteger false false
nonPositiveInteger java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576 biginteger
integer
<null> 40
-normalizedString false false
normalizedString java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:4df43700-3b13-1e20-921b-eeee28353879 string
string
<null> 41
-object false false
object java.lang.Object
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79 object
base64Binary
<null> 42
-positiveInteger false false
positiveInteger java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016 biginteger
nonNegativeInteger
<null> 43
-short false false
short java.lang.Short
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016 short
int
<null> 44
-string false false
string java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7 string
anySimpleType
<null> 45
-time false false
time java.sql.Time
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7 time
anySimpleType
<null> 46
-timestamp false false
timestamp java.sql.Timestamp
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d timestamp
string
<null> 47
-token false false
token java.lang.String
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a string
normalizedString
<null> 48
-unsignedByte false false
unsignedByte java.lang.Short
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016 short
unsignedShort
<null> 49
-unsignedInt false false
unsignedInt java.lang.Long
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016 long
unsignedLong
<null> 50
-unsignedLong false false
unsignedLong java.math.BigInteger
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:54b98780-ba14-1e21-b812-969c8fc8b016 biginteger
nonNegativeInteger
<null> 51
-unsignedShort false false
unsignedShort java.lang.Integer
0 0 No Nulls
false false false 0 0 Searchable
mmuuid:327093c0-ba88-1e21-b812-969c8fc8b016 integer
unsignedInt
<null> 52
-varbinary false false
varbinary
org.teiid.core.types.BinaryType 0 0
No Nulls 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> 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
Row Count : 53
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
Name 12 PartsSupplier java.lang.String Name
string SYS DataTypes 100 100 0
false true false false 0 true
true true false
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -9,19 +9,19 @@
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>
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 1 14
-PartsSupplier pg_catalog
matpg_relatt
attnum
idx_matpg_relatt_ids Index
<null>
mmuid:053375a4-3971-4705-9146-9ecc640022c2 2 18
-PartsSupplier pg_catalog
matpg_relatt
attrelid
idx_matpg_relatt_ids Index
<null>
mmuid:053375a4-3971-4705-9146-9ecc640022c2 1 17
-PartsSupplier pg_catalog
matpg_datatype
name
matpg_datatype_names Primary
<null>
mmuid:542872fe-66ec-43b3-9486-ee25088b7248 2 11
-PartsSupplier pg_catalog
matpg_relatt
nspname
pk_matpg_relatt_names Primary
<null>
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 3 16
-PartsSupplier pg_catalog
matpg_datatype
oid
matpg_datatype_ids Index
<null>
mmuid:68ba97de-981f-49ed-873a-60f0e9d76b6f 2 13
-PartsSupplier pg_catalog
matpg_datatype
oid
matpg_datatype_names Primary
<null>
mmuid:542872fe-66ec-43b3-9486-ee25088b7248 1 10
-PartsSupplier pg_catalog
pg_attribute
oid
pk_pg_attr Primary
<null>
mmuid:649c1635-60ad-4c28-9b20-035c562bb1be 1 19
-PartsSupplier pg_catalog
pg_class
oid
pk_pg_class Primary
<null>
mmuid:59f7dc95-95fe-4d90-9813-1a097188e768 1 20
-PartsSupplier pg_catalog
pg_index
oid
pk_pg_index Primary
<null>
mmuid:3c67619c-7d8f-4378-b7e9-84a0451ea5e5 1 21
-PartsSupplier pg_catalog
pg_proc
oid
pk_pg_proc Primary
<null>
mmuid:635b6634-632c-43c9-8cc7-bcaa016133e8 1 22
-PartsSupplier pg_catalog
matpg_relatt
relname
pk_matpg_relatt_names Primary
<null>
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 2 15
-PartsSupplier pg_catalog
matpg_datatype
typname
matpg_datatype_ids Index
<null>
mmuid:68ba97de-981f-49ed-873a-60f0e9d76b6f 1 12
+PartsSupplier pg_catalog
matpg_relatt
attname
pk_matpg_relatt_names Primary
<null>
tid:7ff2755e9621-965abee4-00000066 1 14
+PartsSupplier pg_catalog
matpg_relatt
attnum
idx_matpg_relatt_ids Index
<null>
tid:7ff2755e9621-2a649312-00000067 2 18
+PartsSupplier pg_catalog
matpg_relatt
attrelid
idx_matpg_relatt_ids Index
<null>
tid:7ff2755e9621-2a649312-00000067 1 17
+PartsSupplier pg_catalog
matpg_datatype
name
matpg_datatype_names Primary
<null>
tid:7ff2755e9621-e36b5941-0000006e 2 11
+PartsSupplier pg_catalog
matpg_relatt
nspname
pk_matpg_relatt_names Primary
<null>
tid:7ff2755e9621-965abee4-00000066 3 16
+PartsSupplier pg_catalog
matpg_datatype
oid
matpg_datatype_ids Index
<null>
tid:7ff2755e9621-ed0fa7f1-0000006f 2 13
+PartsSupplier pg_catalog
matpg_datatype
oid
matpg_datatype_names Primary
<null>
tid:7ff2755e9621-e36b5941-0000006e 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-00000030 1 21
+PartsSupplier pg_catalog
pg_proc
oid
pk_pg_proc Primary
<null>
tid:7ff2755e9621-2e2ffa61-0000003f 1 22
+PartsSupplier pg_catalog
matpg_relatt
relname
pk_matpg_relatt_names Primary
<null>
tid:7ff2755e9621-965abee4-00000066 2 15
+PartsSupplier pg_catalog
matpg_datatype
typname
matpg_datatype_ids Index
<null>
tid:7ff2755e9621-ed0fa7f1-0000006f 1 12
Row Count : 22
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName string
SYS KeyColumns 255 255 0
false false false false 0 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -8,14 +8,14 @@
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>
mmuid:053375a4-3971-4705-9146-9ecc640022c2 12
-PartsSupplier pg_catalog
matpg_datatype
matpg_datatype_ids
<null> <null>
Index false
<null>
mmuid:68ba97de-981f-49ed-873a-60f0e9d76b6f 10
-PartsSupplier pg_catalog
matpg_datatype
matpg_datatype_names
<null> <null>
Primary false
<null>
mmuid:542872fe-66ec-43b3-9486-ee25088b7248 9
-PartsSupplier pg_catalog
matpg_relatt
pk_matpg_relatt_names
<null> <null>
Primary false
<null>
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 11
-PartsSupplier pg_catalog
pg_attribute
pk_pg_attr
<null> <null>
Primary false
<null>
mmuid:649c1635-60ad-4c28-9b20-035c562bb1be 13
-PartsSupplier pg_catalog
pg_class
pk_pg_class
<null> <null>
Primary false
<null>
mmuid:59f7dc95-95fe-4d90-9813-1a097188e768 14
-PartsSupplier pg_catalog
pg_index
pk_pg_index
<null> <null>
Primary false
<null>
mmuid:3c67619c-7d8f-4378-b7e9-84a0451ea5e5 15
-PartsSupplier pg_catalog
pg_proc
pk_pg_proc
<null> <null>
Primary false
<null>
mmuid:635b6634-632c-43c9-8cc7-bcaa016133e8 16
+PartsSupplier pg_catalog
matpg_relatt
idx_matpg_relatt_ids
<null> <null>
Index false
<null>
tid:7ff2755e9621-2a649312-00000067 12
+PartsSupplier pg_catalog
matpg_datatype
matpg_datatype_ids
<null> <null>
Index false
<null>
tid:7ff2755e9621-ed0fa7f1-0000006f 10
+PartsSupplier pg_catalog
matpg_datatype
matpg_datatype_names
<null> <null>
Primary false
<null>
tid:7ff2755e9621-e36b5941-0000006e 9
+PartsSupplier pg_catalog
matpg_relatt
pk_matpg_relatt_names
<null> <null>
Primary false
<null>
tid:7ff2755e9621-965abee4-00000066 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-00000030 15
+PartsSupplier pg_catalog
pg_proc
pk_pg_proc
<null> <null>
Primary false
<null>
tid:7ff2755e9621-2e2ffa61-0000003f 16
Row Count : 16
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName string
SYS Keys 255 255 0
false false false false 0 true
true false false
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -1,9 +1,9 @@
string string
string
integer clob
Name Value
UID
OID ClobValue
-pg_type:oid 30
mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1
1 Clob[2]
-pg_type:oid 1009
mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251
2 Clob[4]
-pg_type:oid 1002
mmuid:e5715456-245f-4846-b90b-01d06d1c3672
3 Clob[4]
-pg_type:oid 1028
mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed
4 Clob[4]
+pg_type:oid 30
tid:7ff2755e9621-c69d9997-0000003a
1 Clob[2]
+pg_type:oid 1009
tid:7ff2755e9621-c63e1866-0000003b
2 Clob[4]
+pg_type:oid 1002
tid:7ff2755e9621-c6363c4e-0000003c
3 Clob[4]
+pg_type:oid 1028
tid:7ff2755e9621-f418fbbe-0000003d
4 Clob[4]
Row Count : 4
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
Name 12 PartsSupplier java.lang.String Name string
SYS Properties 255 255 0
false true false false 0 true
true true false
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -3,7 +3,7 @@
PartsSupplier PartsSupplier
true
mmuuid:19c7f380-73d8-1edc-a81c-ecf397b10590 <null>
http://www.metamatrix.com/metamodels/Relational
1
PartsSupplier SYS
true
mmuuid:49b9c0f9-2c4c-42d3-9409-2d847d29a1de System
http://www.metamatrix.com/metamodels/Relational
3
PartsSupplier SYSADMIN
true
mmuuid:82f6153e-31e0-4034-b335-013cb418da34 <null>
http://www.metamatrix.com/metamodels/Relational
2
-PartsSupplier pg_catalog
true
mmuid:5a84789f-c794-4748-803a-09b6b605f6b9 <null>
http://www.metamatrix.com/metamodels/Relational
4
+PartsSupplier pg_catalog
true tid:7ff2755e9621-35592dd1-00000000
<null>
http://www.metamatrix.com/metamodels/Relational 4
Row Count : 4
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName
string SYS Schemas 255 255 0
false true false true 1
false true true true
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -18,19 +18,19 @@
PartsSupplier SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null>
true false 17
PartsSupplier SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null>
true false 7
PartsSupplier SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null>
true false 18
-PartsSupplier pg_catalog
matpg_datatype
Table <null>
false false
mmuid:0f312b3c-98ca-4a09-81fa-f1ff83f0a6c1 -1 <null>
true true 19
-PartsSupplier pg_catalog
matpg_relatt
Table <null>
false false
mmuid:0b0894ba-e1ea-4eaf-bcd2-ea9ebd05e47d -1 <null>
true true 20
-PartsSupplier pg_catalog
pg_am
Table <null>
false false
mmuid:da4b747e-7d87-403a-8309-2cdf1399031b -1 <null>
true false 21
-PartsSupplier pg_catalog
pg_attrdef
Table <null>
false false
mmuid:e9b278d4-49af-442f-9a5a-b699fe3b102b -1 <null>
true false 22
-PartsSupplier pg_catalog
pg_attribute
Table <null>
false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null>
true true 23
-PartsSupplier pg_catalog
pg_class
Table <null>
false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null>
true true 24
-PartsSupplier pg_catalog
pg_database
Table <null>
false false
mmuid:1aedd02c-5801-41e7-accd-da1f257c26e8 -1 <null>
true false 25
-PartsSupplier pg_catalog
pg_index
Table <null>
false false
mmuid:8709e084-48df-417d-b3f8-f4e9b7d8802b -1 <null>
true true 26
-PartsSupplier pg_catalog
pg_namespace
Table <null>
false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null>
true false 27
-PartsSupplier pg_catalog
pg_proc
Table <null>
false false
mmuid:b288b3aa-37f2-4a8e-8b1b-e932a2ce3e25 -1 <null>
true true 28
-PartsSupplier pg_catalog
pg_trigger
Table <null>
false false
mmuid:64977f3e-f2a0-466e-a5d1-80bb058cbe08 -1 <null>
true false 29
-PartsSupplier pg_catalog
pg_type
Table <null>
false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null>
true false 30
-PartsSupplier pg_catalog
pg_user
Table <null>
false false
mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -1 <null>
true false 31
+PartsSupplier pg_catalog
matpg_datatype
Table <null>
false false tid:7ff2755e9621-e544c1cc-00000068
-1 <null>
true true 19
+PartsSupplier pg_catalog
matpg_relatt
Table <null>
false false tid:7ff2755e9621-75d65150-0000005e
-1 <null>
true true 20
+PartsSupplier pg_catalog
pg_am
Table <null>
false false tid:7ff2755e9621-065a8b74-00000031
-1 <null>
true false 21
+PartsSupplier pg_catalog
pg_attrdef
Table <null>
false false tid:7ff2755e9621-ec00662c-0000004a
-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-0000004f
-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-00000034
-1 <null>
true true 28
+PartsSupplier pg_catalog
pg_trigger
Table <null>
false false tid:7ff2755e9621-d50d2370-00000040
-1 <null>
true false 29
+PartsSupplier pg_catalog
pg_type
Table <null>
false false tid:7ff2755e9621-d9ee5c82-0000001b
-1 <null>
true false 30
+PartsSupplier pg_catalog
pg_user
Table <null>
false false tid:7ff2755e9621-d9eeb913-00000059
-1 <null>
true false 31
Row Count : 31
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName
string SYS Tables 255 255 0
false true false true 1 false
true true true
Modified:
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-07-17
01:00:58 UTC (rev 4242)
+++
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-07-19
02:57:49 UTC (rev 4243)
@@ -2,10 +2,10 @@
Name Value
UID
NugentXAttribute Nuuuuuge22222
mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1
NugentYAttribute Nuuuuuge44444
mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1
-pg_type:oid 30
mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1
-pg_type:oid 1009
mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251
-pg_type:oid 1002
mmuid:e5715456-245f-4846-b90b-01d06d1c3672
-pg_type:oid 1028
mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed
+pg_type:oid 30
tid:7ff2755e9621-c69d9997-0000003a
+pg_type:oid 1009
tid:7ff2755e9621-c63e1866-0000003b
+pg_type:oid 1002
tid:7ff2755e9621-c6363c4e-0000003c
+pg_type:oid 1028
tid:7ff2755e9621-f418fbbe-0000003d
Row Count : 6
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
Name 12 xmlvp java.lang.String Name string
SYS Properties 255 255 0
false true false false 0 true
true true false