Author: shawkins
Date: 2012-05-04 14:06:14 -0400 (Fri, 04 May 2012)
New Revision: 4056
Added:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/
trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
Modified:
trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
trunk/api/src/main/java/org/teiid/metadata/Schema.java
trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java
trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java
trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
trunk/test-integration/common/pom.xml
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.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_ATTRDEF.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.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/testKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
Log:
TEIID-1977 fix for using a later driver with teiid odbc
Modified: trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -482,6 +482,17 @@
this.aggregateAttributes = aggregateAttributes;
}
+ public static FunctionMethod createFunctionMethod(String name, String description, String category,
+ String returnType, String... paramTypes) {
+ FunctionParameter[] params = new FunctionParameter[paramTypes.length];
+ for (int i = 0; i < paramTypes.length; i++) {
+ params[i] = new FunctionParameter("param" + (i+1), paramTypes[i]); //$NON-NLS-1$
+ }
+ FunctionMethod method = new FunctionMethod(name, description, category, params, new FunctionParameter("result", returnType)); //$NON-NLS-1$
+ method.setNameInSource(name);
+ return method;
+ }
+
public static void convertExtensionMetadata(Procedure procedureRecord,
FunctionMethod function) {
String deterministic = procedureRecord.getProperty(AbstractMetadataRecord.RELATIONAL_URI + "deterministic", true); //$NON-NLS-1$
Modified: trunk/api/src/main/java/org/teiid/metadata/Schema.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/metadata/Schema.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -56,8 +56,12 @@
}
public void addFunction(FunctionMethod function) {
+ addFunction(function.getName(), function);
+ }
+
+ public void addFunction(String uniqueName, FunctionMethod function) {
function.setParent(this);
- if (this.functions.put(function.getName(), function) != null) {
+ if (this.functions.put(uniqueName, function) != null) {
throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.TEIID60015, function.getName()));
}
}
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -688,12 +688,9 @@
}
protected FunctionMethod addPushDownFunction(String qualifier, String name, String returnType, String...paramTypes) {
- FunctionParameter[] params = new FunctionParameter[paramTypes.length];
- for (int i = 0; i < paramTypes.length; i++) {
- params[i] = new FunctionParameter("param" + (i+1), paramTypes[i]); //$NON-NLS-1$
- }
- FunctionMethod method = new FunctionMethod(qualifier + '.' + name, name, qualifier, params, new FunctionParameter("result", returnType)); //$NON-NLS-1$
- method.setNameInSource(name);
+ FunctionMethod method = FunctionMethod.createFunctionMethod(qualifier + '.' + name, name, qualifier,
+ returnType, paramTypes);
+ method.setNameInSource(name);
pushdownFunctionMethods.add(method);
return method;
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -36,6 +36,7 @@
import java.util.Map;
import java.util.TimeZone;
import java.util.TreeMap;
+import java.util.regex.Matcher;
import org.teiid.client.RequestMessage;
import org.teiid.client.RequestMessage.ResultsMode;
@@ -248,6 +249,13 @@
} else if(resultSet != null) {
metadata = resultSet.getMetaData();
} else {
+ Matcher matcher = StatementImpl.SHOW_STATEMENT.matcher(prepareSql);
+ if (matcher.matches()) {
+ this.executeShow(matcher);
+ metadata = this.resultSet.getMetaData();
+ this.resultSet = null;
+ return metadata;
+ }
if (getMetadataResults().getColumnMetadata() == null) {
return null;
}
@@ -259,9 +267,9 @@
return metadata;
}
- private MetadataResult getMetadataResults() throws TeiidSQLException {
+ private MetadataResult getMetadataResults() throws SQLException {
if (metadataResults == null) {
- if (StatementImpl.SET_STATEMENT.matcher(prepareSql).matches() || StatementImpl.TRANSACTION_STATEMENT.matcher(prepareSql).matches() || StatementImpl.SHOW_STATEMENT.matcher(prepareSql).matches()) {
+ if (StatementImpl.SET_STATEMENT.matcher(prepareSql).matches() || StatementImpl.TRANSACTION_STATEMENT.matcher(prepareSql).matches()) {
metadataResults = new MetadataResult();
} else {
try {
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -506,51 +506,7 @@
if (resultsMode == ResultsMode.UPDATECOUNT) {
throw new TeiidSQLException(JDBCPlugin.Util.getString("StatementImpl.show_update_count")); //$NON-NLS-1$
}
- String show = match.group(1);
- if (show.equalsIgnoreCase("PLAN")) { //$NON-NLS-1$
- List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
- PlanNode plan = driverConnection.getCurrentPlanDescription();
- if (plan != null) {
- ArrayList<Object> row = new ArrayList<Object>(3);
- row.add(DataTypeTransformer.getClob(plan.toString()));
- row.add(new SQLXMLImpl(plan.toXml()));
- row.add(DataTypeTransformer.getClob(driverConnection.getDebugLog()));
- records.add(row);
- }
- createResultSet(records, new String[] {"PLAN_TEXT", "PLAN_XML", "DEBUG_LOG"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- new String[] {DataTypeManager.DefaultDataTypes.CLOB, DataTypeManager.DefaultDataTypes.XML, DataTypeManager.DefaultDataTypes.CLOB});
- return booleanFuture(true);
- }
- if (show.equalsIgnoreCase("ANNOTATIONS")) { //$NON-NLS-1$
- List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
- Collection<Annotation> annos = driverConnection.getAnnotations();
- for (Annotation annotation : annos) {
- ArrayList<Object> row = new ArrayList<Object>(4);
- row.add(annotation.getCategory());
- row.add(annotation.getPriority().name());
- row.add(annotation.getAnnotation());
- row.add(annotation.getResolution());
- records.add(row);
- }
- createResultSet(records, new String[] {"CATEGORY", "PRIORITY", "ANNOTATION", "RESOLUTION"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
- }
- if (show.equalsIgnoreCase("ALL")) { //$NON-NLS-1$
- List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
- for (String key : driverConnection.getExecutionProperties().stringPropertyNames()) {
- ArrayList<Object> row = new ArrayList<Object>(4);
- row.add(key);
- row.add(driverConnection.getExecutionProperties().get(key));
- records.add(row);
- }
- createResultSet(records, new String[] {"NAME", "VALUE"}, //$NON-NLS-1$ //$NON-NLS-2$
- new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
- }
- List<List<String>> records = Collections.singletonList(Collections.singletonList(driverConnection.getExecutionProperties().getProperty(JDBCURL.getValidKey(show))));
- createResultSet(records, new String[] {show}, new String[] {DataTypeManager.DefaultDataTypes.STRING});
- return booleanFuture(true);
+ return executeShow(match);
}
}
@@ -592,6 +548,55 @@
return result;
}
+ ResultsFuture<Boolean> executeShow(Matcher match)
+ throws SQLException {
+ String show = match.group(1);
+ if (show.equalsIgnoreCase("PLAN")) { //$NON-NLS-1$
+ List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
+ PlanNode plan = driverConnection.getCurrentPlanDescription();
+ if (plan != null) {
+ ArrayList<Object> row = new ArrayList<Object>(3);
+ row.add(DataTypeTransformer.getClob(plan.toString()));
+ row.add(new SQLXMLImpl(plan.toXml()));
+ row.add(DataTypeTransformer.getClob(driverConnection.getDebugLog()));
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"PLAN_TEXT", "PLAN_XML", "DEBUG_LOG"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new String[] {DataTypeManager.DefaultDataTypes.CLOB, DataTypeManager.DefaultDataTypes.XML, DataTypeManager.DefaultDataTypes.CLOB});
+ return booleanFuture(true);
+ }
+ if (show.equalsIgnoreCase("ANNOTATIONS")) { //$NON-NLS-1$
+ List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
+ Collection<Annotation> annos = driverConnection.getAnnotations();
+ for (Annotation annotation : annos) {
+ ArrayList<Object> row = new ArrayList<Object>(4);
+ row.add(annotation.getCategory());
+ row.add(annotation.getPriority().name());
+ row.add(annotation.getAnnotation());
+ row.add(annotation.getResolution());
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"CATEGORY", "PRIORITY", "ANNOTATION", "RESOLUTION"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+ if (show.equalsIgnoreCase("ALL")) { //$NON-NLS-1$
+ List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
+ for (String key : driverConnection.getExecutionProperties().stringPropertyNames()) {
+ ArrayList<Object> row = new ArrayList<Object>(4);
+ row.add(key);
+ row.add(driverConnection.getExecutionProperties().get(key));
+ records.add(row);
+ }
+ createResultSet(records, new String[] {"NAME", "VALUE"}, //$NON-NLS-1$ //$NON-NLS-2$
+ new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+ List<List<String>> records = Collections.singletonList(Collections.singletonList(driverConnection.getExecutionProperties().getProperty(JDBCURL.getValidKey(show))));
+ createResultSet(records, new String[] {show}, new String[] {DataTypeManager.DefaultDataTypes.STRING});
+ return booleanFuture(true);
+ }
+
private ResultsFuture<ResultsMessage> execute(final RequestMessage reqMsg, boolean synch) throws SQLException,
TeiidSQLException {
this.getConnection().beginLocalTxnIfNeeded();
Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -21,8 +21,8 @@
*/
package org.teiid.deployers;
+import java.lang.reflect.Method;
import java.math.BigInteger;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
@@ -34,11 +34,11 @@
import org.teiid.metadata.Column;
import org.teiid.metadata.Datatype;
import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.FunctionMethod.PushDown;
-import org.teiid.metadata.FunctionParameter;
import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.Table;
+import org.teiid.metadata.FunctionMethod.PushDown;
import org.teiid.metadata.Table.Type;
+import org.teiid.odbc.ODBCServerRemoteImpl;
import org.teiid.translator.TranslatorException;
public class PgCatalogMetadataStore extends MetadataFactory {
@@ -66,7 +66,9 @@
add_pg_user();
add_matpg_relatt();
add_matpg_datatype();
- addHasFunctionPrivilage();
+ addFunction("hasPerm", "has_function_privilege"); //$NON-NLS-1$ //$NON-NLS-2$
+ addFunction("getExpr2", "pg_get_expr"); //$NON-NLS-1$ //$NON-NLS-2$
+ addFunction("getExpr3", "pg_get_expr"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override
@@ -107,21 +109,27 @@
return t;
}
- // column defaul values
+ // column default values
private Table add_pg_attrdef() throws TranslatorException {
Table t = createView("pg_attrdef"); //$NON-NLS-1$
addColumn("adrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
- addColumn("adnum", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+ addColumn("adnum", DataTypeManager.DefaultDataTypes.SHORT, t); //$NON-NLS-1$
addColumn("adbin", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
addColumn("adsrc", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
- String transformation = "SELECT null as oid, null as adsrc, null as adrelid, null as adnum from sys.tables where 1 = 0"; //$NON-NLS-1$
+ String transformation = "SELECT st.oid as adrelid, convert(t1.Position, short) as adnum, " + //$NON-NLS-1$
+ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue end as adbin, " + //$NON-NLS-1$
+ "case when t1.IsAutoIncremented then 'nextval(' else t1.DefaultValue end as adsrc " + //$NON-NLS-1$
+ "FROM SYS.Columns as t1 LEFT OUTER JOIN SYS.Tables st ON (st.Name = t1.TableName AND st.SchemaName = t1.SchemaName)"; //$NON-NLS-1$
t.setSelectTransformation(transformation);
return t;
}
- // table columns ("attributes")
+ /**
+ * table columns ("attributes")
+ * see also {@link ODBCServerRemoteImpl} getPGColInfo for the mod calculation
+ */
private Table add_pg_attribute() throws TranslatorException {
Table t = createView("pg_attribute"); //$NON-NLS-1$
@@ -375,18 +383,20 @@
addColumn("typlen", DataTypeManager.DefaultDataTypes.SHORT, t); //$NON-NLS-1$
// typtype is b for a base type, c for a composite type (e.g., a table's row type), d for a domain,
// e for an enum type, or p for a pseudo-type. See also typrelid and typbasetype
- addColumn("typtype", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$
+ addColumn("typtype", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$
+ // typnotnull represents a not-null constraint on a type. Used for domains only.
+ addColumn("typnotnull", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //$NON-NLS-1$
// if this is a domain (see typtype), then typbasetype identifies the type that this one is based on.
// Zero if this type is not a domain
addColumn("typbasetype", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
// Domains use typtypmod to record the typmod to be applied to their base type
// (-1 if base type does not use a typmod). -1 if this type is not a domain
addColumn("typtypmod", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
-
+ addColumn("typdelim", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$
addColumn("typrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
addColumn("typelem", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
String transformation =
- "select oid, typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, typbasetype, typtypmod, typrelid, typelem from texttable('" + //$NON-NLS-1$
+ "select oid, typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem from texttable('" + //$NON-NLS-1$
"16,boolean,1,b,0,-1,0,0\n" + //$NON-NLS-1$
"1043,string,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
"25,text,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
@@ -513,29 +523,46 @@
return t;
}
- private FunctionMethod addHasFunctionPrivilage() throws TranslatorException {
- FunctionMethod func = addFunction("has_function_privilege"); //$NON-NLS-1$
-
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
- ArrayList<FunctionParameter> inParams = new ArrayList<FunctionParameter>();
- inParams.add(new FunctionParameter("oid", DataTypeManager.DefaultDataTypes.INTEGER, ""));//$NON-NLS-1$ //$NON-NLS-2$
- inParams.add(new FunctionParameter("permission", DataTypeManager.DefaultDataTypes.STRING, "")); //$NON-NLS-1$ //$NON-NLS-2$
-
- func.setInputParameters(inParams);
- func.setOutputParameter(new FunctionParameter("result", DataTypeManager.DefaultDataTypes.BOOLEAN, "")); //$NON-NLS-1$ //$NON-NLS-2$
-
- func.setInvocationClass(ReturnTrue.class.getName());
- func.setInvocationMethod("result"); //$NON-NLS-1$
- func.setPushdown(PushDown.CANNOT_PUSHDOWN);
- func.setClassloader(classLoader);
-
- return func;
+ private FunctionMethod addFunction(String javaFunction, String name) {
+ Method[] methods = FunctionMethods.class.getMethods();
+ for (Method method : methods) {
+ if (!method.getName().equals(javaFunction)) {
+ continue;
+ }
+ String returnType = DataTypeManager.getDataTypeName(method.getReturnType());
+ Class<?>[] params = method.getParameterTypes();
+ String[] paramTypes = new String[params.length];
+ for (int i = 0; i < params.length; i++) {
+ paramTypes[i] = DataTypeManager.getDataTypeName(params[i]);
+ }
+ FunctionMethod func = FunctionMethod.createFunctionMethod(name, name, "pg", returnType, paramTypes); //$NON-NLS-1$
+ setUUID(func);
+ addFunction(javaFunction, func);
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ func.setInvocationMethod(javaFunction);
+ func.setPushdown(PushDown.CANNOT_PUSHDOWN);
+ func.setClassloader(classLoader);
+ func.setInvocationClass(FunctionMethods.class.getName());
+ return func;
+ }
+ throw new AssertionError("Could not find function"); //$NON-NLS-1$
}
- public static class ReturnTrue{
- public static boolean result(@SuppressWarnings("unused")int oid, @SuppressWarnings("unused") String permission) {
+ public static class FunctionMethods {
+ public static Boolean hasPerm(@SuppressWarnings("unused") Integer oid,
+ @SuppressWarnings("unused") String permission) {
return true;
}
+
+ public static String getExpr2(String text,
+ @SuppressWarnings("unused") Integer oid) {
+ return text;
+ }
+
+ public static String getExpr3(String text,
+ @SuppressWarnings("unused") Integer oid,
+ @SuppressWarnings("unused") Boolean prettyPrint) {
+ return text;
+ }
}
}
Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -47,6 +47,7 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.util.ApplicationInfo;
import org.teiid.core.util.StringUtil;
+import org.teiid.deployers.PgCatalogMetadataStore;
import org.teiid.jdbc.ConnectionImpl;
import org.teiid.jdbc.PreparedStatementImpl;
import org.teiid.jdbc.ResultSetImpl;
@@ -144,9 +145,6 @@
"\\s+and cn.contype = 'p'\\)" + //$NON-NLS-1$
"\\s+order by ref.oid, ref.i", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern preparedAutoIncrement = Pattern.compile("select 1 \\s*from pg_catalog.pg_attrdef \\s*where adrelid = \\$1 AND adnum = \\$2 " + //$NON-NLS-1$
- "\\s*and pg_catalog.pg_get_expr\\(adbin, adrelid\\) \\s*like '%nextval\\(%'", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-
private static Pattern cursorSelectPattern = Pattern.compile("DECLARE \"(\\w+)\" CURSOR(\\s(WITH HOLD|SCROLL))? FOR (.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
private static Pattern fetchPattern = Pattern.compile("FETCH (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern movePattern = Pattern.compile("MOVE (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
@@ -490,7 +488,7 @@
ResultsFuture<Integer> result = new ResultsFuture<Integer>();
if (future.get()) {
List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData());
- client.sendResults(query.sql, stmt.getResultSet(), cols, result, true);
+ client.sendResults(query.sql, stmt.getResultSet(), cols, result, false);
} else {
client.sendUpdateCount(query.sql, stmt.getUpdateCount());
setEncoding();
@@ -594,15 +592,10 @@
else if (modified.equalsIgnoreCase("select db_name() dbname")) { //$NON-NLS-1$
return "SELECT current_database()"; //$NON-NLS-1$
}
- else if (preparedAutoIncrement.matcher(modified).matches()) {
- return "SELECT 1 from matpg_relatt where attrelid = ? and attnum = ? and autoinc = true"; //$NON-NLS-1$
- }
- else {
+ else if (sql.equalsIgnoreCase("select current_schema()")) { //$NON-NLS-1$
// since teiid can work with multiple schemas at a given time
// this call resolution is ambiguous
- if (sql.equalsIgnoreCase("select current_schema()")) { //$NON-NLS-1$
- return "SELECT ''"; //$NON-NLS-1$
- }
+ return "SELECT ''"; //$NON-NLS-1$
}
}
@@ -850,19 +843,33 @@
}
private void setEncoding() {
+ String encoding = getEncoding();
+ if (encoding != null) {
+ //this may be unnecessary
+ this.client.setEncoding(encoding);
+ }
+ }
+
+ private String getEncoding() {
+ StatementImpl t = null;
try {
- StatementImpl t = connection.createStatement();
+ t = connection.createStatement();
ResultSet rs = t.executeQuery("show client_encoding"); //$NON-NLS-1$
if (rs.next()) {
- String encoding = rs.getString(1);
- if (encoding != null) {
- //this may be unnecessary
- this.client.setEncoding(encoding);
- }
+ return rs.getString(1);
}
} catch (Exception e) {
//don't care
+ } finally {
+ try {
+ if (t != null) {
+ t.close();
+ }
+ } catch (SQLException e) {
+
+ }
}
+ return null;
}
private final class QueryWorkItem implements Runnable {
@@ -958,7 +965,10 @@
done(null);
}
}
-
+
+ /**
+ * @see PgCatalogMetadataStore add_pg_attribute for mod calculation
+ */
private List<PgColInfo> getPgColInfo(ResultSetMetaData meta)
throws SQLException {
if (meta == null) {
@@ -966,12 +976,17 @@
}
int columns = meta.getColumnCount();
final ArrayList<PgColInfo> result = new ArrayList<PgColInfo>(columns);
- for (int i = 1; i < columns + 1; i++) {
+ for (int i = 1; i <= columns; i++) {
final PgColInfo info = new PgColInfo();
info.name = meta.getColumnLabel(i).toLowerCase();
info.type = meta.getColumnType(i);
info.type = convertType(info.type);
info.precision = meta.getColumnDisplaySize(i);
+ if (info.type == PG_TYPE_NUMERIC || info.type == PG_TYPE_FLOAT4 || info.type == PG_TYPE_FLOAT8) {
+ info.mod = (int) Math.min(Integer.MAX_VALUE, (4+(65536*(long)meta.getPrecision(i))+meta.getScale(i)));
+ } else {
+ info.mod = (int) Math.min(Integer.MAX_VALUE, 4+(long)meta.getColumnDisplaySize(i));
+ }
String name = meta.getColumnName(i);
String table = meta.getTableName(i);
String schema = meta.getSchemaName(i);
Modified: trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -58,6 +58,7 @@
public short attnum;
public int type;
public int precision;
+ public int mod = -1;
}
/**
Modified: trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/ODBCSocketListener.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -59,9 +59,9 @@
return new SSLAwareChannelHandler(this, config, Thread.currentThread().getContextClassLoader(), storageManager) {
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = new DefaultChannelPipeline();
-
- pipeline.addLast("odbcFrontendProtocol", new PgFrontendProtocol(1 << 20)); //$NON-NLS-1$
- pipeline.addLast("odbcBackendProtocol", new PgBackendProtocol(maxLobSize, maxBufferSize, config)); //$NON-NLS-1$
+ PgBackendProtocol pgBackendProtocol = new PgBackendProtocol(maxLobSize, maxBufferSize, config);
+ pipeline.addLast("odbcFrontendProtocol", new PgFrontendProtocol(pgBackendProtocol, 1 << 20)); //$NON-NLS-1$
+ pipeline.addLast("odbcBackendProtocol", pgBackendProtocol); //$NON-NLS-1$
pipeline.addLast("handler", this); //$NON-NLS-1$
return pipeline;
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PGCharsetConverter.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -29,7 +29,6 @@
*/
public class PGCharsetConverter {
private static HashMap<String, Charset> charSetMap = new HashMap<String, Charset>();
- private static HashMap<Charset, String> inverseCharSetMap = new HashMap<Charset, String>();
static {
mapCharset("BIG5", Charset.forName("Big5")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -70,14 +69,10 @@
private static void mapCharset(String name, Charset cs) {
charSetMap.put(name, cs);
- inverseCharSetMap.put(cs, name);
}
public static Charset getCharset(String name) {
return charSetMap.get(name);
}
- public static String getEncoding(Charset cs) {
- return inverseCharSetMap.get(cs);
- }
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -182,6 +182,7 @@
private Properties props;
private Charset encoding = Charset.forName("UTF-8");
+ private String clientEncoding = "UTF8";
private ReflectionHelper clientProxy = new ReflectionHelper(ODBCClientRemote.class);
private ChannelHandlerContext ctx;
private MessageEvent message;
@@ -229,7 +230,7 @@
@Override
public void initialized(Properties props) {
this.props = props;
- setEncoding(props.getProperty("client_encoding", "UTF-8"));
+ setEncoding(props.getProperty("client_encoding", "UTF8"));
}
@Override
@@ -258,7 +259,7 @@
// releases before 8.1; IntervalStyle was not reported by releases before 8.4;
// application_name was not reported by releases before 9.0.)
- sendParameterStatus("client_encoding", PGCharsetConverter.getEncoding(this.encoding));
+ sendParameterStatus("client_encoding", clientEncoding);
sendParameterStatus("DateStyle", this.props.getProperty("DateStyle", "ISO"));
sendParameterStatus("integer_datetimes", "off");
sendParameterStatus("is_superuser", "off");
@@ -303,8 +304,14 @@
Charset cs = PGCharsetConverter.getCharset(value);
if (cs != null) {
this.encoding = cs;
+ this.clientEncoding = value;
+ //TODO: for non-init this should send a parameter status
}
}
+
+ public Charset getEncoding() {
+ return encoding;
+ }
@Override
public void sendParameterDescription(ParameterMetaData meta, int[] paramType) {
@@ -634,7 +641,7 @@
// pg_type.typlen
writeShort(getTypeSize(info.type, info.precision));
// pg_attribute.atttypmod
- writeInt(-1);
+ writeInt(info.mod);
// text
writeShort(0);
}
@@ -663,16 +670,6 @@
sendMessage();
}
- private void sendNoticeResponse(String message) {
- trace("notice:", message);
- startMessage('N');
- write('S');
- writeString("ERROR");
- write('M');
- writeString(message);
- sendMessage();
- }
-
private void sendParseComplete() {
startMessage('1');
sendMessage();
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -64,20 +64,20 @@
private Byte messageType;
private Integer dataLength;
private boolean initialized = false;
- private Charset encoding = Charset.forName("UTF-8"); // client can override this
private ODBCServerRemote odbcProxy;
private PGRequest message;
private String user;
private String databaseName;
+ private PgBackendProtocol pgBackendProtocol;
- public PgFrontendProtocol(int maxObjectSize) {
+ public PgFrontendProtocol(PgBackendProtocol pgBackendProtocol, int maxObjectSize) {
if (maxObjectSize <= 0) {
throw new IllegalArgumentException("maxObjectSize: " + maxObjectSize); //$NON-NLS-1$
}
this.maxObjectSize = maxObjectSize;
-
+ this.pgBackendProtocol = pgBackendProtocol;
// the proxy is used for generating the object based message based on ServiceInvocationStruct class.
this.odbcProxy = (ODBCServerRemote)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {ODBCServerRemote.class}, new InvocationHandler() {
@Override
@@ -131,7 +131,7 @@
byte[] data = createByteArray(this.dataLength - 4);
buffer.readBytes(data);
- createRequestMessage(this.messageType, new NullTerminatedStringDataInputStream(data, new DataInputStream(new ByteArrayInputStream(data, 0, this.dataLength-4)), this.encoding));
+ createRequestMessage(this.messageType, new NullTerminatedStringDataInputStream(data, new DataInputStream(new ByteArrayInputStream(data, 0, this.dataLength-4)), this.pgBackendProtocol.getEncoding()));
this.dataLength = null;
this.messageType = null;
return message;
@@ -209,20 +209,16 @@
}
this.user = props.getProperty("user");
this.databaseName = props.getProperty("database");
- String clientEncoding = props.getProperty("client_encoding", "UTF-8");
+ String clientEncoding = props.getProperty("client_encoding", "UTF8");
props.setProperty("client_encoding", clientEncoding);
props.setProperty("default_transaction_isolation", "read committed");
props.setProperty("DateStyle", "ISO");
props.setProperty("TimeZone", Calendar.getInstance().getTimeZone().getDisplayName());
- Charset cs = PGCharsetConverter.getCharset(clientEncoding);
- if (cs != null) {
- this.encoding = cs;
- }
this.odbcProxy.initialize(props);
return message;
}
- private Object buildLogin(NullTerminatedStringDataInputStream data) throws IOException{
+ private Object buildLogin(NullTerminatedStringDataInputStream data) {
this.odbcProxy.logon(this.databaseName, this.user, data);
return message;
}
@@ -263,7 +259,7 @@
// the params can be either text or binary
if (formatCodeCount == 0 || (formatCodeCount == 1 && formatCodes[0] == 0) || formatCodes[i] == 0) {
- params[i] = new String(paramdata, this.encoding);
+ params[i] = new String(paramdata, this.pgBackendProtocol.getEncoding());
}
else {
params[i] = paramdata;
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/pom.xml 2012-05-04 18:06:14 UTC (rev 4056)
@@ -13,7 +13,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.3-606.jdbc3</version>
+ <version>9.1-901.jdbc4</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -93,14 +93,7 @@
}
@Test public void testProperties() throws Exception {
- String[] expected = { "Name[string] Value[string] UID[string] OID[integer] ClobValue[clob]",
- "pg_type:oid 30 mmuid:ffa4ac73-b549-470e-931f-dc36330cb8c4 1 30",
- "pg_type:oid 1009 mmuid:d9f36bdc-7b25-4af0-b9f5-a96aac6d3094 2 1009",
- "pg_type:oid 1002 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1 3 1002",
- "pg_type:oid 1028 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251 4 1028"
-
- }; //$NON-NLS-1$
- executeAndAssertResults("select* from SYS.Properties", expected); //$NON-NLS-1$
+ checkResult("testProperties", "select* from SYS.Properties"); //$NON-NLS-1$
}
@Test public void testVirtualDatabase() throws Exception {
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -30,6 +30,7 @@
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.AbstractMMQueryTestCase;
import org.teiid.jdbc.FakeServer;
+import org.teiid.jdbc.TestMMDatabaseMetaData;
/**
@@ -94,18 +95,9 @@
}
@Test public void testDefect15241b() throws Exception {
-
String sql = "SELECT p.Name, p.Value, UID FROM SYS.Properties p order by p.Name"; //$NON-NLS-1$
- String[] expected ={
- "Name[string] Value[string] UID[string]", //$NON-NLS-1$
- "NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1", //$NON-NLS-1$
- "NugentYAttribute Nuuuuuge44444 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1",
- "pg_type:oid 30 mmuid:ffa4ac73-b549-470e-931f-dc36330cb8c4" ,
- "pg_type:oid 1009 mmuid:d9f36bdc-7b25-4af0-b9f5-a96aac6d3094" ,
- "pg_type:oid 1002 mmuid:bcbed548-176c-4116-a5d6-7638cb0206e1",
- "pg_type:oid 1028 mmuid:a385751f-a31a-4d5d-9197-3fbd390b0251"
- };
- executeAndAssertResults(sql, expected);
+ execute(sql);
+ TestMMDatabaseMetaData.compareResultSet(this.internalResultSet);
}
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -137,13 +137,13 @@
@Test public void testXmlTableScrollable() throws Exception {
Statement s = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
- assertTrue(s.execute("select * from xmltable('/root/row' passing (select xmlelement(name \"root\", xmlagg(xmlelement(name \"row\", xmlforest(t.name)) order by t.name)) from tables as t, columns as t1) columns \"Name\" string) as x"));
+ assertTrue(s.execute("select * from xmltable('/root/row' passing (select xmlelement(name \"root\", xmlagg(xmlelement(name \"row\", xmlforest(t.name)) order by t.name)) from (select t.* from tables as t, columns as t1 limit 7000) as t) columns \"Name\" string) as x"));
ResultSet rs = s.getResultSet();
int count = 0;
while (rs.next()) {
count++;
}
- assertEquals(7812, count);
+ assertEquals(7000, count);
rs.beforeFirst();
while (rs.next()) {
count--;
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-04 18:06:14 UTC (rev 4056)
@@ -55,6 +55,7 @@
import org.teiid.jdbc.FakeServer;
import org.teiid.jdbc.TeiidDriver;
import org.teiid.jdbc.TestMMDatabaseMetaData;
+import org.teiid.jdbc.util.ResultSetUtil;
import org.teiid.net.socket.SocketUtil;
@SuppressWarnings("nls")
@@ -195,14 +196,14 @@
@Test public void testMultibatchSelect() throws Exception {
Statement s = conn.createStatement();
- assertTrue(s.execute("select * from tables, columns"));
+ assertTrue(s.execute("select * from tables, columns limit 7000"));
ResultSet rs = s.getResultSet();
int i = 0;
while (rs.next()) {
i++;
rs.getString(1);
}
- assertEquals(7812, i);
+ assertEquals(7000, i);
}
@Test public void testBlob() throws Exception {
@@ -364,6 +365,6 @@
ResultSet rs = s.getResultSet();
assertTrue(rs.next());
String str = rs.getString(1);
- assertEquals("ProjectNode\n + Output Columns:expr1 (integer)\n + Statistics:\n 0: Node Output Rows: 1\n 1: Node Process Time: 0\n 2: Node Cumulative Process Time: 0\n 3: Node Cumulative Next Batch Process Time: 0\n 4: Node Next Batch Calls: 1\n 5: Node Blocks: 0\n + Cost Estimates:Estimated Node Cardinality: 1.0\n + Select Columns:1\n", str);
+ assertTrue(str.startsWith("ProjectNode\n + Output Columns:expr1 (integer)\n + Statistics:\n 0: Node Output Rows: 1"));
}
}
Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -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:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null> true true 19
-parts pg_catalog matpg_relatt Table <null> false false mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null> true true 20
-parts pg_catalog pg_am Table <null> false false mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null> true false 21
-parts pg_catalog pg_attrdef Table <null> false false mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 <null> true false 22
+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:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null> true false 25
-parts pg_catalog pg_index Table <null> false false mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 <null> true true 26
+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:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null> true true 28
-parts pg_catalog pg_trigger Table <null> false false mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 <null> true false 29
+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:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null> true false 31
+parts pg_catalog pg_user Table <null> false false mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -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-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -792,7 +792,7 @@
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 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 2 <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
@@ -857,10 +857,12 @@
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 typbasetype 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_type typtypmod 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_type typrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_type typelem 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 9 <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
@@ -1084,7 +1086,7 @@
QT_Ora9DS XQT xqtFullData BigIntegerValue 2 biginteger 19 <null> 0 10 1 <null> <null> <null> <null> 28 15 YES <null> <null> <null> !
<null> NO
QT_Ora9DS XQT xqtFullData BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> !
<null> NO
QT_Ora9DS XQT xqtFullData ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> !
<null> NO
-Row Count : 1084
+Row Count : 1086
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false
SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true
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-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -1,8 +1,262 @@
-integer integer string string
-adrelid adnum adbin adsrc
-Row Count : 0
+integer short string string
+adrelid adnum adbin adsrc
+8 1 <null> <null>
+8 2 <null> <null>
+8 3 <null> <null>
+8 4 <null> <null>
+8 5 <null> <null>
+8 6 <null> <null>
+8 7 <null> <null>
+8 8 <null> <null>
+8 9 <null> <null>
+8 10 <null> <null>
+8 11 <null> <null>
+8 12 <null> <null>
+8 13 <null> <null>
+8 14 <null> <null>
+8 15 <null> <null>
+8 16 <null> <null>
+8 17 <null> <null>
+8 18 <null> <null>
+8 19 <null> <null>
+8 20 <null> <null>
+8 21 <null> <null>
+8 22 <null> <null>
+8 23 <null> <null>
+8 24 <null> <null>
+8 25 <null> <null>
+8 26 <null> <null>
+8 27 <null> <null>
+8 28 <null> <null>
+8 29 <null> <null>
+8 30 <null> <null>
+8 31 <null> <null>
+9 1 <null> <null>
+9 2 <null> <null>
+9 3 <null> <null>
+9 4 <null> <null>
+9 5 <null> <null>
+9 6 (0) (0)
+9 7 (0) (0)
+9 8 <null> <null>
+9 9 ('0') ('0')
+9 10 ('0') ('0')
+9 11 ('0') ('0')
+9 12 <null> <null>
+9 13 <null> <null>
+9 14 <null> <null>
+9 15 <null> <null>
+9 16 <null> <null>
+9 17 <null> <null>
+9 18 <null> <null>
+9 19 <null> <null>
+10 1 <null> <null>
+10 2 <null> <null>
+10 3 <null> <null>
+10 4 <null> <null>
+10 5 <null> <null>
+10 6 <null> <null>
+10 7 <null> <null>
+10 8 <null> <null>
+10 9 <null> <null>
+10 10 <null> <null>
+11 1 <null> <null>
+11 2 <null> <null>
+11 3 <null> <null>
+11 4 <null> <null>
+11 5 <null> <null>
+11 6 <null> <null>
+11 7 <null> <null>
+11 8 <null> <null>
+11 9 <null> <null>
+11 10 <null> <null>
+11 11 <null> <null>
+6 1 <null> <null>
+6 2 <null> <null>
+6 3 <null> <null>
+6 4 <null> <null>
+6 5 <null> <null>
+6 6 <null> <null>
+6 7 <null> <null>
+6 8 <null> <null>
+6 9 <null> <null>
+1 1 <null> <null>
+1 2 <null> <null>
+1 3 <null> <null>
+1 4 <null> <null>
+2 1 <null> <null>
+2 2 <null> <null>
+3 1 <null> <null>
+3 2 <null> <null>
+4 1 <null> <null>
+4 2 <null> <null>
+4 3 <null> <null>
+4 4 <null> <null>
+4 5 <null> <null>
+5 1 <null> <null>
+5 2 <null> <null>
+5 3 <null> <null>
+5 4 <null> <null>
+12 1 <null> <null>
+12 2 <null> <null>
+12 3 <null> <null>
+12 4 <null> <null>
+12 5 <null> <null>
+12 6 <null> <null>
+12 7 <null> <null>
+12 8 <null> <null>
+12 9 <null> <null>
+12 10 (0) (0)
+12 11 (0) (0)
+12 12 <null> <null>
+12 13 <null> <null>
+12 14 <null> <null>
+12 15 <null> <null>
+12 16 <null> <null>
+13 1 <null> <null>
+13 2 <null> <null>
+13 3 <null> <null>
+13 4 <null> <null>
+13 5 <null> <null>
+13 6 <null> <null>
+13 7 <null> <null>
+13 8 <null> <null>
+14 1 <null> <null>
+14 2 <null> <null>
+14 3 <null> <null>
+14 4 <null> <null>
+14 5 <null> <null>
+15 1 <null> <null>
+15 2 <null> <null>
+15 3 <null> <null>
+15 4 <null> <null>
+15 5 <null> <null>
+15 6 <null> <null>
+15 7 <null> <null>
+15 8 <null> <null>
+15 9 <null> <null>
+15 10 <null> <null>
+15 11 <null> <null>
+15 12 <null> <null>
+15 13 <null> <null>
+15 14 <null> <null>
+16 1 <null> <null>
+16 2 <null> <null>
+16 3 <null> <null>
+16 4 <null> <null>
+16 5 <null> <null>
+16 6 <null> <null>
+16 7 <null> <null>
+17 1 <null> <null>
+17 2 <null> <null>
+17 3 <null> <null>
+17 4 <null> <null>
+17 5 <null> <null>
+17 6 <null> <null>
+17 7 <null> <null>
+17 8 <null> <null>
+17 9 <null> <null>
+17 10 <null> <null>
+17 11 <null> <null>
+17 12 <null> <null>
+17 13 <null> <null>
+7 1 <null> <null>
+7 2 <null> <null>
+18 1 <null> <null>
+18 2 <null> <null>
+19 1 <null> <null>
+19 2 <null> <null>
+19 3 <null> <null>
+19 4 <null> <null>
+19 5 <null> <null>
+20 1 <null> <null>
+20 2 <null> <null>
+20 3 <null> <null>
+20 4 <null> <null>
+20 5 <null> <null>
+20 6 <null> <null>
+20 7 <null> <null>
+21 1 <null> <null>
+21 2 <null> <null>
+22 1 <null> <null>
+22 2 <null> <null>
+22 3 <null> <null>
+22 4 <null> <null>
+23 1 <null> <null>
+23 2 <null> <null>
+23 3 <null> <null>
+23 4 <null> <null>
+23 5 <null> <null>
+23 6 <null> <null>
+23 7 <null> <null>
+23 8 <null> <null>
+23 9 <null> <null>
+23 10 <null> <null>
+24 1 <null> <null>
+24 2 <null> <null>
+24 3 <null> <null>
+24 4 <null> <null>
+24 5 <null> <null>
+24 6 <null> <null>
+24 7 <null> <null>
+24 8 <null> <null>
+24 9 <null> <null>
+25 1 <null> <null>
+25 2 <null> <null>
+25 3 <null> <null>
+25 4 <null> <null>
+25 5 <null> <null>
+25 6 <null> <null>
+25 7 <null> <null>
+25 8 <null> <null>
+25 9 <null> <null>
+26 1 <null> <null>
+26 2 <null> <null>
+26 3 <null> <null>
+26 4 <null> <null>
+26 5 <null> <null>
+26 6 <null> <null>
+26 7 <null> <null>
+26 8 <null> <null>
+27 1 <null> <null>
+27 2 <null> <null>
+28 1 <null> <null>
+28 2 <null> <null>
+28 3 <null> <null>
+28 4 <null> <null>
+28 5 <null> <null>
+28 6 <null> <null>
+28 7 <null> <null>
+28 8 <null> <null>
+28 9 <null> <null>
+28 10 <null> <null>
+29 1 <null> <null>
+29 2 <null> <null>
+29 3 <null> <null>
+29 4 <null> <null>
+29 5 <null> <null>
+29 6 <null> <null>
+29 7 <null> <null>
+29 8 <null> <null>
+29 9 <null> <null>
+30 1 <null> <null>
+30 2 <null> <null>
+30 3 <null> <null>
+30 4 <null> <null>
+30 5 <null> <null>
+30 6 <null> <null>
+30 7 <null> <null>
+30 8 <null> <null>
+30 9 <null> <null>
+30 10 <null> <null>
+30 11 <null> <null>
+31 1 <null> <null>
+31 2 <null> <null>
+31 3 <null> <null>
+31 4 <null> <null>
+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 4 PartsSupplier java.lang.Integer adnum 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
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-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -179,7 +179,7 @@
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 23 4 2 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
@@ -244,15 +244,17 @@
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 typbasetype 23 4 6 4 false false false
-246 30 typtypmod 23 4 7 4 false false false
-247 30 typrelid 23 4 8 4 false false false
-248 30 typelem 23 4 9 4 false false false
-249 31 oid 23 4 1 4 false false false
-250 31 usename 1043 -1 2 4 false false false
-251 31 usecreatedb 16 1 3 4 false false false
-252 31 usesuper 16 1 4 4 false false false
-Row Count : 252
+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
+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
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-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -1,41 +1,41 @@
-integer string integer short char integer integer integer integer
-oid typname typnamespace typlen typtype typbasetype typtypmod typrelid typelem
-16 boolean 3 1 b 0 -1 0 0
-1043 string 3 -1 b 0 -1 0 0
-25 text 3 -1 b 0 -1 0 0
-1042 char 3 1 b 0 -1 0 0
-21 short 3 2 b 0 -1 0 0
-20 long 3 8 b 0 -1 0 0
-23 integer 3 4 b 0 -1 0 0
-26 oid 3 4 b 0 -1 0 0
-700 float 3 4 b 0 -1 0 0
-701 double 3 8 b 0 -1 0 0
-705 unknown 3 -2 b 0 -1 0 0
-1082 date 3 4 b 0 -1 0 0
-1083 datetime 3 8 b 0 -1 0 0
-1114 timestamp 3 8 b 0 -1 0 0
-1700 decimal 3 -1 b 0 -1 0 0
-142 xml 3 -1 b 0 -1 0 0
-14939 lo 3 -1 b 0 -1 0 0
-2278 void 3 4 p 0 -1 0 0
-2249 record 3 -1 p 0 -1 0 0
-30 oidvector 3 -1 b 0 -1 0 26
-1000 _bool 3 -1 b 0 -1 0 16
-1002 _char 3 -1 b 0 -1 0 18
-1005 _int2 3 -1 b 0 -1 0 21
-1007 _int4 3 -1 b 0 -1 0 23
-1009 _text 3 -1 b 0 -1 0 25
-1028 _oid 3 -1 b 0 -1 0 26
-1014 _bpchar 3 -1 b 0 -1 0 1042
-1015 _varchar 3 -1 b 0 -1 0 1043
-1016 _int8 3 -1 b 0 -1 0 20
-1021 _float4 3 -1 b 0 -1 0 700
-1022 _float8 3 -1 b 0 -1 0 701
-1115 _timestamp 3 -1 b 0 -1 0 1114
-1182 _date 3 -1 b 0 -1 0 1082
-1183 _time 3 -1 b 0 -1 0 1083
-2287 _record 3 -1 b 0 -1 0 2249
-2283 anyelement 3 4 p 0 -1 0 0
+integer string integer short char boolean integer integer char integer integer
+oid typname typnamespace typlen typtype typnotnull typbasetype typtypmod typdelim typrelid typelem
+16 boolean 3 1 b false 0 -1 , 0 0
+1043 string 3 -1 b false 0 -1 , 0 0
+25 text 3 -1 b false 0 -1 , 0 0
+1042 char 3 1 b false 0 -1 , 0 0
+21 short 3 2 b false 0 -1 , 0 0
+20 long 3 8 b false 0 -1 , 0 0
+23 integer 3 4 b false 0 -1 , 0 0
+26 oid 3 4 b false 0 -1 , 0 0
+700 float 3 4 b false 0 -1 , 0 0
+701 double 3 8 b false 0 -1 , 0 0
+705 unknown 3 -2 b false 0 -1 , 0 0
+1082 date 3 4 b false 0 -1 , 0 0
+1083 datetime 3 8 b false 0 -1 , 0 0
+1114 timestamp 3 8 b false 0 -1 , 0 0
+1700 decimal 3 -1 b false 0 -1 , 0 0
+142 xml 3 -1 b false 0 -1 , 0 0
+14939 lo 3 -1 b false 0 -1 , 0 0
+2278 void 3 4 p false 0 -1 , 0 0
+2249 record 3 -1 p false 0 -1 , 0 0
+30 oidvector 3 -1 b false 0 -1 , 0 26
+1000 _bool 3 -1 b false 0 -1 , 0 16
+1002 _char 3 -1 b false 0 -1 , 0 18
+1005 _int2 3 -1 b false 0 -1 , 0 21
+1007 _int4 3 -1 b false 0 -1 , 0 23
+1009 _text 3 -1 b false 0 -1 , 0 25
+1028 _oid 3 -1 b false 0 -1 , 0 26
+1014 _bpchar 3 -1 b false 0 -1 , 0 1042
+1015 _varchar 3 -1 b false 0 -1 , 0 1043
+1016 _int8 3 -1 b false 0 -1 , 0 20
+1021 _float4 3 -1 b false 0 -1 , 0 700
+1022 _float8 3 -1 b false 0 -1 , 0 701
+1115 _timestamp 3 -1 b false 0 -1 , 0 1114
+1182 _date 3 -1 b false 0 -1 , 0 1082
+1183 _time 3 -1 b false 0 -1 , 0 1083
+2287 _record 3 -1 b false 0 -1 , 0 2249
+2283 anyelement 3 4 p false 0 -1 , 0 0
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
@@ -43,7 +43,9 @@
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
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -3,4 +3,4 @@
PART_ID
Row Count : 1
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
-x 12 java.lang.String x varchar 2147483647 0 0 false true false false 1 false true false true
+x 12 java.lang.String x varchar 4000 4000 0 false true false false 1 false true false true
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -3,8 +3,8 @@
oid 1 pg_attribute pg_catalog pg_attribute
Row Count : 1
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
-attname 12 java.lang.String attname varchar 2147483647 0 0 false true false false 0 false true false true
+attname 12 java.lang.String attname varchar 255 255 0 false true false false 0 false true false true
attnum 5 java.lang.Integer attnum int2 6 5 0 false false false false 2 false true true true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
-nspname 12 java.lang.String nspname varchar 2147483647 0 0 false true false false 1 false true false true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
+nspname 12 java.lang.String nspname varchar 255 255 0 false true false false 1 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -3,8 +3,8 @@
oid 1 pg_attribute pg_catalog pg_attribute
Row Count : 1
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
-attname 12 java.lang.String attname varchar 2147483647 0 0 false true false false 0 false true false true
+attname 12 java.lang.String attname varchar 255 255 0 false true false false 0 false true false true
attnum 5 java.lang.Integer attnum int2 6 5 0 false false false false 2 false true true true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
-nspname 12 java.lang.String nspname varchar 2147483647 0 0 false true false false 1 false true false true
-relname 12 java.lang.String relname varchar 2147483647 0 0 false true false false 0 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
+nspname 12 java.lang.String nspname varchar 255 255 0 false true false false 1 false true false true
+relname 12 java.lang.String relname varchar 2048 2048 0 false true false false 0 false true false true
Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -1,48 +1,48 @@
-varchar varchar varchar varchar varchar bool bool varchar int4 varchar bool bool int4
-vdbname schemaname name type nameinsource isphysical supportsupdates uid cardinality description issystem ismaterialized oid
-parts SYS Columns Table <null> true false mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1 <null> true false 8
-parts SYS DataTypes Table <null> true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1 <null> true false 9
-parts SYS KeyColumns Table <null> true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1 <null> true false 10
-parts SYS Keys Table <null> true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1 <null> true false 11
-parts SYSADMIN MatViews Table <null> true false mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1 <null> true false 6
-parts PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false 1
-parts PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false 2
-parts PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false 3
-parts PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false 4
-parts PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false 5
-parts SYS ProcedureParams Table <null> true false mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1 <null> true false 12
-parts SYS Procedures Table <null> true false mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1 <null> true false 13
-parts SYS Properties Table <null> true false mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1 <null> true false 14
-parts SYS ReferenceKeyColumns Table <null> true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1 <null> true false 15
-parts SYS Schemas Table <null> true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1 <null> true false 16
-parts SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null> true false 17
-parts SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null> true false 7
-parts SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null> true false 18
-parts pg_catalog matpg_datatype Table <null> false false mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null> true true 19
-parts pg_catalog matpg_relatt Table <null> false false mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null> true true 20
-parts pg_catalog pg_am Table <null> false false mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null> true false 21
-parts pg_catalog pg_attrdef Table <null> false false mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -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:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null> true false 25
-parts pg_catalog pg_index Table <null> false false mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -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:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null> true true 28
-parts pg_catalog pg_trigger Table <null> false false mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -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:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null> true false 31
+varchar varchar varchar varchar varchar bool bool varchar int4 varchar bool bool int4
+vdbname schemaname name type nameinsource isphysical supportsupdates uid cardinality description issystem ismaterialized oid
+parts SYS Columns Table <null> true false mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1 <null> true false 8
+parts SYS DataTypes Table <null> true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1 <null> true false 9
+parts SYS KeyColumns Table <null> true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1 <null> true false 10
+parts SYS Keys Table <null> true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1 <null> true false 11
+parts SYSADMIN MatViews Table <null> true false mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1 <null> true false 6
+parts PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false 1
+parts PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false 2
+parts PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false 3
+parts PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false 4
+parts PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false 5
+parts SYS ProcedureParams Table <null> true false mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1 <null> true false 12
+parts SYS Procedures Table <null> true false mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1 <null> true false 13
+parts SYS Properties Table <null> true false mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1 <null> true false 14
+parts SYS ReferenceKeyColumns Table <null> true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1 <null> true false 15
+parts SYS Schemas Table <null> true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1 <null> true false 16
+parts SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null> true false 17
+parts SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null> true false 7
+parts SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null> true false 18
+parts 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
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 2147483647 0 0 false true false false 1 false true false true
-schemaname 12 java.lang.String schemaname varchar 2147483647 0 0 false true false false 1 false true false true
-name 12 java.lang.String name varchar 2147483647 0 0 false true false false 0 false true false true
-type 12 java.lang.String type varchar 2147483647 0 0 false true false false 0 false true false true
-nameinsource 12 java.lang.String nameinsource varchar 2147483647 0 0 false true false false 1 false true false true
+vdbname 12 java.lang.String vdbname varchar 255 255 0 false true false false 1 false true false true
+schemaname 12 java.lang.String schemaname varchar 255 255 0 false true false false 1 false true false true
+name 12 java.lang.String name varchar 255 255 0 false true false false 0 false true false true
+type 12 java.lang.String type varchar 20 20 0 false true false false 0 false true false true
+nameinsource 12 java.lang.String nameinsource varchar 255 255 0 false true false false 1 false true false true
isphysical -7 java.lang.Boolean isphysical bool 1 1 0 false false false false 0 false true false true
supportsupdates -7 java.lang.Boolean supportsupdates bool 1 1 0 false false false false 0 false true false true
-uid 12 java.lang.String uid varchar 2147483647 0 0 false true false false 0 false true false true
+uid 12 java.lang.String uid varchar 50 50 0 false true false false 0 false true false true
cardinality 4 java.lang.Integer cardinality int4 11 10 0 false false false false 0 false true true true
-description 12 java.lang.String description varchar 2147483647 0 0 false true false false 1 false true false true
+description 12 java.lang.String description varchar 255 255 0 false true false false 1 false true false true
issystem -7 java.lang.Boolean issystem bool 1 1 0 false false false false 1 false true false true
ismaterialized -7 java.lang.Boolean ismaterialized bool 1 1 0 false false false false 0 false true false true
oid 4 java.lang.Integer oid int4 11 10 0 false false false false 0 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -179,7 +179,7 @@
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 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 2 <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
@@ -244,15 +244,17 @@
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 typbasetype 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_type typtypmod 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_type typrelid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_type typelem 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 9 <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
-Row Count : 252
+Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false
SchemaName 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -162,97 +162,99 @@
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:e22c521a-e208-4!
181-9dbd-89f5de7014b9 <null> 181
-PartsSupplier pg_catalog pg_attrdef adnum 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:e9b278d4-49af-4!
42f-9a5a-b699fe3b102b <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:4589389f-4abd-4!
2a6-818f-ff1f2a085dfb <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:492dd834-907f-4!
29b-aa6e-958ad65204c6 <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:da4b747e-7d87-4!
03a-8309-2cdf1399031b <null> 178
+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:5cfb2b62-a912-4!
bfb-bf4f-51e107fe210c <null> 172
+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:0b0894ba-e1ea-4!
eaf-bcd2-ea9ebd05e47d <null> 171
+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:5c7bf056-ecc5-4!
1ea-a122-7a4b1de9908a <null> 170
+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:23454408-0347-4!
0d2-a3f9-3faa664fb5e9 <null> 175
+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 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:8b993c11-de2b-4!
8bc-beb1-3e44c46811b4 <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:5c9d54b2-433f-4!
43a-85ce-821f42ed109e <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:4b5beb14-03a0-4!
652-9d6f-5f8cc74d470c <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:36db343d-e99a-4!
27c-a4e2-763a720ce4a4 <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:c2bdf40c-ec58-4!
39c-a403-7adf604ceadd <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:1aedd02c-5801-4!
1e7-accd-da1f257c26e8 <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:28d034eb-6f39-4!
02f-b642-9c9560e57247 <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:3b621b25-171c-4!
05b-8bf9-635cf93f2273 <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:1e6dbecd-9a2d-4!
aef-afbe-665de7acb9d6 <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:8709e084-48df-4!
17d-b3f8-f4e9b7d8802b <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:9f873e0f-903d-4!
c9d-8c37-1073b5ec4c67 <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:9ea3b6d2-b27b-4!
bb1-a99d-b703c3308384 <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:a52c714d-dfe9-4!
06c-906b-fadd53ac4e98 <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:347ec08c-6b41-4!
1d0-8475-031ce7d99ac0 <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:16998907-e1dd-4!
47e-898d-780994d30619 <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:b4e04928-9a59-4!
718-a7f1-3a60bcae7449 <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:f1998229-2c1a-4!
7b7-8f46-9dda81446db6 <null> 174
+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:053375a4-3971-4!
705-9146-9ecc640022c2 <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:3c67619c-7d8f-4!
378-b7e9-84a0451ea5e5 <null> 177
+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:689cde3b-a631-4!
f25-94b4-ff2ffe022b0f <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:83ae2247-7eec-4!
59f-b037-ffd3cdca0627 <null> 211
+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:bdf3ee1e-b5b7-4!
8ab-b43c-4bbb2c8ae1e2 <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:635b6634-632c-4!
3c9-8cc7-bcaa016133e8 <null> 231
+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:bb78401d-d10c-4!
3b1-af84-e4fa6b95db42 <null> 249
-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:a385751f-a31a-4!
d5d-9197-3fbd390b0251 <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:bcbed548-176c-4!
116-a5d6-7638cb0206e1 <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:d9f36bdc-7b25-4!
af0-b9f5-a96aac6d3094 <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:ffa4ac73-b549-4!
70e-931f-dc36330cb8c4 <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:b288b3aa-37f2-4!
a8e-8b1b-e932a2ce3e25 <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:e5715456-245f-4!
846-b90b-01d06d1c3672 <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:6796c2e7-48a4-4!
f9f-bc98-d47913e2491c <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:e0244e1d-431c-4!
1fa-8194-1e357e2b688b <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:9fb5a34a-3a7e-4!
d38-b7cd-239f28a3504e <null> 224
+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:ffbf69c1-2e34-4!
764-a9b3-9a1b61bfd4af <null> 173
+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 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:0c20dbe7-5d89-4!
11f-a8ab-3d77b999595b <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:c010d12f-2074-4!
5db-8e18-979cee2c45da <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:64977f3e-f2a0-4!
66e-a5d1-80bb058cbe08 <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:bfbff036-caf2-4!
652-80cf-398af17ed7d1 <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:250d7c06-728a-4!
b2a-b557-91f2a69bb184 <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:da4b59ca-ebff-4!
5a8-ad68-9777bc587813 <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:d70f020b-658c-4!
f58-86dc-0fbb12e2d8af <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:71091853-c65e-4!
6a9-9947-aa024f806e2d <null> 239
-PartsSupplier pg_catalog pg_type typbasetype 6 <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:a17d2f61-cd68-4!
c0d-8d25-132f68eb3b67 <null> 245
-PartsSupplier pg_catalog pg_type typelem 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:22ac431d-e6e6-4!
eef-9d74-b31795424e97 <null> 248
-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:0e9c4439-48d0-4!
115-a343-5baab7a236b6 <null> 169
+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:0f312b3c-98ca-4!
a09-81fa-f1ff83f0a6c1 <null> 166
+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 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:595a823f-cec1-4!
2dc-b8b2-c95c8b4e4e66 <null> 176
-PartsSupplier pg_catalog pg_type typrelid 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 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 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 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:87826ebc-98a5-4!
f19-a6d8-6b7b96cbed48 <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:6da98878-b46e-4!
ed1-b032-1bc72da595f4 <null> 251
-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:236445e1-408c-4!
0a1-a61c-40e96fb5dc9f <null> 250
-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:9bfddc66-af75-4!
366-8eac-b9fef3421219 <null> 252
-Row Count : 252
+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
+Row Count : 254
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 PartsSupplier java.lang.String VDBName string SYS Columns 255 255 0 false false false false 0 true true false false
SchemaName 12 PartsSupplier java.lang.String SchemaName string SYS Columns 255 255 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -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:559efade-b320-49bd-8524-1d325ae11c82 1 14
-PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index <null> mmuid:349f0c8c-7c64-4e0a-a84a-aee3deaf83af 2 18
-PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index <null> mmuid:349f0c8c-7c64-4e0a-a84a-aee3deaf83af 1 17
-PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary <null> mmuid:eda814fb-0a5a-4fbf-87bc-b57952292038 2 11
-PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary <null> mmuid:559efade-b320-49bd-8524-1d325ae11c82 3 16
-PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index <null> mmuid:443a2ab3-8257-4c4c-838e-9a47deaf4cf9 2 13
-PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary <null> mmuid:eda814fb-0a5a-4fbf-87bc-b57952292038 1 10
+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:1462b28e-0bab-436f-9654-013821506337 1 21
-PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary <null> mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed 1 22
-PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary <null> mmuid:559efade-b320-49bd-8524-1d325ae11c82 2 15
-PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index <null> mmuid:443a2ab3-8257-4c4c-838e-9a47deaf4cf9 1 12
+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
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-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -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:349f0c8c-7c64-4e0a-a84a-aee3deaf83af 12
-PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids <null> <null> Index false <null> mmuid:443a2ab3-8257-4c4c-838e-9a47deaf4cf9 10
-PartsSupplier pg_catalog matpg_datatype matpg_datatype_names <null> <null> Primary false <null> mmuid:eda814fb-0a5a-4fbf-87bc-b57952292038 9
-PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names <null> <null> Primary false <null> mmuid:559efade-b320-49bd-8524-1d325ae11c82 11
+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:1462b28e-0bab-436f-9654-013821506337 15
-PartsSupplier pg_catalog pg_proc pk_pg_proc <null> <null> Primary false <null> mmuid:9569efdb-21b2-4b4f-a2db-e7406267b8ed 16
+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
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
Added: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected (rev 0)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -0,0 +1,13 @@
+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]
+Row Count : 4
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+Name 12 PartsSupplier java.lang.String Name string SYS Properties 255 255 0 false true false false 0 true true true false
+Value 12 PartsSupplier java.lang.String Value string SYS Properties 255 255 0 false true false false 0 true true true false
+UID 12 PartsSupplier java.lang.String UID string SYS Properties 50 50 0 false false false false 0 true true true false
+OID 4 PartsSupplier java.lang.Integer OID integer SYS Properties 11 10 0 false false false false 0 true true false false
+ClobValue 2005 PartsSupplier java.sql.Clob ClobValue clob SYS Properties 2097152 2097152 0 false true false true 1 false true true true
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-05-02 21:36:21 UTC (rev 4055)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -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:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null> true true 19
-PartsSupplier pg_catalog matpg_relatt Table <null> false false mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null> true true 20
-PartsSupplier pg_catalog pg_am Table <null> false false mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null> true false 21
-PartsSupplier pg_catalog pg_attrdef Table <null> false false mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 <null> true false 22
+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:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null> true false 25
-PartsSupplier pg_catalog pg_index Table <null> false false mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 <null> true true 26
+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:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null> true true 28
-PartsSupplier pg_catalog pg_trigger Table <null> false false mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 <null> true false 29
+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:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null> true false 31
+PartsSupplier pg_catalog pg_user Table <null> false false mmuid:236445e1-408c-40a1-a61c-40e96fb5dc9f -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
Added: trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected (rev 0)
+++ trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-05-04 18:06:14 UTC (rev 4056)
@@ -0,0 +1,13 @@
+string string string
+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
+Row Count : 6
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+Name 12 xmlvp java.lang.String Name string SYS Properties 255 255 0 false true false false 0 true true true false
+Value 12 xmlvp java.lang.String Value string SYS Properties 255 255 0 false true false false 0 true true true false
+UID 12 xmlvp java.lang.String UID string SYS Properties 50 50 0 false false false false 0 true true true false