diff --git a/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java b/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
index 3239119b3f..749aea32d7 100644
--- a/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
+++ b/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
@@ -191,6 +191,7 @@ public class SourceSystemFunctions {
 	public static final String ST_EQUALS = "st_equals"; //$NON-NLS-1$
 	public static final String ST_TRANSFORM = "st_transform"; //$NON-NLS-1$
 	public static final String ST_SIMPLIFY = "st_simplify"; //$NON-NLS-1$
+	public static final String ST_SIMPLIFYPRESERVETOPOLOGY = "st_simplifypreservetopology"; //$NON-NLS-1$
 	public static final String ST_FORCE_2D = "st_force_2d"; //$NON-NLS-1$
 	public static final String ST_ENVELOPE = "st_envelope"; //$NON-NLS-1$
 	public static final String ST_WITHIN = "st_within"; //$NON-NLS-1$
@@ -237,5 +238,7 @@ public class SourceSystemFunctions {
     public static final String ST_X = "st_x"; //$NON-NLS-1$
     public static final String ST_Y = "st_y"; //$NON-NLS-1$
     public static final String ST_Z = "st_z"; //$NON-NLS-1$
+    public static final String ST_MAKEENVELOPE = "st_makeenvelope"; //$NON-NLS-1$
+    public static final String ST_SNAPTOGRID = "st_snaptogrid"; //$NON-NLS-1$
 	
 }
diff --git a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
index 678f3dbfdd..e593d357a3 100644
--- a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
+++ b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
@@ -216,8 +216,13 @@ <h2 class="western"><a name="Compatibility"></a>Compatibility Issues</h2>
 <p><a href="https://issues.jboss.org/browse/TEIID-4205">TEIID-4205</a> By default, 
 the wrapping begin/commit of a UseDeclareFetch cursor will be ignored as Teiid does not require a transaction.  
 Set the org.teiid.honorDeclareFetchTxn system property to false to revert to the old behavior which honored the transaction.</p>
+    <li/>
+<p><a href="https://issues.jboss.org/browse/TEIID-4866">TEIID-4866</a> For usability 
+with SQLAlchemy and Superset the version() function over ODBC will report ""PostgreSQL 8.2" rather than "Teiid version".  
+You can use the system property org.teiid.pgVersion to control this further.</p>
 </ul>
 
+
 <h4 class="western">from ${project.version}</h4>
 <ul>
 	<li/>
diff --git a/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java b/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
index 6da1817c58..c67bff7778 100644
--- a/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
+++ b/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
@@ -276,6 +276,10 @@ public int getRow() throws SQLException {
         }
         return getAbsoluteRowNumber();
     }
+    
+    public Object getRawCurrentValue() {
+        return currentValue;
+    }
 
     /**
      * Get the value of the current row at the column index specified.
@@ -300,21 +304,21 @@ public Object getObjectDirect(int column) throws SQLException {
         if (currentValue instanceof Streamable<?>) {
     		Object reference = ((Streamable<?>)currentValue).getReference();
         	if (reference != null) {
-        		currentValue = reference;
-        		return currentValue;
+        		return reference;
         	}
             if(currentValue instanceof ClobType){
-            	currentValue = new ClobImpl(createInputStreamFactory((ClobType)currentValue), ((ClobType)currentValue).getLength());
+            	return new ClobImpl(createInputStreamFactory((ClobType)currentValue), ((ClobType)currentValue).getLength());
             }
             else if (currentValue instanceof BlobType) {
             	InputStreamFactory isf = createInputStreamFactory((BlobType)currentValue);
             	isf.setLength(((BlobType)currentValue).getLength());
-            	currentValue = new BlobImpl(isf);
+            	return new BlobImpl(isf);
             }
             else if (currentValue instanceof XMLType) {
             	XMLType val = (XMLType)currentValue;
-            	currentValue = new SQLXMLImpl(createInputStreamFactory(val));
-            	((SQLXMLImpl)currentValue).setEncoding(val.getEncoding());
+            	SQLXMLImpl impl = new SQLXMLImpl(createInputStreamFactory(val));
+            	impl.setEncoding(val.getEncoding());
+            	return impl;
             } 
         } 
         else if (currentValue instanceof java.util.Date) {
@@ -322,11 +326,11 @@ else if (currentValue instanceof java.util.Date) {
         }
         else if (maxFieldSize > 0 && currentValue instanceof String) {
         	String val = (String)currentValue;
-        	currentValue = val.substring(0, Math.min(maxFieldSize/2, val.length()));
+        	return val.substring(0, Math.min(maxFieldSize/2, val.length()));
         }
         else if (currentValue instanceof BinaryType) {
         	BinaryType val = (BinaryType)currentValue;
-        	currentValue = val.getBytesDirect();
+        	return val.getBytesDirect();
         }
         return currentValue;
     }
diff --git a/client/src/main/java/org/teiid/jdbc/StatementImpl.java b/client/src/main/java/org/teiid/jdbc/StatementImpl.java
index 017cf65207..10d21438d5 100644
--- a/client/src/main/java/org/teiid/jdbc/StatementImpl.java
+++ b/client/src/main/java/org/teiid/jdbc/StatementImpl.java
@@ -162,7 +162,7 @@ enum State {
     static Pattern TRANSACTION_STATEMENT = Pattern.compile("\\s*(commit|rollback|(start\\s+transaction))\\s*;?\\s*", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
     static Pattern SET_STATEMENT = Pattern.compile("\\s*set(?:\\s+(payload))?\\s+((?:session authorization)|(?:[a-zA-Z]\\w*)|(?:\"[^\"]*\")+)\\s+(?:to\\s+)?((?:[^\\s]*)|(?:'[^']*')+)\\s*;?\\s*", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
     static Pattern SET_CHARACTERISTIC_STATEMENT = Pattern.compile("\\s*set\\s+session\\s+characteristics\\s+as\\s+transaction\\s+isolation\\s+level\\s+((?:read\\s+(?:(?:committed)|(?:uncommitted)))|(?:repeatable\\s+read)|(?:serializable))\\s*", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-    static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s+([a-zA-Z]\\w*|(?:\"[^\"]*\")+)\\s*;?\\s*?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+    static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s+((?:transaction isolation level)|(?:[a-zA-Z]\\w*)|(?:\"[^\"]*\")+)\\s*;?\\s*", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
     
     /**
      * MMStatement Constructor.
@@ -646,6 +646,30 @@ ResultsFuture<Boolean> executeShow(Matcher match)
 					new String[] {DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING});
 			return booleanFuture(true);
 		}
+		if (show.equalsIgnoreCase("transaction isolation level")) { //$NON-NLS-1$
+            List<ArrayList<Object>> records = new ArrayList<ArrayList<Object>>(1);
+            ArrayList<Object> row = new ArrayList<Object>(1);
+            switch (driverConnection.getTransactionIsolation()) {
+            case Connection.TRANSACTION_READ_COMMITTED:
+                row.add("READ COMMITTED"); //$NON-NLS-1$
+                break;
+            case Connection.TRANSACTION_READ_UNCOMMITTED:
+                row.add("READ UNCOMMITTED"); //$NON-NLS-1$
+                break;
+            case Connection.TRANSACTION_REPEATABLE_READ:
+                row.add("REPEATABLE READ"); //$NON-NLS-1$
+                break;
+            case Connection.TRANSACTION_SERIALIZABLE:
+                row.add("SERIALIZABLE"); //$NON-NLS-1$
+                break;
+            default:
+                row.add("UNKNOWN"); //$NON-NLS-1$
+            }
+            records.add(row);
+            createResultSet(records, new String[] {"TRANSACTION ISOLATION"}, //$NON-NLS-1$
+                    new String[] {DataTypeManager.DefaultDataTypes.STRING});
+            return booleanFuture(true);
+        }
 		List<List<String>> records = Collections.singletonList(Collections.singletonList(driverConnection.getExecutionProperty(show)));
 		createResultSet(records, new String[] {show}, new String[] {DataTypeManager.DefaultDataTypes.STRING});
 		return booleanFuture(true);
diff --git a/client/src/test/java/org/teiid/jdbc/TestStatement.java b/client/src/test/java/org/teiid/jdbc/TestStatement.java
index 0aafc42cd6..acd3a99b29 100644
--- a/client/src/test/java/org/teiid/jdbc/TestStatement.java
+++ b/client/src/test/java/org/teiid/jdbc/TestStatement.java
@@ -32,6 +32,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
+import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
 
@@ -295,4 +296,20 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
 		Mockito.verify(conn).setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ);
 	}
 	
+	@Test public void testShowTxnIsolationLevel() throws SQLException {
+        ConnectionImpl conn = Mockito.mock(ConnectionImpl.class);
+        StatementImpl statement = new StatementImpl(conn, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY) {
+            @Override
+            protected TimeZone getServerTimeZone() throws SQLException {
+                return TimeZone.getDefault();
+            }  
+        };
+        Mockito.stub(conn.getTransactionIsolation()).toReturn(Connection.TRANSACTION_READ_COMMITTED);
+        assertTrue(statement.execute("show transaction isolation level")); //$NON-NLS-1$
+        ResultSet rs = statement.getResultSet();
+        rs.next();
+        assertEquals("READ COMMITTED", rs.getString(1));
+        assertFalse(rs.next());
+    }
+	
 }
diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
index 841eeb5227..e530d1f0c5 100644
--- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
+++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
@@ -679,6 +679,8 @@ public List<String> getSupportedFunctions() {
             supportedFunctions.add(SourceSystemFunctions.ST_UNION);
             supportedFunctions.add(SourceSystemFunctions.ST_X);
             supportedFunctions.add(SourceSystemFunctions.ST_Y);
+            supportedFunctions.add(SourceSystemFunctions.ST_SNAPTOGRID);
+            supportedFunctions.add(SourceSystemFunctions.ST_SIMPLIFYPRESERVETOPOLOGY);
         }
         if (this.postGisVersion.compareTo(ONE_4) >= 0) {
         	supportedFunctions.add(SourceSystemFunctions.ST_ASGEOJSON);
@@ -688,6 +690,7 @@ public List<String> getSupportedFunctions() {
         }
         if (this.postGisVersion.compareTo(ONE_5) >= 0) {
         	supportedFunctions.add(SourceSystemFunctions.ST_GEOMFROMGML);
+        	supportedFunctions.add(SourceSystemFunctions.ST_MAKEENVELOPE);
         }
         if (this.postGisVersion.compareTo(TWO_0) >= 0) {
         	supportedFunctions.add(SourceSystemFunctions.ST_GEOMFROMGEOJSON);
diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
index d99b7c6be8..b21abdfb13 100644
--- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
+++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
@@ -67,6 +67,8 @@ public class TeiidExecutionFactory extends JDBCExecutionFactory {
 	public static final Version EIGHT_12_5 = Version.getVersion("8.12.5"); //$NON-NLS-1$
 	public static final Version EIGHT_13 = Version.getVersion("8.13.0"); //$NON-NLS-1$
 	public static final Version NINE_0 = Version.getVersion("9.0"); //$NON-NLS-1$
+	public static final Version NINE_1 = Version.getVersion("9.1"); //$NON-NLS-1$
+	public static final Version NINE_2 = Version.getVersion("9.2"); //$NON-NLS-1$
 	
 	public TeiidExecutionFactory() {
 	}
@@ -217,6 +219,52 @@ public List<String> getSupportedFunctions() {
             supportedFunctions.add(SourceSystemFunctions.ST_ASEWKT);
         }
         
+        if (getVersion().compareTo(NINE_1) >= 0) {
+            supportedFunctions.add(SourceSystemFunctions.ST_AREA);
+            supportedFunctions.add(SourceSystemFunctions.ST_BOUNDARY);
+            supportedFunctions.add(SourceSystemFunctions.ST_BUFFER);
+            supportedFunctions.add(SourceSystemFunctions.ST_CENTROID);
+            supportedFunctions.add(SourceSystemFunctions.ST_CONVEXHULL);
+            supportedFunctions.add(SourceSystemFunctions.ST_COORDDIM);
+            supportedFunctions.add(SourceSystemFunctions.ST_CURVETOLINE);
+            supportedFunctions.add(SourceSystemFunctions.ST_DIFFERENCE);
+            supportedFunctions.add(SourceSystemFunctions.ST_DIMENSION);
+            supportedFunctions.add(SourceSystemFunctions.ST_ENDPOINT);
+            supportedFunctions.add(SourceSystemFunctions.ST_EXTERIORRING);
+            supportedFunctions.add(SourceSystemFunctions.ST_GEOMETRYN);
+            supportedFunctions.add(SourceSystemFunctions.ST_GEOMETRYTYPE);
+            supportedFunctions.add(SourceSystemFunctions.ST_INTERIORRINGN);
+            supportedFunctions.add(SourceSystemFunctions.ST_INTERSECTION);
+            supportedFunctions.add(SourceSystemFunctions.ST_ISCLOSED);
+            supportedFunctions.add(SourceSystemFunctions.ST_ISEMPTY);
+            supportedFunctions.add(SourceSystemFunctions.ST_ISRING);
+            supportedFunctions.add(SourceSystemFunctions.ST_ISSIMPLE);
+            supportedFunctions.add(SourceSystemFunctions.ST_ISVALID);
+            supportedFunctions.add(SourceSystemFunctions.ST_LENGTH);
+            supportedFunctions.add(SourceSystemFunctions.ST_NUMGEOMETRIES);
+            supportedFunctions.add(SourceSystemFunctions.ST_NUMINTERIORRINGS);
+            supportedFunctions.add(SourceSystemFunctions.ST_NUMPOINTS);
+            supportedFunctions.add(SourceSystemFunctions.ST_ORDERINGEQUALS);
+            supportedFunctions.add(SourceSystemFunctions.ST_PERIMETER);
+            supportedFunctions.add(SourceSystemFunctions.ST_POINT);
+            supportedFunctions.add(SourceSystemFunctions.ST_POINTN);
+            supportedFunctions.add(SourceSystemFunctions.ST_POINTONSURFACE);
+            supportedFunctions.add(SourceSystemFunctions.ST_POLYGON);
+            supportedFunctions.add(SourceSystemFunctions.ST_RELATE);
+            supportedFunctions.add(SourceSystemFunctions.ST_STARTPOINT);
+            supportedFunctions.add(SourceSystemFunctions.ST_SYMDIFFERENCE);
+            supportedFunctions.add(SourceSystemFunctions.ST_UNION);
+            supportedFunctions.add(SourceSystemFunctions.ST_X);
+            supportedFunctions.add(SourceSystemFunctions.ST_Y);
+            supportedFunctions.add(SourceSystemFunctions.ST_Z);
+        }
+        
+        if (getVersion().compareTo(NINE_2) >= 0) {
+            supportedFunctions.add(SourceSystemFunctions.ST_MAKEENVELOPE);
+            supportedFunctions.add(SourceSystemFunctions.ST_SNAPTOGRID);
+            supportedFunctions.add(SourceSystemFunctions.ST_SIMPLIFYPRESERVETOPOLOGY);
+        }
+        
         return supportedFunctions;
     }
     
diff --git a/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java b/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
index 6845ba8400..77d1f25f46 100644
--- a/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
+++ b/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
@@ -321,7 +321,11 @@ public ResultsFuture<ResultsMessage> processCursorRequest(long reqID,
 	}
 
 	void addRequest(RequestID requestID, RequestWorkItem workItem, ClientState state) {
-		this.requests.put(requestID, workItem);
+		RequestWorkItem item = this.requests.put(requestID, workItem);
+		if (item != null) {
+		    this.requests.put(requestID, item);
+		    throw new TeiidRuntimeException("duplicate request id " + requestID); //$NON-NLS-1$
+		}
 		state.addRequest(requestID);
 	}
 
diff --git a/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java b/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
index df5c524289..3ee1f059b4 100644
--- a/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
+++ b/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
@@ -27,14 +27,8 @@
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.TreeMap;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -748,7 +742,20 @@ protected void fillRow(List<Object> row, KeyRecord key,
         		row.add(false);
         		row.add((key instanceof ForeignKey)?((ForeignKey)key).getUniqueKeyID():null);
         		row.add(key.getUUID());
+        		row.add(key.getParent().getUUID());
         		row.add(null);
+        		if (key instanceof ForeignKey) {
+        		    KeyRecord ref = ((ForeignKey)key).getReferenceKey();
+        		    if (ref != null) {
+                        row.set(row.size() - 1, ref.getParent().getUUID());
+        		    }
+        		}
+        		List<Column> columns2 = key.getColumns();
+                Short[] pos = new Short[columns2.size()];
+        		for (int i = 0; i < pos.length; i++) {
+        		    pos[i] = (short)columns2.get(i).getPosition();
+        		}
+        		row.add(new ArrayImpl((Object[])pos));
         	}
         	
         	@Override
@@ -820,6 +827,7 @@ protected void fillRow(List<Object> row, List<?> record,
 				row.add(key.getName());
 				row.add(key.getReferenceKey().getName());
 				row.add(DatabaseMetaData.importedKeyInitiallyDeferred);
+				row.add(key.getUUID());
         	}
         	
         	@Override
@@ -1320,16 +1328,28 @@ private TupleSource processSystemQuery(CommandContext context, Command command,
 		case ARRAYITERATE:
 			Object array = ((Constant)proc.getParameter(1).getExpression()).getValue();
 			if (array != null) {
-				Object[] vals = null;
+				final Object[] vals;
 				if (array instanceof Object[]) {
 					vals = (Object[])array;
 				} else {
 					ArrayImpl arrayImpl = (ArrayImpl)array;
 					vals = arrayImpl.getValues();
 				}
-				for (Object o : vals) {
-					rows.add(Arrays.asList(o));
-				}
+				return new CollectionTupleSource(new Iterator<List<?>> () {
+					int index = 0;
+					@Override
+					public boolean hasNext() {
+						return index < vals.length;
+					}
+
+					@Override
+					public List<?> next() {
+						if (!hasNext()) {
+							throw new NoSuchElementException();
+						}
+						return Arrays.asList(vals[index++]);
+					}
+				});
 			}
 		}
 		return new CollectionTupleSource(rows.iterator());
diff --git a/engine/src/main/java/org/teiid/query/QueryPlugin.java b/engine/src/main/java/org/teiid/query/QueryPlugin.java
index 89a04b583b..f2a3ba4cb6 100644
--- a/engine/src/main/java/org/teiid/query/QueryPlugin.java
+++ b/engine/src/main/java/org/teiid/query/QueryPlugin.java
@@ -609,5 +609,7 @@ public static enum Event implements BundleUtil.Event{
     	TEIID31206, 
     	TEIID31207, 
     	TEIID31208,
+    	TEIID31209, 
+    	TEIID31210,
 	}
 }
diff --git a/engine/src/main/java/org/teiid/query/eval/Evaluator.java b/engine/src/main/java/org/teiid/query/eval/Evaluator.java
index df8e1a642e..8faa8abae3 100644
--- a/engine/src/main/java/org/teiid/query/eval/Evaluator.java
+++ b/engine/src/main/java/org/teiid/query/eval/Evaluator.java
@@ -36,6 +36,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -573,11 +574,43 @@ private Boolean evaluate(SubqueryCompareCriteria criteria, List<?> tuple)
         }
 
         ValueIterator valueIter;
-		try {
-			valueIter = evaluateSubquery(criteria, tuple);
-		} catch (TeiidProcessingException e) {
-			 throw new ExpressionEvaluationException(e);
-		}
+        if (criteria.getCommand() != null) {
+			try {
+				valueIter = evaluateSubquery(criteria, tuple);
+			} catch (TeiidProcessingException e) {
+				 throw new ExpressionEvaluationException(e);
+			}
+        } else {
+        	Object array = evaluate(criteria.getArrayExpression(), tuple);
+        	final Object[] vals;
+        	if (array instanceof Object[]) {
+				vals = (Object[])array;
+			} else {
+				ArrayImpl arrayImpl = (ArrayImpl)array;
+				vals = arrayImpl.getValues();
+			}
+        	valueIter = new ValueIterator() {
+				int index = 0;
+				
+				@Override
+				public void reset() {
+					index = 0;
+				}
+				
+				@Override
+				public boolean hasNext() {
+					return index < vals.length;
+				}
+
+				@Override
+				public Object next() {
+					if (!hasNext()) {
+						throw new NoSuchElementException();
+					}
+					return vals[index++];
+				}
+			};
+        }
         while(valueIter.hasNext()) {
             Object value = valueIter.next();
             
diff --git a/engine/src/main/java/org/teiid/query/function/GeometryFunctionMethods.java b/engine/src/main/java/org/teiid/query/function/GeometryFunctionMethods.java
index 56e759250f..b6d72ecdd8 100644
--- a/engine/src/main/java/org/teiid/query/function/GeometryFunctionMethods.java
+++ b/engine/src/main/java/org/teiid/query/function/GeometryFunctionMethods.java
@@ -65,6 +65,14 @@ public static BlobType asBlob(GeometryType geometry) {
         return new BlobType(b);
     }
     
+    public static BlobType asBlob(GeometryType geometry, String encoding) throws FunctionExecutionException {
+        if ("NDR".equals(encoding)) { //$NON-NLS-1$
+            return new BlobType(GeometryUtils.getBytes(GeometryUtils.getGeometry(geometry), false)); 
+        } 
+        Blob b = geometry.getReference();
+        return new BlobType(b);
+    }
+    
     @TeiidFunction(name=SourceSystemFunctions.ST_ASEWKB,
             category=FunctionCategoryConstants.GEOMETRY,
             nullOnNull=true,
@@ -302,6 +310,16 @@ public static GeometryType simplify(GeometryType geom,
     	return GeometryUtils.simplify(geom, tolerance);
 	}
     
+    @TeiidFunction(name=SourceSystemFunctions.ST_SIMPLIFYPRESERVETOPOLOGY,
+            category=FunctionCategoryConstants.GEOMETRY,
+            nullOnNull=true,
+            pushdown=PushDown.CAN_PUSHDOWN)
+    public static GeometryType simplifyPreserveTopology(GeometryType geom, 
+                                      double tolerance)
+                                              throws FunctionExecutionException {        
+        return GeometryUtils.simplifyPreserveTopology(geom, tolerance);
+    }
+    
     @TeiidFunction(name=SourceSystemFunctions.ST_FORCE_2D,
             category=FunctionCategoryConstants.GEOMETRY,
             nullOnNull=true,
@@ -680,4 +698,28 @@ public static Double ordinateZ(GeometryType geom)
         return GeometryUtils.ordinate(geom, GeometryUtils.Ordinate.Z);
     }
     
+    @TeiidFunction(name=SourceSystemFunctions.ST_MAKEENVELOPE,
+            category=FunctionCategoryConstants.GEOMETRY,
+            nullOnNull=true,
+            pushdown=PushDown.CAN_PUSHDOWN)
+    public static GeometryType makeEnvelope(double xmin, double ymin, double xmax, double ymax) {
+        return GeometryUtils.makeEnvelope(xmin, ymin, xmax, ymax, null);
+    }
+    
+    @TeiidFunction(name=SourceSystemFunctions.ST_MAKEENVELOPE,
+            category=FunctionCategoryConstants.GEOMETRY,
+            nullOnNull=true,
+            pushdown=PushDown.CAN_PUSHDOWN)
+    public static GeometryType makeEnvelope(double xmin, double ymin, double xmax, double ymax, int srid) {
+        return GeometryUtils.makeEnvelope(xmin, ymin, xmax, ymax, srid);
+    }
+
+    @TeiidFunction(name=SourceSystemFunctions.ST_SNAPTOGRID,
+            category=FunctionCategoryConstants.GEOMETRY,
+            nullOnNull=true,
+            pushdown=PushDown.CAN_PUSHDOWN)
+    public static GeometryType snapToGrid(GeometryType geom, float size) throws FunctionExecutionException {
+        return GeometryUtils.snapToGrid(geom, size);
+    }
+    
 }
diff --git a/engine/src/main/java/org/teiid/query/function/GeometryUtils.java b/engine/src/main/java/org/teiid/query/function/GeometryUtils.java
index c7ba0b94a4..d48432846c 100644
--- a/engine/src/main/java/org/teiid/query/function/GeometryUtils.java
+++ b/engine/src/main/java/org/teiid/query/function/GeometryUtils.java
@@ -27,6 +27,7 @@
 import java.io.PushbackInputStream;
 import java.io.PushbackReader;
 import java.io.Reader;
+import java.io.StringReader;
 import java.sql.Blob;
 import java.sql.SQLException;
 
@@ -53,25 +54,19 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.IntersectionMatrix;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import com.vividsolutions.jts.geom.*;
 import com.vividsolutions.jts.io.ByteOrderValues;
 import com.vividsolutions.jts.io.InputStreamInStream;
 import com.vividsolutions.jts.io.ParseException;
 import com.vividsolutions.jts.io.WKBReader;
 import com.vividsolutions.jts.io.WKBWriter;
 import com.vividsolutions.jts.io.WKTReader;
+import com.vividsolutions.jts.io.WKTWriter;
 import com.vividsolutions.jts.io.gml2.GMLHandler;
 import com.vividsolutions.jts.io.gml2.GMLWriter;
+import com.vividsolutions.jts.precision.GeometryPrecisionReducer;
 import com.vividsolutions.jts.simplify.DouglasPeuckerSimplifier;
+import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
 
 /**
  * Utility methods for geometry
@@ -374,9 +369,13 @@ public static GeometryType getGeometryType(Geometry jtsGeom) {
     }
     
     public static GeometryType getGeometryType(Geometry jtsGeom, int srid) {
-        WKBWriter writer = new WKBWriter();
-        byte[] bytes = writer.write(jtsGeom);
-        return new GeometryType(bytes, srid);        
+        byte[] bytes = getBytes(jtsGeom, true);
+        return new GeometryType(bytes, srid);
+    }
+    
+    public static byte[] getBytes(Geometry jtsGeom, boolean bigEndian) {
+        WKBWriter writer = new WKBWriter(2, bigEndian?ByteOrderValues.BIG_ENDIAN:ByteOrderValues.LITTLE_ENDIAN);
+        return writer.write(jtsGeom);
     }
     
     public static Geometry getGeometry(GeometryType geom)
@@ -426,9 +425,18 @@ public static GeometryType geometryFromEwkb(InputStream is, Integer srid) throws
 
 	public static GeometryType simplify(
 			GeometryType geom, double tolerance) throws FunctionExecutionException {
-		return getGeometryType(DouglasPeuckerSimplifier.simplify(getGeometry(geom), tolerance));
+	    DouglasPeuckerSimplifier douglasPeuckerSimplifier = new DouglasPeuckerSimplifier(getGeometry(geom));
+	    douglasPeuckerSimplifier.setEnsureValid(false);
+	    douglasPeuckerSimplifier.setDistanceTolerance(tolerance);
+	    Geometry resultGeometry = douglasPeuckerSimplifier.getResultGeometry();
+        return getGeometryType(resultGeometry);
 	}
 	
+	public static GeometryType simplifyPreserveTopology(
+            GeometryType geom, double tolerance) throws FunctionExecutionException {
+        return getGeometryType(TopologyPreservingSimplifier.simplify(getGeometry(geom), tolerance));
+    }
+	
 	public static boolean boundingBoxIntersects(
 			GeometryType geom1, GeometryType geom2) throws FunctionExecutionException {
 		Geometry g1 = getGeometry(geom1);
@@ -784,4 +792,36 @@ public static Double ordinate(GeometryType geom, Ordinate ordinate) throws Funct
         return value;
     }
 
+    public static GeometryType makeEnvelope(double xmin, double ymin,
+            double xmax, double ymax, Integer srid) {
+        Geometry geom = GEOMETRY_FACTORY.createPolygon(new Coordinate[] {new Coordinate(xmin, ymin), new Coordinate(xmin, ymax), new Coordinate(xmax, ymax), new Coordinate(xmax, ymin), new Coordinate(xmin, ymin)});
+        if (srid != null) {
+            geom.setSRID(srid);
+        }
+        return getGeometryType(geom);
+    }
+
+    public static GeometryType snapToGrid(GeometryType geom, double size) throws FunctionExecutionException {
+        if (size == 0) {
+            return geom;
+        }
+        Geometry g1 = getGeometry(geom);
+        PrecisionModel precisionModel = new PrecisionModel(1/size);
+        GeometryPrecisionReducer reducer = new GeometryPrecisionReducer(precisionModel);
+        reducer.setPointwise(true);
+        reducer.setChangePrecisionModel(true);
+        Geometry result = reducer.reduce(g1);
+        //since the wkb writer doesn't consider precision, we have to first write/read through wkt
+        WKTWriter writer = new WKTWriter();
+        String val = writer.write(result);
+        WKTReader reader = new WKTReader(GEOMETRY_FACTORY);
+        try {
+            result = reader.read(new StringReader(val));
+        } catch (ParseException e) {
+            throw new FunctionExecutionException(e);
+        }
+        result.setSRID(geom.getSrid());
+        return getGeometryType(result);
+    }
+
 }
diff --git a/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java b/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
index eee8ae61e3..365469bf4f 100644
--- a/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
+++ b/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
@@ -299,7 +299,7 @@ public void visit(CaseExpression obj) {
     }
     
     public void visit(CompareCriteria obj) {
-    	checkCompareCriteria(obj);
+    	checkCompareCriteria(obj, obj.getRightExpression());
         checkLiteralComparison(obj, Arrays.asList(obj.getRightExpression()));
     }
 
@@ -315,7 +315,7 @@ private void checkLiteralComparison(LanguageObject obj, Collection<? extends Lan
 		}
 	}
     
-    public void checkCompareCriteria(AbstractCompareCriteria obj) {
+    public void checkCompareCriteria(AbstractCompareCriteria obj, Expression rightExpression) {
         boolean negated = false;
         // Check if operation is allowed
         Capability operatorCap = null;
@@ -359,7 +359,7 @@ public void checkCompareCriteria(AbstractCompareCriteria obj) {
         		support = SupportConstants.Element.SEARCHABLE_EQUALITY;
         	}
             checkElementsAreSearchable(obj.getLeftExpression(), support);                                
-            checkElementsAreSearchable(obj.getRightExpression(), support);
+            checkElementsAreSearchable(rightExpression, support);
         } catch(QueryMetadataException e) {
             handleException(new TeiidComponentException(e));
         } catch(TeiidComponentException e) {
@@ -564,6 +564,10 @@ public void visit(ExistsCriteria crit) {
      * @see org.teiid.query.sql.LanguageVisitor#visit(org.teiid.query.sql.lang.SubqueryCompareCriteria)
      */
     public void visit(SubqueryCompareCriteria crit) {
+    	if (crit.getArrayExpression() != null) {
+    		markInvalid(crit, "Quantified compare with an array cannot yet be pushed down."); //$NON-NLS-1$
+            return;
+    	}
         // Check if quantification operator is allowed
         Capability capability = Capability.QUERY_SUBQUERIES_SCALAR;
         switch(crit.getPredicateQuantifier()) {
@@ -582,7 +586,7 @@ public void visit(SubqueryCompareCriteria crit) {
             return;
         }
         
-        checkCompareCriteria(crit);
+        checkCompareCriteria(crit, crit.getCommand().getProjectedSymbols().get(0));
         
         // Check capabilities of the elements
         try {
diff --git a/engine/src/main/java/org/teiid/query/parser/QueryParser.java b/engine/src/main/java/org/teiid/query/parser/QueryParser.java
index 4c7576652f..aca5887767 100644
--- a/engine/src/main/java/org/teiid/query/parser/QueryParser.java
+++ b/engine/src/main/java/org/teiid/query/parser/QueryParser.java
@@ -281,7 +281,7 @@ public String getMessage(ParseException pe, int maxExpansions) {
 			String img = tokenImage[t];
 			if (id && img.startsWith("\"") //$NON-NLS-1$ 
 					&& Character.isLetter(img.charAt(1)) 
-					&& !SQLConstants.isReservedWord(img.substring(1, img.length()-1))) {
+					&& (!SQLConstants.isReservedWord(img.substring(1, img.length()-1)) || img.equals("\"default\""))) { //$NON-NLS-1$
 				continue;
 			}
 			if (count > 0) {
diff --git a/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java b/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
index ab3a6cff93..3800307ea8 100644
--- a/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
+++ b/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
@@ -52,15 +52,7 @@
 import org.teiid.query.resolver.command.*;
 import org.teiid.query.resolver.util.ResolverUtil;
 import org.teiid.query.resolver.util.ResolverVisitor;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.FromClause;
-import org.teiid.query.sql.lang.GroupContext;
-import org.teiid.query.sql.lang.ProcedureContainer;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.SubqueryContainer;
-import org.teiid.query.sql.lang.UnaryFromClause;
+import org.teiid.query.sql.lang.*;
 import org.teiid.query.sql.navigator.DeepPostOrderNavigator;
 import org.teiid.query.sql.symbol.AliasSymbol;
 import org.teiid.query.sql.symbol.ElementSymbol;
@@ -482,6 +474,14 @@ public static void validateProjectedSymbols(GroupSymbol virtualGroup,
 		List<ElementSymbol> symbols = ResolverUtil.resolveElementsInGroup(virtualGroup, qmi);
 		List<Expression> projectedSymbols = result.getProjectedSymbols();
 		validateProjectedSymbols(virtualGroup, symbols, projectedSymbols);
+		//setqueries store the projected types separately
+		if (result instanceof SetQuery) {
+		    List<Class<?>> types = new ArrayList<Class<?>>();
+		    for (ElementSymbol es : symbols) {
+		        types.add(es.getType());
+		    }
+		    ((SetQuery)result).setProjectedTypes(types, qmi.getDesignTimeMetadata());
+		}
 	}
 
 	public static void validateProjectedSymbols(GroupSymbol virtualGroup,
diff --git a/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java b/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
index 6cfc96edf7..e858460a7f 100644
--- a/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
+++ b/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
@@ -326,7 +326,10 @@ public void visit(ExistsCriteria obj) {
         
         public void visit(SubqueryCompareCriteria obj) {
             visitNode(obj.getLeftExpression());
-            resolveSubQuery(obj, this.currentGroups);
+            if (obj.getCommand() != null) {
+            	resolveSubQuery(obj, this.currentGroups);
+            }
+            visitNode(obj.getArrayExpression());
             postVisitVisitor(obj);
         }
         
diff --git a/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java b/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java
index beb86f2450..ef08f5da43 100644
--- a/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java
+++ b/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java
@@ -257,7 +257,13 @@ public static Constant convertConstant(String sourceTypeName,
 	        if (!DataTypeManager.isTransformable(targetTypeName, sourceTypeName)) {
 	        	return null;
 	        }
-        
+
+            //allow implicit conversion of literal values to floating
+            if (Number.class.isAssignableFrom(constant.getType()) &&
+                    (result.getType() == DataTypeManager.DefaultDataClasses.DOUBLE || result.getType() == DataTypeManager.DefaultDataClasses.FLOAT)) {
+                return result;
+            }
+
 	        if (!(constant.getValue() instanceof Comparable)) {
 	        	return null; //this is the case for xml constants
 	        }
@@ -803,23 +809,45 @@ private static boolean nameMatchesGroup(String groupContext,
 	 * @return implicit conversion Function, or null if none is necessary
 	 * @throws QueryResolverException if a conversion is necessary but none can
 	 * be found
+	 * @throws TeiidComponentException 
+	 * @throws QueryMetadataException 
 	 */
 	static Expression resolveSubqueryPredicateCriteria(Expression expression, SubqueryContainer crit, QueryMetadataInterface metadata)
-		throws QueryResolverException {
+		throws QueryResolverException, QueryMetadataException, TeiidComponentException {
 	
-		// Check that type of the expression is same as the type of the
-		// single projected symbol of the subquery
-		Class<?> exprType = expression.getType();
-		if(exprType == null) {
-	         throw new QueryResolverException(QueryPlugin.Event.TEIID30075, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30075, expression));
-		}
-		String exprTypeName = DataTypeManager.getDataTypeName(exprType);
-	
-		Collection<Expression> projectedSymbols = crit.getCommand().getProjectedSymbols();
-		if (projectedSymbols.size() != 1){
-	         throw new QueryResolverException(QueryPlugin.Event.TEIID30093, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30093, crit.getCommand()));
+		List<Expression> projectedSymbols = crit.getCommand().getProjectedSymbols();
+		int size = projectedSymbols.size();
+        if (size != 1){
+		    //special handling for array comparison, we don't require the subquery to be wrapped explicitly
+		    if (expression instanceof Array) {
+		        Array array = (Array)expression;
+		        if (array.getExpressions().size() != size) {
+		            throw new QueryResolverException(QueryPlugin.Event.TEIID31210, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31210, size, array.getExpressions().size(), crit));
+		        }
+		        for (int i = 0; i < size; i++) {
+		            array.getExpressions().set(i, resolveComparision(array.getExpressions().get(i), crit, metadata, projectedSymbols.get(i).getType()));
+		        }
+		        return array;
+		    }
+	        throw new QueryResolverException(QueryPlugin.Event.TEIID30093, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30093, crit.getCommand()));
 		}
 		Class<?> subqueryType = projectedSymbols.iterator().next().getType();
+		
+        return resolveComparision(expression, crit, metadata,
+                subqueryType);
+	}
+
+    private static Expression resolveComparision(Expression expression,
+            SubqueryContainer crit, QueryMetadataInterface metadata,
+            Class<?> subqueryType) throws QueryResolverException {
+        // Check that type of the expression is same as the type of the
+        // single projected symbol of the subquery
+        Class<?> exprType = expression.getType();
+        if(exprType == null) {
+             throw new QueryResolverException(QueryPlugin.Event.TEIID30075, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30075, expression));
+        }
+        String exprTypeName = DataTypeManager.getDataTypeName(exprType);
+
 		String subqueryTypeName = DataTypeManager.getDataTypeName(subqueryType);
 		Expression result = null;
 	    try {
@@ -830,8 +858,8 @@ static Expression resolveSubqueryPredicateCriteria(Expression expression, Subque
 	    } catch (QueryResolverException qre) {
 	         throw new QueryResolverException(QueryPlugin.Event.TEIID30094, qre, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30094, crit));
 	    }
-	    return result;
-	}
+        return result;
+    }
 
 	public static ResolvedLookup resolveLookup(Function lookup, QueryMetadataInterface metadata) throws QueryResolverException, TeiidComponentException {
 		Expression[] args = lookup.getArgs();
diff --git a/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java b/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
index 67bca0070a..56cd87edd0 100644
--- a/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
+++ b/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
@@ -269,18 +269,84 @@ public void visit(SetCriteria obj) {
     }
 
     public void visit(SubqueryCompareCriteria obj) {
-        try {
-            obj.setLeftExpression(ResolverUtil.resolveSubqueryPredicateCriteria(obj.getLeftExpression(), obj, metadata));
-        } catch(QueryResolverException e) {
-            handleException(e);
-        }
+       if (obj.getCommand() != null) {
+	        try {
+	            obj.setLeftExpression(ResolverUtil.resolveSubqueryPredicateCriteria(obj.getLeftExpression(), obj, metadata));
+	        } catch(QueryResolverException e) {
+	            handleException(e);
+            } catch (TeiidComponentException e) {
+                handleException(e);
+            }
+    	} else {
+    		try {
+	    		resolveQuantifiedCompareArray(obj);
+    		} catch (QueryResolverException e) {
+    			handleException(e);
+    		}
+    	}
     }
 
+	private void resolveQuantifiedCompareArray(SubqueryCompareCriteria obj)
+			throws QueryResolverException, AssertionError {
+		Class<?> expressionType = obj.getArrayExpression().getType();
+		
+		if (expressionType == null || !expressionType.isArray()) {
+			throw new QueryResolverException(QueryPlugin.Event.TEIID31175, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31175, new Object[] { obj.getArrayExpression(), expressionType }));
+		}
+		
+		Class<?> rightType = expressionType.getComponentType();
+		
+		Expression leftExpression = obj.getLeftExpression();
+		
+		setDesiredType(leftExpression, rightType, obj);
+		
+		if(leftExpression.getType().equals(rightType) ) {
+			return;
+		}
+		
+		// Try to apply an implicit conversion from one side to the other
+		String leftTypeName = DataTypeManager.getDataTypeName(leftExpression.getType());
+		String rightTypeName = DataTypeManager.getDataTypeName(rightType);
+		
+		if (leftExpression.getType() == DataTypeManager.DefaultDataClasses.NULL) {
+			obj.setLeftExpression(ResolverUtil.convertExpression(leftExpression, rightTypeName, metadata) );
+			return;
+		}
+  	
+		boolean leftChar = isCharacter(leftExpression, true);
+		boolean rightChar = isCharacter(rightType, true);
+		
+		// Special cases when left expression is a constant
+		if(leftExpression instanceof Constant && !rightChar) {
+		    // Auto-convert constant string on left to expected type on right
+		    try {
+		        obj.setLeftExpression(ResolverUtil.convertExpression(leftExpression, leftTypeName, rightTypeName, metadata));
+		        return;                                           
+		    } catch (QueryResolverException qre) {
+		    	if (leftChar && !metadata.widenComparisonToString()) {
+		        	throw qre;
+		        }
+		    }
+		}
+  	
+		// Try to apply a conversion generically
+		if ((rightChar ^ leftChar) && !metadata.widenComparisonToString()) {
+			throw new QueryResolverException(QueryPlugin.Event.TEIID31172, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31172, obj));
+		}
+		if(ResolverUtil.canImplicitlyConvert(leftTypeName, rightTypeName)) {
+			obj.setLeftExpression(ResolverUtil.convertExpression(leftExpression, leftTypeName, rightTypeName, metadata) );
+			return;
+		}
+		throw new QueryResolverException(QueryPlugin.Event.TEIID30072, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30072, new Object[] { leftTypeName, rightTypeName, obj }));
+	}
+
     public void visit(SubquerySetCriteria obj) {
         try {
             obj.setExpression(ResolverUtil.resolveSubqueryPredicateCriteria(obj.getExpression(), obj, metadata));
         } catch(QueryResolverException e) {
             handleException(e);
+        } catch (TeiidComponentException e) {
+            handleException(e);
         }
     }
 
@@ -337,31 +403,35 @@ public void visit(Array array) {
 	    			}
 	    		}
 	    	} else {
-	    		Class<?> type = null;
-	    		for (int i = 0; i < array.getExpressions().size(); i++) {
-	    			Expression expr = array.getExpressions().get(i);
-	    			Class<?> baseType = expr.getType();
-	    			while (baseType != null && baseType.isArray()) {
-	    				baseType = baseType.getComponentType();
-	    			}
-	    			if (baseType != DefaultDataClasses.NULL) {
-		    			if (type == null) {
-		    				type = expr.getType();
-		    			} else if (type != expr.getType()) {
-		    				type = DataTypeManager.DefaultDataClasses.OBJECT;
-		    			}
-	    			}
-	    		}
-	    		if (type == null) {
-	    			type = DataTypeManager.DefaultDataClasses.NULL;
-	    		}
-	    		array.setComponentType(type);
+	    		resolveComponentType(array);
 	    	}
     	} catch (QueryResolverException e) {
     		handleException(e);
     	}
     }
 
+    public static void resolveComponentType(Array array) {
+        Class<?> type = null;
+        for (int i = 0; i < array.getExpressions().size(); i++) {
+        	Expression expr = array.getExpressions().get(i);
+        	Class<?> baseType = expr.getType();
+        	while (baseType != null && baseType.isArray()) {
+        		baseType = baseType.getComponentType();
+        	}
+        	if (baseType != DefaultDataClasses.NULL) {
+        		if (type == null) {
+        			type = expr.getType();
+        		} else if (type != expr.getType()) {
+        			type = DataTypeManager.DefaultDataClasses.OBJECT;
+        		}
+        	}
+        }
+        if (type == null) {
+        	type = DataTypeManager.DefaultDataClasses.NULL;
+        }
+        array.setComponentType(type);
+    }
+
     public void visit(CaseExpression obj) {
         try {
             resolveCaseExpression(obj);
diff --git a/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java b/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
index fe5c095611..cf4dbcb1a5 100644
--- a/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
+++ b/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
@@ -65,6 +65,7 @@
 import org.teiid.query.resolver.ProcedureContainerResolver;
 import org.teiid.query.resolver.QueryResolver;
 import org.teiid.query.resolver.util.ResolverUtil;
+import org.teiid.query.resolver.util.ResolverVisitor;
 import org.teiid.query.sql.LanguageObject;
 import org.teiid.query.sql.LanguageObject.Util;
 import org.teiid.query.sql.LanguageVisitor;
@@ -894,6 +895,7 @@ private Criteria rewriteCriteria(Criteria criteria) throws TeiidComponentExcepti
 		    }
 		} else if (criteria instanceof SubquerySetCriteria) {
 		    SubquerySetCriteria sub = (SubquerySetCriteria)criteria;
+		    rewriteWithExplicitArray(sub.getExpression(), sub);
 		    rewriteSubqueryContainer(sub, true);
 		    if (!RelationalNodeUtil.shouldExecute(sub.getCommand(), false, true)) {
 		    	return sub.isNegated()?TRUE_CRITERIA:FALSE_CRITERIA;
@@ -910,6 +912,24 @@ private Criteria rewriteCriteria(Criteria criteria) throws TeiidComponentExcepti
         return evaluateCriteria(criteria);
 	}
 
+    private void rewriteWithExplicitArray(Expression ex, SubqueryContainer<QueryCommand> sub)
+            throws QueryMetadataException, QueryResolverException,
+            TeiidComponentException {
+        if (!(ex instanceof Array) || sub.getCommand() == null || sub.getCommand().getProjectedSymbols().size() == 1) {
+            return;
+        }
+        Query query = QueryRewriter.createInlineViewQuery(new GroupSymbol("x"), sub.getCommand(), metadata, sub.getCommand().getProjectedSymbols()); //$NON-NLS-1$
+        List<Expression> exprs = new ArrayList<Expression>();
+        for (Expression expr : query.getSelect().getProjectedSymbols()) {
+            exprs.add(SymbolMap.getExpression(expr));
+        }
+        Array array = new Array(exprs);
+        query.getSelect().clearSymbols();
+        query.getSelect().addSymbol(array);
+        ResolverVisitor.resolveComponentType(array);
+        sub.setCommand(query);
+    }
+
 	private void addImplicitLimit(SubqueryContainer<QueryCommand> container, int rowLimit) {
 		if (container.getCommand().getLimit() != null) {
 			Limit lim = container.getCommand().getLimit();
@@ -1342,8 +1362,8 @@ public static boolean isNull(Expression expr) {
      * quantifier is replaced with the canonical and equivalent 'SOME'
      */
     private Criteria rewriteCriteria(SubqueryCompareCriteria criteria) throws TeiidComponentException, TeiidProcessingException{
-    	
-    	if (criteria.getCommand().getProcessorPlan() == null) {
+        rewriteWithExplicitArray(criteria.getArrayExpression(), criteria);
+    	if (criteria.getCommand() != null && criteria.getCommand().getProcessorPlan() == null) {
     		if ((criteria.getOperator() == CompareCriteria.EQ && criteria.getPredicateQuantifier() != SubqueryCompareCriteria.ALL)
     				|| (criteria.getOperator() == CompareCriteria.NE && criteria.getPredicateQuantifier() == SubqueryCompareCriteria.ALL)) {
     			SubquerySetCriteria result = new SubquerySetCriteria(criteria.getLeftExpression(), criteria.getCommand());
@@ -1392,7 +1412,7 @@ public void visit(WindowFunction windowFunction) {
 
         Expression leftExpr = rewriteExpressionDirect(criteria.getLeftExpression());
         
-        if (isNull(leftExpr)) {
+        if (isNull(leftExpr) && criteria.getCommand() != null) {
             addImplicitLimit(criteria, 1);
         }
         
@@ -1404,8 +1424,8 @@ public void visit(WindowFunction windowFunction) {
         
         rewriteSubqueryContainer(criteria, true);
         
-        if (!RelationalNodeUtil.shouldExecute(criteria.getCommand(), false, true)) {
-        	//TODO: this is not interpretted the same way in all databases
+        if (criteria.getCommand() != null && !RelationalNodeUtil.shouldExecute(criteria.getCommand(), false, true)) {
+        	//TODO: this is not interpreted the same way in all databases
         	//for example H2 treat both cases as false - however the spec and all major vendors support the following: 
         	if (criteria.getPredicateQuantifier()==SubqueryCompareCriteria.SOME) {
         		return FALSE_CRITERIA;
diff --git a/engine/src/main/java/org/teiid/query/sql/lang/AbstractCompareCriteria.java b/engine/src/main/java/org/teiid/query/sql/lang/AbstractCompareCriteria.java
index 51994a5a57..c155dc925f 100644
--- a/engine/src/main/java/org/teiid/query/sql/lang/AbstractCompareCriteria.java
+++ b/engine/src/main/java/org/teiid/query/sql/lang/AbstractCompareCriteria.java
@@ -116,8 +116,6 @@ public Expression getLeftExpression() {
 		return this.leftExpression;
 	}
     
-    public abstract Expression getRightExpression();
-
     /**
      * Returns the operator as a string.
      * @return String version of operator
diff --git a/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java b/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java
index 47aa3dabbb..97cef1c599 100644
--- a/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java
+++ b/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java
@@ -30,7 +30,6 @@
 import org.teiid.query.sql.lang.ExistsCriteria.SubqueryHint;
 import org.teiid.query.sql.symbol.ContextReference;
 import org.teiid.query.sql.symbol.Expression;
-import org.teiid.query.sql.symbol.ScalarSubquery;
 
 
 /**
@@ -55,6 +54,10 @@
  * <li>price &gt;= ALL (Select ... FROM ... WHERE ... )</LI>
  * <LI>revenue &lt; (Select ... FROM ... WHERE ... )</LI>
  * </UL>
+ * 
+ * This can also represent a quantified comparison against array.  In which case the
+ * arrayExpression member will be set and command will not.
+ * 
  */
 public class SubqueryCompareCriteria extends AbstractCompareCriteria
 implements SubqueryContainer<QueryCommand>, ContextReference {
@@ -73,6 +76,7 @@ public class SubqueryCompareCriteria extends AbstractCompareCriteria
     private int predicateQuantifier = ALL;
 
     private QueryCommand command;
+    private Expression arrayExpression;
     private String id = "$scc/id" + ID.getAndIncrement(); //$NON-NLS-1$
     
     private SubqueryHint subqueryHint = new SubqueryHint();
@@ -182,7 +186,8 @@ public boolean equals(Object obj) {
                getPredicateQuantifier() == scc.getPredicateQuantifier() &&
                EquivalenceUtil.areEqual(getLeftExpression(), scc.getLeftExpression()) &&
                EquivalenceUtil.areEqual(getCommand(), scc.getCommand()) &&
-               EquivalenceUtil.areEqual(subqueryHint, scc.subqueryHint);
+               EquivalenceUtil.areEqual(subqueryHint, scc.subqueryHint) &&
+               EquivalenceUtil.areEqual(arrayExpression, scc.arrayExpression);
     }
 
     /**
@@ -207,16 +212,12 @@ public Object clone() {
         if (this.subqueryHint != null) {
         	copy.subqueryHint = this.subqueryHint.clone();
         }
+        if (this.arrayExpression != null) {
+        	copy.arrayExpression = (Expression) this.arrayExpression.clone();
+        }
         return copy;
     }
 
-    /** 
-     * @see org.teiid.query.sql.lang.AbstractCompareCriteria#getRightExpression()
-     */
-    public Expression getRightExpression() {
-        return new ScalarSubquery(getCommand());
-    }
-    
     @Override
     public void negate() {
     	super.negate();
@@ -234,5 +235,13 @@ public SubqueryHint getSubqueryHint() {
     public void setSubqueryHint(SubqueryHint subqueryHint) {
 		this.subqueryHint = subqueryHint;
 	}
+    
+    public Expression getArrayExpression() {
+		return arrayExpression;
+	}
+    
+    public void setArrayExpression(Expression expression) {
+		this.arrayExpression = expression;
+	}
 
 }
diff --git a/engine/src/main/java/org/teiid/query/sql/navigator/PreOrPostOrderNavigator.java b/engine/src/main/java/org/teiid/query/sql/navigator/PreOrPostOrderNavigator.java
index 48c82b073e..8bca5be49b 100644
--- a/engine/src/main/java/org/teiid/query/sql/navigator/PreOrPostOrderNavigator.java
+++ b/engine/src/main/java/org/teiid/query/sql/navigator/PreOrPostOrderNavigator.java
@@ -378,6 +378,7 @@ public void visit(SubqueryCompareCriteria obj) {
         if (deep) {
         	visitNode(obj.getCommand());
         }
+        visitNode(obj.getArrayExpression());
         postVisitVisitor(obj);
     }
     public void visit(SubqueryFromClause obj) {
diff --git a/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java b/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java
index f5792186e3..2ea7ce7d3f 100644
--- a/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java
+++ b/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java
@@ -75,7 +75,9 @@ public void visit(ScalarSubquery obj) {
     }
 
     public void visit(SubqueryCompareCriteria obj) {
-        this.commands.add(obj.getCommand());
+    	if (obj.getCommand() != null) {
+    		this.commands.add(obj.getCommand());
+    	}
     }
 
     /**
diff --git a/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java b/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java
index 5d80f94024..083b3741a4 100644
--- a/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java
+++ b/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java
@@ -205,7 +205,9 @@ public void visit(SubquerySetCriteria obj) {
     }        
 
     public void visit(SubqueryCompareCriteria obj) {
-		evaluationNotPossible(EvaluationLevel.PUSH_DOWN);
+    	if (obj.getCommand() != null) {
+    		evaluationNotPossible(EvaluationLevel.PUSH_DOWN);
+    	}
     }
     
     @Override
diff --git a/engine/src/main/java/org/teiid/query/sql/visitor/ExpressionMappingVisitor.java b/engine/src/main/java/org/teiid/query/sql/visitor/ExpressionMappingVisitor.java
index d7a38165e4..dcb56b09d8 100644
--- a/engine/src/main/java/org/teiid/query/sql/visitor/ExpressionMappingVisitor.java
+++ b/engine/src/main/java/org/teiid/query/sql/visitor/ExpressionMappingVisitor.java
@@ -261,6 +261,9 @@ public void visit(DependentSetCriteria obj) {
      */
     public void visit(SubqueryCompareCriteria obj) {
         obj.setLeftExpression( replaceExpression(obj.getLeftExpression()) );
+        if (obj.getArrayExpression() != null) {
+        	obj.setArrayExpression(replaceExpression(obj.getArrayExpression()));
+        }
     }
     
     /**
diff --git a/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java b/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
index dff9481f8e..f93709352e 100644
--- a/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
+++ b/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
@@ -1856,7 +1856,11 @@ public void visit( SubqueryCompareCriteria obj ) {
         append(quantifier);
         addSubqueryHint(obj.getSubqueryHint());
         append(" ("); //$NON-NLS-1$
-        visitNode(obj.getCommand());
+        if (obj.getCommand() != null) {
+        	visitNode(obj.getCommand());
+        } else {
+        	visitNode(obj.getArrayExpression());
+        }
         append(")"); //$NON-NLS-1$
     }
 
diff --git a/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java b/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java
index da283a62c3..7fe44afb40 100644
--- a/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java
+++ b/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java
@@ -96,7 +96,9 @@ public void visit(SubquerySetCriteria obj) {
      * @param obj Language object
      */
     public void visit(SubqueryCompareCriteria obj) {
-        this.valueIteratorProviders.add(obj);
+    	if (obj.getCommand() != null) {
+    		this.valueIteratorProviders.add(obj);
+    	}
     }
 
     /**
diff --git a/engine/src/main/java/org/teiid/query/util/CommandContext.java b/engine/src/main/java/org/teiid/query/util/CommandContext.java
index 007036a74d..6b097134cc 100644
--- a/engine/src/main/java/org/teiid/query/util/CommandContext.java
+++ b/engine/src/main/java/org/teiid/query/util/CommandContext.java
@@ -1099,6 +1099,12 @@ public void changeUser(String userName, String newPassword)
 					throws SQLException {
 				throw new TeiidSQLException();
 			}
+			
+			@Override
+			protected synchronized long nextRequestID() {
+			    //need to choose ids that won't conflict with the user connection
+			    return -(long)(Math.random()*Long.MAX_VALUE);
+			}
 		};
 	}
 	
diff --git a/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java b/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
index c62b49f735..7d67bedcf7 100644
--- a/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
+++ b/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
@@ -243,13 +243,6 @@ public void visit(Query obj) {
         	this.inQuery = true;
             validateAggregates(obj);
 
-            //if it is select with no from, should not have ScalarSubQuery
-            if(obj.getSelect() != null && obj.getFrom() == null){
-                if(!ValueIteratorProviderCollectorVisitor.getValueIteratorProviders(obj.getSelect()).isEmpty()){
-                    handleValidationError(QueryPlugin.Util.getString("ERR.015.012.0067"),obj); //$NON-NLS-1$
-                }
-            }
-            
             if (obj.getInto() != null) {
                 validateSelectInto(obj);
             }                        
@@ -269,14 +262,6 @@ public void visit(SubquerySetCriteria obj) {
 			handleValidationError(QueryPlugin.Util.getString("ERR.015.012.0027", obj, DataTypeManager.getDataTypeName(obj.getExpression().getType())),obj); //$NON-NLS-1$
     	}
         this.validateRowLimitFunctionNotInInvalidCriteria(obj);
-        
-		Collection<Expression> projSymbols = obj.getCommand().getProjectedSymbols();
-
-		//Subcommand should have one projected symbol (query with one expression
-		//in SELECT or stored procedure execution that returns a single value).
-		if(projSymbols.size() != 1) {
-			handleValidationError(QueryPlugin.Util.getString("ERR.015.012.0011"),obj); //$NON-NLS-1$
-		}
 	}
 	
 	@Override
diff --git a/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj b/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
index 17f9a42b7f..2fc39e975c 100644
--- a/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
+++ b/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
@@ -188,7 +188,6 @@ TOKEN : /* Reserved words */
 |   <CURSOR: "cursor">
 |   <DAY: "day">
 |   <DEALLOCATE: "deallocate">
-|   <DEFAULT_KEYWORD: "default">
 |   <DECLARE: "declare">
 |   <DELETE: "delete">
 |   <DESC: "desc">
@@ -496,7 +495,7 @@ TOKEN : /* NonReserved words */
 |   <JSONOBJECT: "jsonobject">
 |   <PRESERVE: "preserve">
 |   <GEOMETRY: "geometry">
-
+|   <DEFAULT_KEYWORD: "default">
 }
 /*
 name=all in group identifier
@@ -507,7 +506,7 @@ name=identifier
 */
 TOKEN : { < ID: <QUOTED_ID> (<PERIOD> <QUOTED_ID>)* > }
 TOKEN : { < #QUOTED_ID: <ID_PART> | ("\"" (("\"\"") | ~["\""] )+ "\"") >  }     
-TOKEN : { < #ID_PART: (("@" | "#" | <LETTER>) (<LETTER> | "_" | <DIGIT>)*) > }
+TOKEN : { < #ID_PART: (("_" | "@" | "#" | <LETTER>) (<LETTER> | "_" | <DIGIT>)*) > }
 /*
 name=escaped function
 */
@@ -605,7 +604,7 @@ Token nonReserved() :
      |<SQL_TSI_SECOND>|<SQL_TSI_MINUTE>|<SQL_TSI_HOUR>|<SQL_TSI_DAY>|<SQL_TSI_WEEK>|<SQL_TSI_MONTH>|<SQL_TSI_QUARTER>|<SQL_TSI_YEAR>|<TEXTTABLE>|<ARRAYTABLE>
      |<SELECTOR>|<SKIP_KEYWORD>|<WIDTH>|<PASSING>|<NAME>|<ENCODING>|<COLUMNS>|<DELIMITER>|<QUOTE>|<HEADER>|<NULLS>|<OBJECTTABLE>
      |<VERSION>|<INCLUDING>|<EXCLUDING>|<XMLDECLARATION>|<VARIADIC>|<RAISE>|<EXCEPTION>|<CHAIN>|<JSONARRAY_AGG>|<JSONOBJECT>|<PRESERVE>
-     |<GEOMETRY>)
+     |<GEOMETRY>|<DEFAULT_KEYWORD>)
     {
     	return getToken(0);
     }	
@@ -3168,7 +3167,7 @@ Expression booleanPrimary(ParseInfo info) :
 			LOOKAHEAD(2) ex=regexMatchCrit(info, ex) |
 			ex=setCrit(info, ex) |
 			ex=isNullCrit(info, ex) |
-			LOOKAHEAD(operator() (<ANY>|<SOME>|<ALL>) subquery(info)) ex=subqueryCompareCriteria(info, ex) |
+			LOOKAHEAD(operator() (<ANY>|<SOME>|<ALL>)) ex=subqueryCompareCriteria(info, ex) |
 			ex=compareCrit(info, ex)
 	     )]
 	    )
@@ -3270,6 +3269,7 @@ SubqueryCompareCriteria subqueryCompareCriteria(ParseInfo info, Expression expre
     Token operator = null;
     Token quantifier = null;
     ExistsCriteria.SubqueryHint hint = null;
+    Expression expr = null;
 }
 {
 	operator=operator()
@@ -3278,12 +3278,15 @@ SubqueryCompareCriteria subqueryCompareCriteria(ParseInfo info, Expression expre
 	  quantifier=<ALL>
 	)
 	{ hint = getSubqueryHint(getToken(1)); }
-	subquery = subquery(info)
+	( LOOKAHEAD(subquery(info)) subquery = subquery(info) | 
+      (<LPAREN> expr = expression(info) <RPAREN>)
+    )
 
 	{
 		subqueryCrit = new SubqueryCompareCriteria();
 	    subqueryCrit.setLeftExpression(expression);
 	    subqueryCrit.setCommand(subquery);
+	    subqueryCrit.setArrayExpression(expr);
     
 		// Set operator
 		subqueryCrit.setOperator(getOperator(operator.image));
@@ -4065,6 +4068,8 @@ Expression unsignedValueExpressionPrimary(ParseInfo info) :
 		|
 		expression = nestedExpression(info)
 		|
+		expression = arrayExpression(info)
+		|
 		// Searched CASE expressions
 		LOOKAHEAD(2) expression = searchedCaseExpression(info)
 		|
@@ -4076,6 +4081,29 @@ Expression unsignedValueExpressionPrimary(ParseInfo info) :
 	}
 }
 
+/*
+name=ARRAY expression constructor
+description=Creates and array of the given expressions.
+example=[source,sql]\n----\ARRAY[1,2]\n----\n
+*/
+Expression arrayExpression(ParseInfo info) :
+{
+    Expression arrayExpression = null;
+    List<Expression> arrayExpressions = new ArrayList<Expression>();
+}
+{
+    ( <ARRAY> <LSBRACE> 
+        [arrayExpression = expression(info) {arrayExpressions.add(arrayExpression);}
+         (<COMMA> arrayExpression = expression(info) {arrayExpressions.add(arrayExpression);})*
+        ]
+      <RSBRACE>
+    )
+    {
+        return new Array(arrayExpressions);
+    }
+}    
+
+
 /*
 name=window specification
 description=The window specification for an analytical or windowed aggregate function.
diff --git a/engine/src/main/resources/org/teiid/metadata/SYS.sql b/engine/src/main/resources/org/teiid/metadata/SYS.sql
index 6d0446cde4..121f41a6ee 100644
--- a/engine/src/main/resources/org/teiid/metadata/SYS.sql
+++ b/engine/src/main/resources/org/teiid/metadata/SYS.sql
@@ -86,7 +86,9 @@ CREATE FOREIGN TABLE Keys (
 	IsIndexed boolean NOT NULL,
 	RefKeyUID string(50),
 	UID string(50) NOT NULL,
-	OID integer,
+	TableUID string(50) NOT NULL,
+	RefTableUID string(50) NOT NULL,
+	ColPositions short[] NOT NULL,
 	PRIMARY KEY (VDBName, SchemaName, TableName, Name),
 	FOREIGN KEY (VDBName, SchemaName, TableName) REFERENCES Tables (VDBName, SchemaName, Name),
 	UNIQUE (UID)
@@ -185,7 +187,8 @@ CREATE FOREIGN TABLE ReferenceKeyColumns (
 	DELETE_RULE integer,
 	FK_NAME string(255),
 	PK_NAME string(255),
-	DEFERRABILITY integer
+	DEFERRABILITY integer,
+	FK_UID string(50)
 );
 
 CREATE FOREIGN TABLE Schemas (
diff --git a/engine/src/main/resources/org/teiid/query/i18n.properties b/engine/src/main/resources/org/teiid/query/i18n.properties
index 28a9f8fefe..d2d5dcf311 100644
--- a/engine/src/main/resources/org/teiid/query/i18n.properties
+++ b/engine/src/main/resources/org/teiid/query/i18n.properties
@@ -160,7 +160,6 @@ ERR.015.012.0007 = The updatable view query has a non-updatable expression {0} f
 ERR.015.012.0008 = The updatable view query cannot use SELECT DISTINCT.
 ERR.015.012.0009 = The updatable view query has a FROM clause that is not a single table, pass-through processing will not be used for UPDATE/DELETE operations.
 ERR.015.012.0010 = The updatable view query does not project the column {0}, which is required to make {1} a target of INSERT operations.
-ERR.015.012.0011 = There must be exactly one projected symbol in the subcommand of an IN clause.
 ERR.015.012.0013 = The query defining an updatable virtual group cannot use LIMIT.
 ERR.015.012.0014 = The non-simple query defining an updatable view does not have a valid key preserving delete target.
 ERR.015.012.0015 = The query defining an updatable view has no valid target for INSERTs.
@@ -213,7 +212,6 @@ ERR.015.012.0062 = Elements cannot appear more than once in a SET or USING claus
 ERR.015.012.0063 = Multiple failures occurred during validation:
 ERR.015.012.0064 = Validation succeeded
 TEIID30124=Loop cursor or exception group name {0} already exists.
-ERR.015.012.0067 = No scalar subqueries are allowed in the SELECT with no FROM clause.
 ERR.015.012.0069 = INTO clause can not be used in XML query.
 
 # optimizer (004)
@@ -794,6 +792,11 @@ SystemSource.st_simplify_param1=Geometry
 SystemSource.st_simplify_param2=tolerance
 SystemSource.st_simplify_result=Geometry value simplified according to the Douglas Peucker algorithm
 
+SystemSource.st_simplifypreservetopology_description=Simplify according to the Douglas Peucker algorithm, but preseve the topology and only create valid results 
+SystemSource.st_simplifypreservetopology_param1=Geometry
+SystemSource.st_simplifypreservetopology_param2=tolerance
+SystemSource.st_simplifypreservetopology_result=Geometry value simplified according to the Douglas Peucker algorithm
+
 SystemSource.st_force_2d_description=Force the geometry to a 2d representation only having X and Y coordinates 
 SystemSource.st_force_2d_param1=Geometry
 SystemSource.st_force_2d_result=2d Geometry value
@@ -1018,6 +1021,35 @@ SystemSource.st_y_result=Double ordinate value
 SystemSource.st_z_description=If the geometry is a Point, returns the X ordinate if set
 SystemSource.st_z_param1=Geometry
 SystemSource.st_z_result=Double ordinate value
+
+SystemSource.st_makeenvelope_description=Make a Polygon bounding box using the given x,y values
+SystemSource.st_makeenvelope_param1=xmin
+SystemSource.st_makeenvelope_param2=ymin
+SystemSource.st_makeenvelope_param3=xmax
+SystemSource.st_makeenvelope_param4=ymax
+SystemSource.st_makeenvelope_param5=srid
+SystemSource.st_makeenvelope_result=Geometry representing the bounding box
+
+SystemSource.st_snaptogrid=Pointwise reduce the geometry to grid of the given size
+SystemSource.st_snaptogrid_param1=Geometry
+SystemSource.st_snaptogrid_param2=size
+SystemSource.st_snaptogrid_result=The resulting geometry
+
+SystemSource.md5_description=Hashes a String or varbinary using the MD5 algorithm
+SystemSource.md5_param1=input
+SystemSource.md5_result=the varbinary hash
+
+SystemSource.sha1_description=Hashes a String or varbinary using the SHA1 algorithm
+SystemSource.sha1_param1=input
+SystemSource.sha1_result=the varbinary hash
+
+SystemSource.sha2_256_description=Hashes a String or varbinary using the SHA2-256 algorithm
+SystemSource.sha2_256_param1=input
+SystemSource.sha2_256_result=the varbinary hash
+
+SystemSource.sha2_512_description=Hashes a String or varbinary using the SHA2-512 algorithm
+SystemSource.sha2_512_param1=input
+SystemSource.sha2_512_result=the varbinary hash
     
 TEIID30350=Element ''{0}'' not found.
 TEIID30351=Group ''{0}'' not found.
@@ -1522,3 +1554,7 @@ TEIID31206=ST_CurveToLine is not implemented in Teiid
 TEIID31207=Expected a LineString for the polygon shell
 TEIID31208=Expected a Point to get the ordinate value
 TEIID31209=Exceeded the maximum estimated memory footprint of {0} for the array value. 
+TEIID31210=The number of projected subuqery {0} columns do not match the number of row value columns {1} in {2}
+TEIID31174=Result set or count exceeds the maximum integer value.
+
+TEIID31175=Array type expected for {0} but was {1}.
diff --git a/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java b/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
index 754475a090..398eb61e01 100644
--- a/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
+++ b/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
@@ -140,6 +140,8 @@ public void run() {
     	DQPWorkContext.setWorkContext(new DQPWorkContext());
     	core.stop();
     }
+    
+    int id = 0;
 
     public RequestMessage exampleRequestMessage(String sql) {
         RequestMessage msg = new RequestMessage(sql);
@@ -147,6 +149,7 @@ public RequestMessage exampleRequestMessage(String sql) {
         msg.setFetchSize(10);
         msg.setPartialResults(false);
         msg.setExecutionId(100);
+        msg.setExecutionId(id++);
         return msg;
     }
     
@@ -329,6 +332,7 @@ public RequestMessage exampleRequestMessage(String sql) {
         
         //insensitive should not block
         reqMsg.setCursorType(ResultSet.TYPE_SCROLL_INSENSITIVE);
+        reqMsg.setExecutionId(id++);
         
         message = core.executeRequest(reqMsg.getExecutionId(), reqMsg);
         rm = message.get(500000, TimeUnit.MILLISECONDS);
diff --git a/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java b/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
index 38de14840b..1727e2bbca 100644
--- a/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
+++ b/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
@@ -93,6 +93,8 @@ private DataTierTupleSource helpSetup(String sql, int nodeId) throws Exception {
         request.setSerial(serial);
         return new DataTierTupleSource(request, workItem, connectorManager.registerRequest(request), dtm, limit);
     }
+    
+    private int id;
 
 	private AtomicRequestMessage helpSetupRequest(String sql, int nodeId, QueryMetadataInterface metadata) throws Exception {
 		DQPWorkContext workContext = RealMetadataFactory.buildWorkContext(metadata, vdb);
@@ -100,7 +102,7 @@ private AtomicRequestMessage helpSetupRequest(String sql, int nodeId, QueryMetad
         Command command = helpGetCommand(sql, metadata);
         
         RequestMessage original = new RequestMessage();
-        original.setExecutionId(1);
+        original.setExecutionId(id++);
         original.setPartialResults(true);
         RequestID requestID = workContext.getRequestID(original.getExecutionId());
         
diff --git a/engine/src/test/java/org/teiid/query/parser/TestParser.java b/engine/src/test/java/org/teiid/query/parser/TestParser.java
index ba987ec50b..a78f745fd0 100644
--- a/engine/src/test/java/org/teiid/query/parser/TestParser.java
+++ b/engine/src/test/java/org/teiid/query/parser/TestParser.java
@@ -5280,5 +5280,13 @@ private void helpTestCompoundNonJoinCriteria(String sqlPred, PredicateCriteria p
         query.setSelect(new Select(Arrays.asList(as)));
         helpTest(sql, sql, query); //$NON-NLS-1$
     }
+    
+    @Test public void testUnderscoreAlias() {
+        String sql = "SELECT y AS _name";
+        AliasSymbol as = new AliasSymbol("_name", new ElementSymbol("y")); //$NON-NLS-1$ //$NON-NLS-2$
+        Query query = new Query();
+        query.setSelect(new Select(Arrays.asList(as)));
+        helpTest(sql, "SELECT y AS \"_name\"", query); //$NON-NLS-1$
+    }
 
 }
diff --git a/engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java b/engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java
index 94154cd77e..d2f726e228 100644
--- a/engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java
+++ b/engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java
@@ -37,6 +37,7 @@
 import org.teiid.core.types.ArrayImpl;
 import org.teiid.core.types.DataTypeManager;
 import org.teiid.core.util.UnitTestUtil;
+import org.teiid.query.metadata.TransformationMetadata;
 import org.teiid.query.optimizer.TestOptimizer;
 import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
 import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder;
@@ -203,6 +204,53 @@ public class TestArrayProcessing {
 	    assertEquals(String[][].class, command.getProjectedSymbols().get(0).getType());
 	}
 	
+	@Test public void testQuantifiedCompareRewrite() throws Exception {
+		String sql = "select 'a' < ALL (('b','c'))"; //$NON-NLS-1$
+		QueryResolver.resolveCommand(helpParse(sql), RealMetadataFactory.example1Cached());
+		Command command = helpResolve(sql, RealMetadataFactory.example1Cached());
+		assertEquals("SELECT 'a' < ALL (('b', 'c'))", command.toString());
+	    command = QueryRewriter.rewrite(command, RealMetadataFactory.example1Cached(), null);
+	    assertEquals("SELECT TRUE", command.toString());
+	    
+	    sql = "select 'a' < ALL ((null,'c'))"; //$NON-NLS-1$
+	    QueryResolver.resolveCommand(helpParse(sql), RealMetadataFactory.example1Cached());
+		command = helpResolve(sql, RealMetadataFactory.example1Cached());
+	    command = QueryRewriter.rewrite(command, RealMetadataFactory.example1Cached(), null);
+	    assertEquals("SELECT UNKNOWN", command.toString());
+	}
+	
+	@Test(expected=QueryResolverException.class) public void testQuantifiedCompareResolving() throws Exception {
+		String sql = "select 'a' < ALL ('b')"; //$NON-NLS-1$
+		QueryResolver.resolveCommand(helpParse(sql), RealMetadataFactory.example1Cached());
+	}
+	
+	@Test(expected=QueryResolverException.class) public void testQuantifiedCompareResolving1() throws Exception {
+		String sql = "select 1 < ALL (('1', '2'))"; //$NON-NLS-1$
+		TransformationMetadata tm = RealMetadataFactory.example1Cached().getDesignTimeMetadata();
+		tm.setWidenComparisonToString(false);
+		QueryResolver.resolveCommand(helpParse(sql), tm);
+	}
+	
+	@Test public void testQuantifiedCompareResolving2() throws Exception {
+		String sql = "select '1' < ALL (cast(? as integer[]))"; //$NON-NLS-1$
+		TransformationMetadata tm = RealMetadataFactory.example1Cached().getDesignTimeMetadata();
+		tm.setWidenComparisonToString(false);
+		Command command = helpParse(sql);
+		QueryResolver.resolveCommand(command, tm);
+		command = QueryRewriter.rewrite(command, tm, null);
+		assertEquals("SELECT 1 < ALL (?)", command.toString());
+	}
+	
+	@Test public void testQuantifiedCompareProcessing() throws Exception {
+		String sql = "select e1 from pm1.g1 where e2 = some (('a', 'b'))"; //$NON-NLS-1$
+		Command command = helpParse(sql);
+		ProcessorPlan pp = TestProcessor.helpGetPlan(command, RealMetadataFactory.example1Cached(), TestOptimizer.getGenericFinder());
+	    HardcodedDataManager dataManager = new HardcodedDataManager();
+	    dataManager.addData("SELECT g_0.e2, g_0.e1 FROM pm1.g1 AS g_0", Arrays.asList("a", 1), Arrays.asList("c", 2));
+		TestProcessor.helpProcess(pp, dataManager, new List[] {Arrays.asList(1)});
+	    
+	}
+	
 	/**
 	 * TODO
  	@Test public void testArrayLobs() {
diff --git a/engine/src/test/java/org/teiid/query/processor/TestGeometry.java b/engine/src/test/java/org/teiid/query/processor/TestGeometry.java
index a219539229..ab11de73ed 100644
--- a/engine/src/test/java/org/teiid/query/processor/TestGeometry.java
+++ b/engine/src/test/java/org/teiid/query/processor/TestGeometry.java
@@ -317,8 +317,16 @@ public void testGmlParseSrid() throws Exception {
     @Test public void testSimplify() throws Exception {
 		Expression ex = TestFunctionResolving.getExpression("ST_AsText(ST_SIMPLIFY(ST_GeomFromText('LINESTRING(1 1,2 2,2 3.5,1 3,1 2,2 1)'), 1))");
 		assertEquals("LINESTRING (1 1, 2 3.5, 2 1)", ClobType.getString((ClobType)Evaluator.evaluate(ex)));
+        //ensure it creates an empty geometry
+		ex = TestFunctionResolving.getExpression("ST_ISEmpty(ST_Simplify(ST_GeomFromText('POLYGON((6 3,1 -2,-4 3,1 8,6 3))'),5))");
+        assertTrue((Boolean)Evaluator.evaluate(ex));
 	}
     
+    @Test public void testSimplifyPreserveTopology() throws Exception {
+        Expression ex = TestFunctionResolving.getExpression("ST_AsText(ST_SimplifyPreserveTopology(ST_GeomFromText('POLYGON((6 3,1 -2,-4 3,1 8,6 3))'),5))");
+        assertEquals("POLYGON ((6 3, 1 -2, -4 3, 1 8, 6 3))", ClobType.getString((ClobType)Evaluator.evaluate(ex)));
+    }
+    
     @Test public void testWithin() throws Exception {
 		Expression ex = TestFunctionResolving.getExpression("ST_WITHIN(ST_GeomFromText('POINT(0 0)'), ST_GeomFromText('POINT(0 0)'))");
 		assertTrue((Boolean)Evaluator.evaluate(ex));
@@ -428,5 +436,15 @@ public void testGmlParseSrid() throws Exception {
         ex = TestFunctionResolving.getExpression("ST_AsText(ST_GeomFromGeoJson(ST_AsGeoJSON(ST_GeomFromText('LINESTRING (30 10, 10 30, 40 40)'))))");
         assertEquals("LINESTRING (30 10, 10 30, 40 40)", ClobType.getString((ClobType)Evaluator.evaluate(ex)));
     }
+
+    @Test public void testMakeEnvelope() throws Exception {
+        Expression ex = TestFunctionResolving.getExpression("ST_ASEWKT(st_makeenvelope(-1.73431370972209553,-0.71846435100548445,1.31749469692502075,1.28153564899451555,2908))");
+        assertEquals("SRID=2908;POLYGON ((-1.7343137097220955 -0.7184643510054844, -1.7343137097220955 1.2815356489945156, 1.3174946969250207 1.2815356489945156, 1.3174946969250207 -0.7184643510054844, -1.7343137097220955 -0.7184643510054844))", ClobType.getString((ClobType)Evaluator.evaluate(ex)));
+    }
+    
+    @Test public void testSnapToGrid() throws Exception {
+        Expression ex = TestFunctionResolving.getExpression("ST_AsText(ST_SnapToGrid(ST_GeomFromText('LINESTRING(1.1115678 2.123, 4.111111 3.2374897, 4.11112 3.23748667)'),.001))");
+        assertEquals("LINESTRING (1.112 2.123, 4.111 3.237)", ClobType.getString((ClobType)Evaluator.evaluate(ex)));
+    }
     
 }
diff --git a/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java b/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
index a06d736cbb..ccc32e40fb 100644
--- a/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
+++ b/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
@@ -23,15 +23,17 @@
 package org.teiid.query.processor;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
+import org.teiid.query.metadata.TransformationMetadata;
 import org.teiid.query.optimizer.TestOptimizer;
 import org.teiid.query.optimizer.TestOptimizer.ComparisonMode;
 import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder;
 import org.teiid.query.unittest.RealMetadataFactory;
 
-
+@SuppressWarnings("nls")
 public class TestSetProcessing {
     
     @Test public void testExcept() throws Exception {
@@ -114,5 +116,18 @@ public class TestSetProcessing {
         TestProcessor.sampleData1(manager);
         TestProcessor.helpProcess(plan, manager, expected);
     }
+    
+    @Test public void testUnionArrayNull() throws Exception {
+        TransformationMetadata metadata = RealMetadataFactory.fromDDL("create view v (col string[]) as select null union all select null", "x", "y");
+        
+        ProcessorPlan plan = TestOptimizer.helpPlan("select * from v", metadata, new String[] {}); 
+        
+        List<?>[] expected = new List[] {
+            Collections.singletonList(null), Collections.singletonList(null),
+            };
+
+        FakeDataManager manager = new FakeDataManager();
+        TestProcessor.helpProcess(plan, manager, expected);
+    }
 
 }
diff --git a/engine/src/test/java/org/teiid/query/resolver/TestResolver.java b/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
index 4fa6beacf5..6864cae83a 100644
--- a/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
+++ b/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
@@ -1215,6 +1215,13 @@ private Object[] helpGetStoredProcDefaultValues() {
         //test
         this.helpResolveException(sql);
     }
+    
+    @Test public void testSubQueryINArrayComparison(){
+        String sql = "select e1 from pm1.g1 where (e1, e2) in (select e1, e2 from pm4.g1)"; //$NON-NLS-1$
+
+        //test
+        this.helpResolve(sql);
+    }
 
 	@Test public void testStoredQueryInFROMSubquery() {
 		String sql = "select X.e1 from (EXEC pm1.sq3('abc', 123)) as X"; //$NON-NLS-1$
@@ -2368,13 +2375,10 @@ private void verifyProjectedTypes(Command c, Class[] types) {
         helpResolveException(sql, metadata, "TEIID30095 The first three arguments for the LOOKUP function must be specified as constants."); //$NON-NLS-1$
     }
     
-    /**
-     * We cannot implicitly convert the argument to double due to lack of precision
-     */
-    @Test public void testPowerWithBigInteger_Fails() throws Exception {
+    @Test public void testPowerWithBigInteger() throws Exception {
         String sql = "SELECT power(10, 999999999999999999999999999999999999999999999)"; //$NON-NLS-1$
         
-        helpResolveException(sql);
+        helpResolve(sql);
     }
     
     @Test public void testPowerWithLong() throws Exception {
diff --git a/engine/src/test/java/org/teiid/query/validator/TestValidator.java b/engine/src/test/java/org/teiid/query/validator/TestValidator.java
index caf317d748..f86fa928cc 100644
--- a/engine/src/test/java/org/teiid/query/validator/TestValidator.java
+++ b/engine/src/test/java/org/teiid/query/validator/TestValidator.java
@@ -911,6 +911,14 @@ private void helpFailProcedure(String procedure, String userUpdateStr, Table.Tri
     @Test public void testValidateInClauseSubquery() {        
         helpValidate("SELECT e2 FROM test.group2 WHERE e1 IN (SELECT e1 FROM test.group)", new String[] {"e1"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
     }
+    
+    @Test public void testValidateInClauseSubqueryPasses() {        
+        helpValidate("SELECT e2 FROM test.group2 WHERE e1 IN (SELECT e2 FROM test.group)", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+    
+    @Test public void testValidateInClauseSubqueryArray() {        
+        helpValidate("SELECT e2 FROM pm1.g1 WHERE (e2, e3) IN (SELECT e2, e3 FROM pm1.g2)", new String[] {}, RealMetadataFactory.example1Cached()); //$NON-NLS-1$ //$NON-NLS-2$
+    }
 
     @Test public void testValidateExec1() {
         helpValidate("EXEC pm1.sq1()", new String[] {}, RealMetadataFactory.example1Cached()); //$NON-NLS-1$
diff --git a/jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html b/jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
index cbafe8c003..0702cbb355 100644
--- a/jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
+++ b/jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
@@ -34,6 +34,7 @@ <H2><A NAME="Highlights"></A>Highlights</H2>
     <li><a href="https://issues.jboss.org/browse/TEIID-4378">TEIID-4378</a> <a href="https://issues.jboss.org/browse/TEIID-4376">TEIID-4376</a> <b>Clob enhancements</b> to support concat and use in EXECUTE IMMEDIATE.
     <li><a href="https://issues.jboss.org/browse/TEIID-4100">TEIID-4100</a> <b>OData expand</b> support for siblings and nested expands.
     <li><a href="https://issues.jboss.org/browse/TEIID-4100">TEIID-4393</a> <b>Additional Geospatial Functions</b> to more fully support the SQL-MM specification.
+    <li><a href="https://issues.jboss.org/browse/TEIID-4578">TEIID-4578</a> <b>SQLAlchemy</b> support through our pg/odbc access.
 </ul>
 
 <h2><a name="Compatibility">Compatibility Issues</a></h2>
diff --git a/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java b/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
index 5c28560e2d..831588a554 100644
--- a/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
+++ b/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
@@ -25,17 +25,29 @@
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
 import org.teiid.adminapi.impl.SessionMetadata;
 import org.teiid.adminapi.impl.VDBMetaData;
+import org.teiid.api.exception.query.FunctionExecutionException;
+import org.teiid.api.exception.query.QueryResolverException;
+import org.teiid.core.TeiidComponentException;
 import org.teiid.core.types.ArrayImpl;
 import org.teiid.core.types.BlobType;
 import org.teiid.core.types.ClobType;
 import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.types.GeometryType;
+import org.teiid.core.util.StringUtil;
+import org.teiid.language.SQLConstants;
 import org.teiid.metadata.Column;
 import org.teiid.metadata.Datatype;
 import org.teiid.metadata.FunctionMethod;
@@ -45,13 +57,20 @@
 import org.teiid.metadata.Table;
 import org.teiid.metadata.Table.Type;
 import org.teiid.odbc.ODBCServerRemoteImpl;
+import org.teiid.query.function.GeometryFunctionMethods;
 import org.teiid.query.metadata.TransformationMetadata;
+import org.teiid.query.parser.SQLParserUtil;
+import org.teiid.query.resolver.util.ResolverUtil;
 import org.teiid.query.resolver.util.ResolverVisitor;
+import org.teiid.query.sql.symbol.GroupSymbol;
+import org.teiid.query.sql.visitor.SQLStringVisitor;
 import org.teiid.transport.PgBackendProtocol;
 
 public class PgCatalogMetadataStore extends MetadataFactory {
 	private static final long serialVersionUID = 2158418324376966987L;
 	
+	public static final String POSTGRESQL_VERSION = System.getProperties().getProperty("org.teiid.pgVersion", "PostgreSQL 8.2"); //$NON-NLS-1$ //$NON-NLS-2$
+
 	public static final String TYPMOD = "(CASE WHEN (t1.DataType = 'bigdecimal' OR t1.DataType = 'biginteger') THEN 4+(65536*(case when (t1.Precision>32767) then 32767 else t1.Precision end)+(case when (t1.Scale>32767) then 32767 else t1.Scale end)) " + //$NON-NLS-1$
 				"WHEN (t1.DataType = 'string' OR t1.DataType = 'char') THEN (CASE WHEN (t1.Length <= 2147483643) THEN 4+ t1.Length ELSE 2147483647 END) ELSE -1 END)"; //$NON-NLS-1$
 
@@ -71,19 +90,108 @@ public PgCatalogMetadataStore(String modelName, Map<String, Datatype> dataTypes)
 		add_matpg_relatt();
 		add_matpg_datatype();
 		add_pg_description();
-		addFunction("encode", "encode").setPushdown(PushDown.CAN_PUSHDOWN);; //$NON-NLS-1$ //$NON-NLS-2$
-		addFunction("postgisVersion", "PostGIS_Lib_Version"); //$NON-NLS-1$ //$NON-NLS-2$
+		add_pg_prepared_xacts();
+		add_pg_inherits();
+		add_pg_stats();
+		add_geography_columns();
+		add_pg_constraint();
+		addFunction("regClass", "regclass").setNullOnNull(true); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("encode", "encode").setPushdown(PushDown.CAN_PUSHDOWN); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("objDescription", "obj_description"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("hasSchemaPrivilege", "has_schema_privilege").setNullOnNull(true); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("hasTablePrivilege", "has_table_privilege").setNullOnNull(true); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("formatType", "format_type").setNullOnNull(true); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("currentSchema", "current_schema"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("getUserById", "pg_get_userbyid"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("colDescription", "col_description"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("pgHasRole", "pg_has_role"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("asBinary2", "ST_asBinary"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("postgisLibVersion", "PostGIS_Lib_Version"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("postgisGeosVersion", "postgis_geos_version"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("postgisProjVersion", "postgis_proj_version"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("postgisVersion", "postgis_version"); //$NON-NLS-1$ //$NON-NLS-2$
 		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$
+		addFunction("pg_table_is_visible", "pg_table_is_visible"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("pg_get_constraintdef", "pg_get_constraintdef"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("pg_type_is_visible", "pg_type_is_visible"); //$NON-NLS-1$ //$NON-NLS-2$
 		FunctionMethod func = addFunction("asPGVector", "asPGVector"); //$NON-NLS-1$ //$NON-NLS-2$
 		func.setProperty(ResolverVisitor.TEIID_PASS_THROUGH_TYPE, Boolean.TRUE.toString());
-		addFunction("getOid", "getOid"); //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("getOid", "getOid").setNullOnNull(true);; //$NON-NLS-1$ //$NON-NLS-2$
+		addFunction("version", "version"); //$NON-NLS-1$ //$NON-NLS-1$
 		func = addFunction("pg_client_encoding", "pg_client_encoding"); //$NON-NLS-1$ //$NON-NLS-2$
 		func.setDeterminism(Determinism.COMMAND_DETERMINISTIC);
 	}
 	
-	private Table createView(String name) {
+	private Table add_pg_constraint() {
+	    Table t = createView("pg_constraint"); //$NON-NLS-1$ 
+        
+	    addColumn("oid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+	    addColumn("conname", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+	    addColumn("contype", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+	    addColumn("consrc", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+	    addColumn("conrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+	    addColumn("confrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+	    addColumn("conkey", DataTypeManager.getDataTypeName(DataTypeManager.getArrayType(DataTypeManager.DefaultDataClasses.SHORT)), t); //$NON-NLS-1$ 
+        
+        String transformation = "SELECT pg_catalog.getOid(UID) as oid, name as conname, lower(left(Type, 1)) as contype, " //$NON-NLS-1$
+                + "null as consrc, " //$NON-NLS-1$
+                + "pg_catalog.getOid(TableUID) as conrelid, pg_catalog.getOid(RefTableUID) as confrelid, " //$NON-NLS-1$
+                + "ColPositions as conkey " + //$NON-NLS-1$
+                "FROM Sys.Keys WHERE Type in ('Primary', 'Unique', 'Foreign')"; //$NON-NLS-1$
+        t.setSelectTransformation(transformation);
+        return t;       
+        
+    }
+
+    private void add_pg_prepared_xacts() {
+	    Table t = createView("pg_prepared_xacts"); //$NON-NLS-1$ 
+	    //xid
+        addColumn("transaction", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ 
+        addColumn("gid", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+        addColumn("owner", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+        addColumn("database", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ 
+        
+        String transformation = "SELECT null, null, null, null from SYS.Tables WHERE 1=2"; //$NON-NLS-1$
+        t.setSelectTransformation(transformation);
+    }
+	
+	private void add_pg_inherits() {
+        Table t = createView("pg_inherits"); //$NON-NLS-1$ 
+        addColumn("inhrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ 
+        addColumn("inhparent", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+        addColumn("inhseqno", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+        
+        String transformation = "SELECT null, null, null from SYS.Tables WHERE 1=2"; //$NON-NLS-1$
+        t.setSelectTransformation(transformation);
+    }
+	
+	private void add_pg_stats() {
+        Table t = createView("pg_stats"); //$NON-NLS-1$ 
+        addColumn("schemaname", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ 
+        addColumn("tablename", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+        addColumn("attname", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+        
+        String transformation = "SELECT null, null, null from SYS.Tables WHERE 1=2"; //$NON-NLS-1$
+        t.setSelectTransformation(transformation);
+    }
+	
+	private void add_geography_columns() {
+        Table t = createView("geography_columns"); //$NON-NLS-1$ 
+        addColumn("f_table_catalog", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ 
+        addColumn("f_table_schema", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+        addColumn("f_table_name", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+        addColumn("f_geography_column", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+        addColumn("coord_dimension", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+        addColumn("srid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+        addColumn("type", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+
+        String transformation = "SELECT null, null, null, null, null, null, null from SYS.Tables WHERE 1=2"; //$NON-NLS-1$
+        t.setSelectTransformation(transformation);
+	}
+
+    private Table createView(String name) {
 		Table t = addTable(name);
 		t.setSystem(true);
 		t.setSupportsUpdate(false);
@@ -176,8 +284,7 @@ private Table add_pg_attribute() {
 				"pt.oid as atttypid," + //$NON-NLS-1$
 				"pt.typlen as attlen, " + //$NON-NLS-1$
 				"convert(t1.Position, short) as attnum, " + //$NON-NLS-1$
-				"(CASE WHEN (t1.DataType = 'bigdecimal' OR t1.DataType = 'biginteger') THEN (CASE WHEN (4+(cast(65536 as float)*t1.Precision)+t1.Scale) > 2147483647 THEN 2147483647 ELSE (4+(65536*t1.Precision)+t1.Scale) END) " + //$NON-NLS-1$
-				"WHEN (t1.DataType = 'string' OR t1.DataType = 'char') THEN (CASE WHEN (t1.Length <= 2147483643) THEN 4+ t1.Length ELSE 2147483647 END) ELSE -1 END) as atttypmod, " + //$NON-NLS-1$
+				TYPMOD +" as atttypmod, " + //$NON-NLS-1$
 				"CASE WHEN (t1.NullType = 'No Nulls') THEN true ELSE false END as attnotnull, " + //$NON-NLS-1$
 				"false as attisdropped, " + //$NON-NLS-1$
 				"false as atthasdef " + //$NON-NLS-1$
@@ -190,8 +297,7 @@ private Table add_pg_attribute() {
 				"pt.oid as atttypid," + //$NON-NLS-1$
 				"pt.typlen as attlen, " + //$NON-NLS-1$
 				"convert(kc.Position, short) as attnum, " + //$NON-NLS-1$
-				"(CASE WHEN (t1.DataType = 'bigdecimal' OR t1.DataType = 'biginteger') THEN (CASE WHEN (4+(cast(65536 as float)*t1.Precision)+t1.Scale) > 2147483647 THEN 2147483647 ELSE (4+(65536*t1.Precision)+t1.Scale) END) " + //$NON-NLS-1$
-				"WHEN (t1.DataType = 'string' OR t1.DataType = 'char') THEN (CASE WHEN (t1.Length <= 2147483643) THEN 4+ t1.Length ELSE 2147483647 END) ELSE -1 END) as atttypmod, " + //$NON-NLS-1$
+				TYPMOD +" as atttypmod, " + //$NON-NLS-1$
 				"CASE WHEN (t1.NullType = 'No Nulls') THEN true ELSE false END as attnotnull, " + //$NON-NLS-1$
 				"false as attisdropped, " + //$NON-NLS-1$
 				"false as atthasdef " + //$NON-NLS-1$
@@ -218,6 +324,8 @@ private Table add_pg_class() {
 		// r = ordinary table, i = index, S = sequence, v = view, c = composite type, t = TOAST table
 		addColumn("relkind", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$ 
 		
+        addColumn("relowner", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ 
+
 		// 	If this is an index, the access method used (B-tree, hash, etc.)
 		addColumn("relam", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ 
 		
@@ -233,26 +341,37 @@ private Table add_pg_class() {
 		addColumn("relhasrules", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //$NON-NLS-1$ 
 		
 		// 	True if we generate an OID for each row of the relation
-		addColumn("relhasoids", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //$NON-NLS-1$ 
+		addColumn("relhasoids", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //$NON-NLS-1$
+		
+		//additional column not present in pg metadata - for column metadata query
+		addColumn("relnspname", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+		
+		addColumn("reloptions", DataTypeManager.getDataTypeName(DataTypeManager.getArrayType(DataTypeManager.DefaultDataClasses.STRING)), t); //$NON-NLS-1$
 
 		addPrimaryKey("pk_pg_class", Arrays.asList("oid"), t); //$NON-NLS-1$ //$NON-NLS-2$
 
 		String transformation = "SELECT pg_catalog.getOid(t1.uid) as oid, t1.name as relname, " +  //$NON-NLS-1$
 				"(SELECT pg_catalog.getOid(uid) FROM SYS.Schemas WHERE Name = t1.SchemaName) as relnamespace, " + //$NON-NLS-1$
 				"convert((CASE t1.isPhysical WHEN true THEN 'r' ELSE 'v' END), char) as relkind," + //$NON-NLS-1$
+				"0 as relowner, " + //$NON-NLS-1$
 				"0 as relam, " + //$NON-NLS-1$
 				"convert(0, float) as reltuples, " + //$NON-NLS-1$
 				"0 as relpages, " + //$NON-NLS-1$
 				"false as relhasrules, " + //$NON-NLS-1$
-				"false as relhasoids " + //$NON-NLS-1$
+				"false as relhasoids, " + //$NON-NLS-1$
+				"t1.SchemaName as relnspname, " + //$NON-NLS-1$
+				"null as reloptions " + //$NON-NLS-1$
 				"FROM SYS.Tables t1 UNION ALL SELECT pg_catalog.getOid(t1.uid) as oid, t1.name as relname, " +  //$NON-NLS-1$
 				"(SELECT pg_catalog.getOid(uid) FROM SYS.Schemas WHERE Name = t1.SchemaName) as relnamespace, " + //$NON-NLS-1$
 				"convert('i', char) as relkind," + //$NON-NLS-1$
+				"0 as relowner, " + //$NON-NLS-1$
 				"0 as relam, " + //$NON-NLS-1$
 				"convert(0, float) as reltuples, " + //$NON-NLS-1$
 				"0 as relpages, " + //$NON-NLS-1$
 				"false as relhasrules, " + //$NON-NLS-1$
-				"false as relhasoids " + //$NON-NLS-1$
+				"false as relhasoids, " + //$NON-NLS-1$
+				"t1.SchemaName as relnspname, " + //$NON-NLS-1$
+				"null as reloptions " + //$NON-NLS-1$
 				"FROM SYS.Keys t1 WHERE t1.type in ('Primary', 'Unique', 'Index')"; //$NON-NLS-1$
 		t.setSelectTransformation(transformation);
 		t.setMaterialized(true);
@@ -311,8 +430,9 @@ private Table add_pg_namespace() {
 		Table t = createView("pg_namespace"); //$NON-NLS-1$ 
 		addColumn("oid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ 
 		addColumn("nspname", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ 
+		addColumn("nspowner", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
 		
-		String transformation = "SELECT pg_catalog.getOid(uid) as oid, t1.Name as nspname " + //$NON-NLS-1$
+		String transformation = "SELECT pg_catalog.getOid(uid) as oid, t1.Name as nspname, 0 as nspowner " + //$NON-NLS-1$
 		"FROM SYS.Schemas as t1"; //$NON-NLS-1$
 
 		t.setSelectTransformation(transformation);
@@ -440,50 +560,58 @@ private Table add_pg_type() {
 		addColumn("typrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ 
 		addColumn("typelem", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
 		addColumn("typinput", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+		addColumn("typdefault", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+		
+		//non-pg column to associate the teiid type name - this is expected to be unique.
+		//aliases are handled by matpg_datatype
+		addColumn("teiid_name", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+		
 		String transformation =
-			"select oid, typname, (SELECT pg_catalog.getOid(uid) FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem, null as typeinput from texttable('" + //$NON-NLS-1$
-			"16,boolean,1,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"17,varbinary,-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$
-			"1042,char,1,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"21,short,2,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"20,long,8,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"23,integer,4,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"26,oid,4,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"700,float,4,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"701,double,8,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"705,unknown,-2,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"1082,date,4,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"1083,datetime,8,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"1114,timestamp,8,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"1700,decimal,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"142,xml,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"14939,lo,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"32816,geometry,-1,b,0,-1,0,0\n" + //$NON-NLS-1$
-			"2278,void,4,p,0,-1,0,0\n" + //$NON-NLS-1$
-			"2249,record,-1,p,0,-1,0,0\n" + //$NON-NLS-1$
-			"30,oidvector,-1,b,0,-1,0,26\n" + //$NON-NLS-1$
-			"1000,_bool,-1,b,0,-1,0,16\n" + //$NON-NLS-1$
-			"1001,_bytea,-1,b,0,-1,0,17\n" + //$NON-NLS-1$
-			"1002,_char,-1,b,0,-1,0,18\n" + //$NON-NLS-1$
-			"1005,_int2,-1,b,0,-1,0,21\n" + //$NON-NLS-1$
-			"1007,_int4,-1,b,0,-1,0,23\n" + //$NON-NLS-1$
-			"1009,_text,-1,b,0,-1,0,25\n" + //$NON-NLS-1$
-			"1028,_oid,-1,b,0,-1,0,26\n" + //$NON-NLS-1$
-			"1014,_bpchar,-1,b,0,-1,0,1042\n" + //$NON-NLS-1$
-			"1015,_varchar,-1,b,0,-1,0,1043\n" + //$NON-NLS-1$
-			"1016,_int8,-1,b,0,-1,0,20\n" + //$NON-NLS-1$
-			"1021,_float4,-1,b,0,-1,0,700\n" + //$NON-NLS-1$
-			"1022,_float8,-1,b,0,-1,0,701\n" + //$NON-NLS-1$
-			"1115,_timestamp,-1,b,0,-1,0,1114\n" + //$NON-NLS-1$
-			"1182,_date,-1,b,0,-1,0,1082\n" + //$NON-NLS-1$
-			"1183,_time,-1,b,0,-1,0,1083\n" + //$NON-NLS-1$
-			"32824,_geometry,-1,b,0,-1,0,32816\n" + //$NON-NLS-1$
-			"2287,_record,-1,b,0,-1,0,2249\n" + //$NON-NLS-1$
-			"2283,anyelement,4,p,0,-1,0,0\n" + //$NON-NLS-1$
-			"22,int2vector,-1,b,0,-1,0,0" + //$NON-NLS-1$
-			"' columns oid integer, typname string, typlen short, typtype char, typbasetype integer, typtypmod integer, typrelid integer, typelem integer) AS t"; //$NON-NLS-1$
+			"select oid, typname, (SELECT pg_catalog.getOid(uid) FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem, null as typeinput, null as typdefault, teiid_name from texttable('" + //$NON-NLS-1$
+			"16,bool,1,b,0,-1,0,0,boolean\n" + //$NON-NLS-1$
+			"17,bytea,-1,b,0,-1,0,0,blob\n" + //$NON-NLS-1$
+			"1043,varchar,-1,b,0,-1,0,0,string\n" + //$NON-NLS-1$
+			"25,text,-1,b,0,-1,0,0,clob\n" + //$NON-NLS-1$
+			"1042,char,1,b,0,-1,0,0,\n" + //$NON-NLS-1$
+			"21,int2,2,b,0,-1,0,0,short\n" + //$NON-NLS-1$
+			"20,int8,8,b,0,-1,0,0,long\n" + //$NON-NLS-1$
+			"23,int4,4,b,0,-1,0,0,integer\n" + //$NON-NLS-1$
+			"26,oid,4,b,0,-1,0,0,\n" + //$NON-NLS-1$
+			"700,float4,4,b,0,-1,0,0,float\n" + //$NON-NLS-1$
+			"701,float8,8,b,0,-1,0,0,double\n" + //$NON-NLS-1$
+			"705,unknown,-2,b,0,-1,0,0,object\n" + //$NON-NLS-1$
+			"1082,date,4,b,0,-1,0,0,date\n" + //$NON-NLS-1$
+			"1083,time,8,b,0,-1,0,0,time\n" + //$NON-NLS-1$
+			"1114,timestamp,8,b,0,-1,0,0,timestamp\n" + //$NON-NLS-1$
+			"1700,numeric,-1,b,0,-1,0,0,bigdecimal\n" + //$NON-NLS-1$
+			"142,xml,-1,b,0,-1,0,0,xml\n" + //$NON-NLS-1$
+			"14939,lo,-1,b,0,-1,0,0,\n" + //$NON-NLS-1$
+			"32816,geometry,-1,b,0,-1,0,0,geometry\n" + //$NON-NLS-1$
+			"2278,void,4,p,0,-1,0,0,\n" + //$NON-NLS-1$
+			"2249,record,-1,p,0,-1,0,0,\n" + //$NON-NLS-1$
+			"30,oidvector,-1,b,0,-1,0,26,\n" + //$NON-NLS-1$
+			"1000,_bool,-1,b,0,-1,0,16,boolean[]\n" + //$NON-NLS-1$
+			"1001,_bytea,-1,b,0,-1,0,17,blob[]\n" + //$NON-NLS-1$
+			"1002,_char,-1,b,0,-1,0,18,\n" + //$NON-NLS-1$
+			"1005,_int2,-1,b,0,-1,0,21,short[]\n" + //$NON-NLS-1$
+			"1007,_int4,-1,b,0,-1,0,23,integer[]\n" + //$NON-NLS-1$
+			"1009,_text,-1,b,0,-1,0,25,clob[]\n" + //$NON-NLS-1$
+			"1028,_oid,-1,b,0,-1,0,26,\n" + //$NON-NLS-1$
+			"1014,_bpchar,-1,b,0,-1,0,1042,\n" + //$NON-NLS-1$
+			"1015,_varchar,-1,b,0,-1,0,1043,string[]\n" + //$NON-NLS-1$
+			"1016,_int8,-1,b,0,-1,0,20,long[]\n" + //$NON-NLS-1$
+			"1021,_float4,-1,b,0,-1,0,700,float[]\n" + //$NON-NLS-1$
+			"1022,_float8,-1,b,0,-1,0,701,double[]\n" + //$NON-NLS-1$
+			"1031,_numeric,-1,b,0,-1,0,1700,bigdecimal[]\n" + //$NON-NLS-1$
+			"1115,_timestamp,-1,b,0,-1,0,1114,timestamp[]\n" + //$NON-NLS-1$
+			"1182,_date,-1,b,0,-1,0,1082,date[]\n" + //$NON-NLS-1$
+			"1183,_time,-1,b,0,-1,0,1083,time[]\n" + //$NON-NLS-1$
+			"32824,_geometry,-1,b,0,-1,0,32816,geometry[]\n" + //$NON-NLS-1$
+			"143,_xml,-1,b,0,-1,0,142,xml[]\n" + //$NON-NLS-1$
+			"2287,_record,-1,b,0,-1,0,2249,\n" + //$NON-NLS-1$
+			"2283,anyelement,4,p,0,-1,0,0,\n" + //$NON-NLS-1$
+			"22,int2vector,-1,b,0,-1,0,0," + //$NON-NLS-1$
+			"' columns oid integer, typname string, typlen short, typtype char, typbasetype integer, typtypmod integer, typrelid integer, typelem integer, teiid_name string) AS t"; //$NON-NLS-1$
 		t.setSelectTransformation(transformation);		
 		t.setMaterialized(true);
 		return t;		
@@ -556,19 +684,22 @@ private Table add_matpg_datatype()  {
 		addColumn("oid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
 		addColumn("typname", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ 
 		addColumn("name", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$ 
-		addColumn("uid", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
 		addColumn("typlen", DataTypeManager.DefaultDataTypes.SHORT, t); //$NON-NLS-1$
+		addColumn("typtype", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$
+		addColumn("typbasetype", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
+		addColumn("typtypmod", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$
 		
 		addPrimaryKey("matpg_datatype_names", Arrays.asList("oid", "name"), t); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
 		addIndex("matpg_datatype_ids", true, Arrays.asList("typname", "oid"), t); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-		String transformation = "select pt.oid as oid, pt.typname as typname, t.Name name, t.UID, pt.typlen from pg_catalog.pg_type pt JOIN (select (CASE "+//$NON-NLS-1$
-		"WHEN (Name = 'clob' OR Name = 'blob') THEN 'lo' " +//$NON-NLS-1$
-		"WHEN (Name = 'byte' ) THEN 'short' " +//$NON-NLS-1$
-		"WHEN (Name = 'time' ) THEN 'datetime' " + //$NON-NLS-1$
-		"WHEN (Name = 'biginteger' ) THEN 'decimal' " +//$NON-NLS-1$
-		"WHEN (Name = 'bigdecimal' ) THEN 'decimal' " +//$NON-NLS-1$
-		"WHEN (Name = 'object' ) THEN 'unknown' " +//$NON-NLS-1$
-		"ELSE Name END) as pg_name, Name, UID from SYS.DataTypes) as t ON t.pg_name = pt.typname";  //$NON-NLS-1$
+		String transformation = "select pt.oid as oid, pt.typname as typname, pt.teiid_name as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt" //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'char' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='varchar'" //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'byte' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='int2'" //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'biginteger' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='numeric'"  //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'varbinary' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='bytea'"  //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'byte[]' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='_int2'" //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'biginteger[]' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='_numeric'"  //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'varbinary[]' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='_bytea'"  //$NON-NLS-1$
+				+ " UNION ALL select pt.oid as oid, pt.typname as typname, 'char[]' as name, pt.typlen, pt.typtype, pt.typbasetype, pt.typtypmod from pg_catalog.pg_type pt where typname='_varchar'"; //$NON-NLS-1$
 		t.setSelectTransformation(transformation);
 		t.setMaterialized(true);
 		return t;
@@ -588,15 +719,28 @@ private FunctionMethod addFunction(String javaFunction, String name) {
 		throw new AssertionError("Could not find function"); //$NON-NLS-1$
 	}
 	
+	//TODO use the TeiidFunction annotation instead
 	public static class FunctionMethods {
 		public static ClobType encode(BlobType value, String encoding) throws SQLException, IOException {
 			return org.teiid.query.function.FunctionMethods.toChars(value, encoding);
 		}
 		
+		public static String postgisLibVersion() {
+			return "2.0.0 USE_GEOS=0 USE_PROJ=1 USE_STATS=0"; //$NON-NLS-1$
+		}
+		
 		public static String postgisVersion() {
-			return "1.4.0"; //$NON-NLS-1$
+            return "2.0.0"; //$NON-NLS-1$
+        }
+		
+		public static String postgisGeosVersion() {
+		    return null;
 		}
 		
+        public static String postgisProjVersion() {
+            return "Rel. 4.8.0"; //$NON-NLS-1$
+	    }
+		
 		public static Boolean hasPerm(@SuppressWarnings("unused") Integer oid,
 				@SuppressWarnings("unused") String permission) {
 			return true;
@@ -638,5 +782,139 @@ public static String pg_client_encoding(org.teiid.CommandContext cc) {
 			}
 			return encoding;
 		}
+		
+		public static Integer regClass(org.teiid.CommandContext cc, String name) throws TeiidComponentException, QueryResolverException {
+            VDBMetaData metadata = (VDBMetaData) cc.getVdb();
+            TransformationMetadata tm = metadata.getAttachment(TransformationMetadata.class);
+            GroupSymbol symbol = new GroupSymbol(SQLParserUtil.normalizeId(name));
+            ResolverUtil.resolveGroup(symbol, tm);
+            return tm.getMetadataStore().getOid(((Table)symbol.getMetadataID()).getUUID());
+        }
+
+		public static String objDescription(org.teiid.CommandContext cc, int oid) {
+		    //TODO need a reverse lookup by oid at least for schema or add the annotation to pg_namespace
+		    return null;
+		}
+		
+		public static String getUserById(int user) {
+		    return "pgadmin"; //$NON-NLS-1$
+		}
+		
+		public static boolean hasSchemaPrivilege(org.teiid.CommandContext cc, String name, String privilege) {
+		    //TODO: could check if the schema exists
+		    return "usage".equalsIgnoreCase(privilege); //$NON-NLS-1$
+		}
+		
+		public static boolean hasTablePrivilege(org.teiid.CommandContext cc, String name, String privilege) {
+		    //TODO: check against authorizationvalidator
+		    return true;
+		}
+		
+		public static String currentSchema(org.teiid.CommandContext cc) {
+            return "SYS"; //$NON-NLS-1$
+        }
+		
+		private static Map<String, String> TypeNameMap = new HashMap<String, String>();
+		static { 
+			TypeNameMap.put("bool", "boolean");
+			TypeNameMap.put("varchar", "character varying");
+		    TypeNameMap.put("int2", "smallint");
+		    TypeNameMap.put("int4", "integer");
+		    TypeNameMap.put("int8", "bigint");
+		    TypeNameMap.put("float4", "real");
+		    TypeNameMap.put("float8", "double precision");
+		}
+		
+		public static String formatType(org.teiid.CommandContext cc, int oid, int typmod) throws SQLException {
+		    Connection c = cc.getConnection();
+            try {
+                PreparedStatement ps = c.prepareStatement("select typname from pg_catalog.pg_type where oid = ?"); //$NON-NLS-1$
+                ps.setInt(1, oid);
+                ps.execute();
+                ResultSet rs = ps.getResultSet();
+                if (rs.next()) {
+                    String name = rs.getString(1);
+                    boolean isArray = name.startsWith("_"); //$NON-NLS-1$
+                    if (isArray) {
+                        name = name.substring(1);
+                    }
+                    String otherName = TypeNameMap.get(name);
+                    if (otherName != null) {
+                        name = otherName;
+                    }
+                    if (typmod > 4) {
+                        if (name.equals("numeric")) {  //$NON-NLS-1$
+                            name += "("+((typmod-4)>>16)+","+((typmod-4)&0xffff)+")";  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        } else if (name.equals("bpchar") || name.equals("varchar")) { //$NON-NLS-1$ //$NON-NLS-2$
+                            name += "("+(typmod-4)+")";  //$NON-NLS-1$ //$NON-NLS-2$
+                        }
+                    }
+                    if (isArray) {
+                        name += "[]"; //$NON-NLS-1$
+                    }
+                    return name;
+                }
+                return "???"; //$NON-NLS-1$
+            } finally {
+                if (c != null) {
+                    c.close();
+                }
+            }
+		}
+		
+		public static String colDescription(org.teiid.CommandContext cc, int oid, int column_number) {
+		    //TODO need a reverse lookup by oid or add the annotation to pg_attribute
+		    return null;
+		}
+		
+		public static boolean pgHasRole(org.teiid.CommandContext cc, int userOid, String privilege) {
+		    return true;
+		}
+		
+		public static BlobType asBinary2(GeometryType geom, String encoding) throws FunctionExecutionException {
+		    return GeometryFunctionMethods.asBlob(geom, encoding);
+		}
+		
+		public static boolean pg_table_is_visible(int oid) throws FunctionExecutionException {
+            return true;
+        }
+		
+	    public static String pg_get_constraintdef(org.teiid.CommandContext cc, int oid, boolean pretty) throws SQLException {
+	        //return a simple constraint def
+	        Connection c = cc.getConnection();
+	        try {
+	            PreparedStatement ps = c.prepareStatement("select pkcolumn_name, pktable_schem, pktable_name, fkcolumn_name from REFERENCEKEYCOLUMNS where getoid(fk_uid) = ? order by KEY_SEQ"); //$NON-NLS-1$
+	            ps.setInt(1, oid);
+	            ps.execute();
+	            ResultSet rs = ps.getResultSet();
+	            String refTable = null;
+	            List<String> columnNames = new ArrayList<String>();
+	            List<String> refColumnNames = new ArrayList<String>();
+	            while (rs.next()) {
+	                if (refTable == null) {
+	                    refTable = SQLStringVisitor.escapeSinglePart(rs.getString(2)) + SQLConstants.Tokens.DOT + SQLStringVisitor.escapeSinglePart(rs.getString(3));
+	                }
+	                columnNames.add(SQLStringVisitor.escapeSinglePart(rs.getString(4)));
+	                refColumnNames.add(SQLStringVisitor.escapeSinglePart(rs.getString(1)));
+	            }
+	            if (refTable == null) {
+	                return null;
+	            }
+	            return "FOREIGN KEY (" + StringUtil.join(columnNames, ",")+ ") REFERENCES " + refTable + "("+ StringUtil.join(refColumnNames, ",") + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$  //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+	        } finally {
+	            if (c != null) {
+	                c.close();
+	            }
+	        }
+	    }
+	    
+	    public static boolean pg_type_is_visible(int oid) throws FunctionExecutionException {
+            return true;
+        }
+	    
+	    public static String version() {
+	        return POSTGRESQL_VERSION;
+	    }
+		
 	}
 }
diff --git a/runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java b/runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java
index 026abd3974..3652ef97c8 100644
--- a/runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java
+++ b/runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java
@@ -75,11 +75,11 @@ enum CursorDirection {
 
 	//	RowDescription (B)
 	//	NoData (B)
-	void sendResultSetDescription(List<PgColInfo> cols);
+	void sendResultSetDescription(List<PgColInfo> cols, short[] resultColumnFormat);
 	
 	//	DataRow (B)
 	//	CommandComplete (B)
-	void sendResults(String sql, ResultSetImpl rs, List<PgColInfo> cols, ResultsFuture<Integer> result, CursorDirection direction, int rowCount, boolean describeRows);
+	void sendResults(String sql, ResultSetImpl rs, List<PgColInfo> cols, ResultsFuture<Integer> result, CursorDirection direction, int rowCount, boolean describeRows, short[] resultColumnFormat);
 	
 	void sendCommandComplete(String sql, Integer count);	
 
diff --git a/runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java b/runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java
index 92edcabf4e..6904d5e63a 100644
--- a/runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java
+++ b/runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java
@@ -22,6 +22,7 @@
 package org.teiid.odbc;
 
 import java.net.SocketAddress;
+import java.nio.charset.Charset;
 import java.util.Properties;
 
 import org.teiid.transport.PgFrontendProtocol.NullTerminatedStringDataInputStream;
@@ -34,7 +35,7 @@ public interface ODBCServerRemote {
 	
 	void prepare(String prepareName, String sql, int[] paramType);
 
-	void bindParameters(String bindName, String prepareName, Object[] paramdata, int resultCodeCount, int[] resultColumnFormat);
+	void bindParameters(String bindName, String prepareName, Object[] paramdata, int resultCodeCount, short[] resultColumnFormat, Charset charset);
 	
 	void execute(String bindName, int maxrows);
 	
diff --git a/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java b/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
index 68e74e08de..6268dfb2ff 100644
--- a/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
+++ b/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.sql.ParameterMetaData;
+import java.nio.charset.Charset;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -50,9 +50,9 @@
 import org.teiid.client.security.LogonException;
 import org.teiid.client.util.ResultsFuture;
 import org.teiid.core.TeiidProcessingException;
-import org.teiid.core.util.ApplicationInfo;
 import org.teiid.core.util.PropertiesUtils;
 import org.teiid.core.util.StringUtil;
+import org.teiid.core.util.TimestampWithTimezone;
 import org.teiid.deployers.PgCatalogMetadataStore;
 import org.teiid.dqp.service.SessionService;
 import org.teiid.jdbc.ConnectionImpl;
@@ -75,6 +75,7 @@
 import org.teiid.transport.ODBCClientInstance;
 import org.teiid.transport.PgBackendProtocol;
 import org.teiid.transport.PgFrontendProtocol.NullTerminatedStringDataInputStream;
+import org.teiid.transport.pg.TimestampUtils;
 
 /**
  * While executing the multiple prepared statements I see this bug currently
@@ -82,8 +83,8 @@
  */
 public class ODBCServerRemoteImpl implements ODBCServerRemote {
 	
-	private static final boolean HONOR_DECLARE_FETCH_TXN = PropertiesUtils.getBooleanProperty(System.getProperties(), "org.teiid.honorDeclareFetchTxn", false); //$NON-NLS-1$
-
+    private static final boolean HONOR_DECLARE_FETCH_TXN = PropertiesUtils.getBooleanProperty(System.getProperties(), "org.teiid.honorDeclareFetchTxn", false); //$NON-NLS-1$
+    
 	public static final String CONNECTION_PROPERTY_PREFIX = "connection."; //$NON-NLS-1$
 	private static final String UNNAMED = ""; //$NON-NLS-1$
 	private static Pattern setPattern = Pattern.compile("set\\s+(\\w+)\\s+to\\s+((?:'[^']*')+)", Pattern.DOTALL|Pattern.CASE_INSENSITIVE);//$NON-NLS-1$
@@ -162,7 +163,7 @@ public class ODBCServerRemoteImpl implements ODBCServerRemote {
 			"\\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 cursorSelectPattern = Pattern.compile("DECLARE\\s+(\\S+)(?:\\s+INSENSITIVE)?(\\s+(NO\\s+)?SCROLL)?\\s+CURSOR\\s+(?:WITH(?:OUT)? HOLD\\s+)?FOR\\s+(.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
+	private static Pattern cursorSelectPattern = Pattern.compile("DECLARE\\s+(\\S+)(\\s+BINARY)?(?:\\s+INSENSITIVE)?(\\s+(NO\\s+)?SCROLL)?\\s+CURSOR\\s+(?:WITH(?:OUT)? HOLD\\s+)?FOR\\s+(.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
 	private static Pattern fetchPattern = Pattern.compile("FETCH(?:(?:\\s+(FORWARD|ABSOLUTE|RELATIVE))?\\s+(\\d+)\\s+(?:IN|FROM))?\\s+(\\S+)\\s*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
 	private static Pattern fetchFirstLastPattern = Pattern.compile("FETCH\\s+(FIRST|LAST)\\s+(?:IN|FROM)\\s+(\\S+)\\s*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
 	private static Pattern movePattern = Pattern.compile("MOVE(?:\\s+(FORWARD|BACKWARD))?\\s+(\\d+)\\s+(?:IN|FROM)\\s+(\\S+)\\s*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
@@ -173,7 +174,7 @@ public class ODBCServerRemoteImpl implements ODBCServerRemote {
 	private static Pattern savepointPattern = Pattern.compile("SAVEPOINT (\\w+\\d?_*)", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
 	private static Pattern rollbackPattern = Pattern.compile("ROLLBACK\\s*(to)*\\s*(\\w+\\d+_*)*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
 	
-	private static Pattern txnPattern = Pattern.compile("(BEGIN|COMMIT|ROLLBACK)(\\s+(WORK|TRANSACTION))?", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+	private static Pattern txnPattern = Pattern.compile("(BEGIN(?:\\s+READ\\s+ONLY)?|COMMIT|ROLLBACK)(\\s+(WORK|TRANSACTION))?", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
 	
 	private TeiidDriver driver;
 	private ODBCClientRemote client;
@@ -327,7 +328,7 @@ public static void setConnectionProperties(ConnectionImpl conn,
 		}
 	}	
 	
-	private void cursorExecute(String cursorName, final String sql, final ResultsFuture<Integer> completion, boolean scroll) {
+	private void cursorExecute(String cursorName, final String sql, final ResultsFuture<Integer> completion, boolean scroll, final boolean binary) {
 		try {
 			// close if the name is already used or the unnamed prepare; otherwise
 			// stmt is alive until session ends.
@@ -355,7 +356,7 @@ public void onCompletion(ResultsFuture<Boolean> future) {
                     try {
                         if (future.get()) {
 		                	List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData());
-	                        cursorMap.put(name, new Cursor(name, sql, stmt, stmt.getResultSet(), cols));
+	                        cursorMap.put(name, new Cursor(name, sql, stmt, stmt.getResultSet(), cols, binary));
     						client.sendCommandComplete("DECLARE CURSOR", null); //$NON-NLS-1$		                            
 							completion.getResultsReceiver().receiveResults(0);
 						}
@@ -377,7 +378,7 @@ private void cursorFetch(String cursorName, CursorDirection direction, int rows,
 		if (rows < 1) {
 			throw new SQLException(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40112, cursorName, rows));
 		}
-		this.client.sendResults("FETCH", cursor.rs, cursor.prepared.columnMetadata, completion, direction, rows, true); //$NON-NLS-1$
+		this.client.sendResults("FETCH", cursor.rs, cursor.prepared.columnMetadata, completion, direction, rows, true, cursor.resultColumnFormat); //$NON-NLS-1$
 	}
 	
         private void cursorMove(String prepareName, String direction, final int rows, final ResultsFuture<Integer> completion) throws SQLException {
@@ -470,7 +471,8 @@ public void onCompletion(ResultsFuture<Boolean> future) {
     			try {
 	                if (future.get()) {
                 		List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData());
-                                client.sendResults(sql, stmt.getResultSet(), cols, completion, CursorDirection.FORWARD, -1, true);
+                		String tag = PgBackendProtocol.getCompletionTag(sql, null);
+                        client.sendResults(sql, stmt.getResultSet(), cols, completion, CursorDirection.FORWARD, -1, tag.equals("SELECT") || tag.equals("SHOW"), null); //$NON-NLS-1$ //$NON-NLS-2$
 	                } else {
 	                	client.sendUpdateCount(sql, stmt.getUpdateCount());
 	                	setEncoding();
@@ -508,15 +510,6 @@ public void prepare(String prepareName, String sql, int[] paramType) {
 				//just pull the initial information - leave statement formation until binding 
 				String modfiedSQL = fixSQL(sql);
 				stmt = this.connection.prepareStatement(modfiedSQL);
-				if (paramType.length > 0) {
-					ParameterMetaData pmd = stmt.getParameterMetaData();
-					for (int i = 0; i < paramType.length; i++) {
-						if (paramType[i] == 0) {
-							//TODO: this is incorrect - should be oid
-							//paramType[i] = convertType(pmd.getParameterType(i + 1));
-						}
-					}
-				}
 				Prepared prepared = new Prepared(prepareName, sql, modfiedSQL, paramType, getPgColInfo(stmt.getMetaData()));
 				this.preparedMap.put(prepareName, prepared);
 				this.client.prepareCompleted(prepareName);
@@ -545,7 +538,7 @@ private long readLong(byte[] bytes, int length) {
 	}
 	
 	@Override
-	public void bindParameters(String bindName, String prepareName, Object[] params, int resultCodeCount, int[] resultColumnFormat) {
+	public void bindParameters(String bindName, String prepareName, Object[] params, int resultCodeCount, short[] resultColumnFormat, Charset encoding) {
 		// An unnamed portal is destroyed at the end of the transaction, or as soon as 
 		// the next Bind statement specifying the unnamed portal as destination is issued. 
 		if (bindName == null || bindName.length() == 0) {
@@ -576,12 +569,6 @@ public void bindParameters(String bindName, String prepareName, Object[] params,
 				if (param instanceof byte[] && prepared.paramType.length > i) {
 					int oid = prepared.paramType[i];
 					switch (oid) {
-					//binary array
-					//pgobject
-					//hstore
-					//date
-					//time
-					//timestamp
 					case PGUtil.PG_TYPE_UNSPECIFIED:
 						//TODO: should infer type from the parameter metadata from the parse message
 						break;
@@ -602,6 +589,13 @@ public void bindParameters(String bindName, String prepareName, Object[] params,
 					case PGUtil.PG_TYPE_FLOAT8:
 						param = Double.longBitsToDouble(readLong((byte[])param, 8));
 						break;
+					case PGUtil.PG_TYPE_DATE:
+					    param = TimestampUtils.toDate(TimestampWithTimezone.getCalendar().getTimeZone(), (int)readLong((byte[])param, 4));
+						break;
+					default:
+					    //start with the string conversion
+					    param = new String((byte[])param, encoding);
+					    break;
 					}
 				}
 				stmt.setObject(i+1, param);
@@ -699,7 +693,7 @@ public void onCompletion(ResultsFuture<Boolean> future) {
 
 	private void sendCursorResults(final Portal cursor, final int fetchSize) {
 		ResultsFuture<Integer> result = new ResultsFuture<Integer>();
-		this.client.sendResults(null, cursor.rs, cursor.prepared.columnMetadata, result, CursorDirection.FORWARD, fetchSize, false);
+		this.client.sendResults(null, cursor.rs, cursor.prepared.columnMetadata, result, CursorDirection.FORWARD, fetchSize, false, cursor.resultColumnFormat);
 		result.addCompletionListener(new ResultsFuture.CompletionListener<Integer>() {
 			public void onCompletion(ResultsFuture<Integer> future) {
 				try {
@@ -768,9 +762,6 @@ else if ((m = fkPattern.matcher(modified)).matches()){
 				//imported keys
 				return baseQuery + "FKTABLE_NAME = " + m.group(15)+" and FKTABLE_SCHEM = "+m.group(16);//$NON-NLS-1$ //$NON-NLS-2$
 			}
-			else if (modified.equalsIgnoreCase("select version()")) { //$NON-NLS-1$
-				return "SELECT 'Teiid "+ApplicationInfo.getInstance().getReleaseNumber()+"'"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
 			else if (modified.startsWith("SELECT name FROM master..sysdatabases")) { //$NON-NLS-1$
 				return "SELECT 'Teiid'"; //$NON-NLS-1$
 			}
@@ -793,7 +784,7 @@ else if ((m = setPattern.matcher(sql)).matches()) {
 			return "SET " + m.group(1) + " " + m.group(2); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		else if ((m = txnPattern.matcher(sql)).matches()) {
-			if (m.group(1).equalsIgnoreCase("BEGIN")) { //$NON-NLS-1$
+			if (StringUtil.startsWithIgnoreCase(m.group(1), "BEGIN")) { //$NON-NLS-1$
 				return "START TRANSACTION"; //$NON-NLS-1$
 			}
 			return m.group(1);
@@ -879,7 +870,7 @@ public void getParameterDescription(String prepareName) {
 		
 		// followed by a RowDescription message describing the rows that will be returned when the statement  
 		// is eventually executed (or a NoData message if the statement will not return rows).
-		this.client.sendResultSetDescription(query.columnMetadata);
+		this.client.sendResultSetDescription(query.columnMetadata, null);
 	}
 	
 	private void errorOccurred(String error) {
@@ -908,7 +899,7 @@ public void getResultSetMetaDataDescription(String bindName) {
 			errorOccurred(RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40078, bindName));
 		}
 		else {
-			this.client.sendResultSetDescription(query.prepared.columnMetadata);
+			this.client.sendResultSetDescription(query.prepared.columnMetadata, query.resultColumnFormat);
 		}
 	}
 
@@ -1119,10 +1110,10 @@ public void onCompletion(ResultsFuture<Integer> future) {
 		            	Matcher m = null;
 		    	        if ((m = cursorSelectPattern.matcher(sql)).matches()){
 		    	        	boolean scroll = false;
-		    	        	if (m.group(2) != null && m.group(3) == null ) {
+		    	        	if (m.group(3) != null && m.group(4) == null ) {
 	    	        			scroll = true;
 		    	        	}
-		    				cursorExecute(normalizeName(m.group(1)), fixSQL(m.group(4)), results, scroll);
+		    				cursorExecute(normalizeName(m.group(1)), fixSQL(m.group(5)), results, scroll, m.group(2) != null);
 		    			}
 		    			else if ((m = fetchPattern.matcher(sql)).matches()){
 		    				int rowCount = 1;
@@ -1192,7 +1183,8 @@ private List<PgColInfo> getPgColInfo(ResultSetMetaData meta)
 			final PgColInfo info = new PgColInfo();
 			info.name = meta.getColumnLabel(i);
 			info.type = meta.getColumnType(i);
-			info.type = convertType(info.type);
+		    String typeName = meta.getColumnTypeName(i);
+		    info.type = convertType(info.type, typeName);
 			info.precision = meta.getColumnDisplaySize(i);
 			if (info.type == PG_TYPE_NUMERIC) {
 				info.mod = 4+ 65536*Math.min(32767, meta.getPrecision(i))+Math.min(32767, meta.getScale(i));
@@ -1269,7 +1261,7 @@ public Prepared (String name, String sql, String modifiedSql, int[] paramType, L
      */
     static class Portal {
 
-    	public Portal(String name, Prepared prepared, int[] resultColumnformat, PreparedStatementImpl stmt) {
+    	public Portal(String name, Prepared prepared,short[] resultColumnformat, PreparedStatementImpl stmt) {
     		this.name = name;
     		this.prepared = prepared;
     		this.resultColumnFormat = resultColumnformat;
@@ -1283,7 +1275,7 @@ public Portal(String name, Prepared prepared, int[] resultColumnformat, Prepared
         /**
          * The format used in the result set columns (if set).
          */
-        final int[] resultColumnFormat;
+        final short[] resultColumnFormat;
 
         final Prepared prepared;
         
@@ -1297,8 +1289,8 @@ public Portal(String name, Prepared prepared, int[] resultColumnformat, Prepared
     
     static class Cursor extends Portal {
     	
-    	public Cursor (String name, String sql, PreparedStatementImpl stmt, ResultSetImpl rs, List<PgColInfo> colMetadata) {
-    		super(name, new Prepared(UNNAMED, sql, sql, null, colMetadata), null, stmt);
+    	public Cursor (String name, String sql, PreparedStatementImpl stmt, ResultSetImpl rs, List<PgColInfo> colMetadata, boolean binary) {
+    		super(name, new Prepared(UNNAMED, sql, sql, null, colMetadata), binary?new short[] {1}:null, stmt);
     		this.rs = rs;
     	}
     }    
diff --git a/runtime/src/main/java/org/teiid/odbc/PGUtil.java b/runtime/src/main/java/org/teiid/odbc/PGUtil.java
index 89530ffdf0..db47d2095d 100644
--- a/runtime/src/main/java/org/teiid/odbc/PGUtil.java
+++ b/runtime/src/main/java/org/teiid/odbc/PGUtil.java
@@ -36,10 +36,14 @@ public class PGUtil {
 	public static final int PG_TYPE_INT2 = 21;
 	public static final int PG_TYPE_INT4 = 23;
 	public static final int PG_TYPE_TEXT = 25;
+	public static final int PG_TYPE_XML = 142;
     //private static final int PG_TYPE_OID = 26;
 	public static final int PG_TYPE_FLOAT4 = 700;
 	public static final int PG_TYPE_FLOAT8 = 701;
 	public static final int PG_TYPE_UNKNOWN = 705;
+	
+	public static final int PG_TYPE_GEOMETRY = 32816;
+	public static final int PG_TYPE_GEOMETRYARRAY = 32824;
     
 	public static final int PG_TYPE_OIDVECTOR = 30;
 	public static final int PG_TYPE_INT2VECTOR = 22;
@@ -51,6 +55,19 @@ public class PGUtil {
 	public static final int PG_TYPE_TIME = 1083;
 	public static final int PG_TYPE_TIMESTAMP_NO_TMZONE = 1114;
 	public static final int PG_TYPE_NUMERIC = 1700;
+	
+	public static final int PG_TYPE_BOOLARRAY = 1000;
+    public static final int PG_TYPE_BYTEAARRAY = 1001;
+    public static final int PG_TYPE_INT8ARRAY = 1026;
+    public static final int PG_TYPE_INT2ARRAY = 1005;
+    public static final int PG_TYPE_INT4ARRAY = 1007;
+    public static final int PG_TYPE_FLOAT4ARRAY = 1021;
+    public static final int PG_TYPE_FLOAT8ARRAY = 1022;
+    public static final int PG_TYPE_DATEARRAY = 1182;
+    public static final int PG_TYPE_TIMEARRAY = 1183;
+    public static final int PG_TYPE_TIMESTAMP_NO_TMZONEARRAY = 1115;
+    public static final int PG_TYPE_NUMERICARRAY = 1031;
+    public static final int PG_TYPE_XMLARRAY = 143;
     //private static final int PG_TYPE_LO = 14939;
     
 	public static class PgColInfo {
@@ -61,11 +78,11 @@ public static class PgColInfo {
 		public int precision;
 		public int mod = -1;
 	}
-		
+	
 	/**
 	 * Types.ARRAY is not supported
 	 */
-	public static int convertType(final int type) {
+	public static int convertType(final int type, final String typeName) {
         switch (type) {
         case Types.BIT:
         case Types.BOOLEAN:
@@ -100,15 +117,46 @@ public static int convertType(final int type) {
         case Types.BINARY:
         case Types.VARBINARY:
         case Types.LONGVARBINARY:
+            if (typeName.equals("geometry")) { //$NON-NLS-1$
+                return PG_TYPE_GEOMETRY;
+            }
         	return PG_TYPE_BYTEA;
+
+        case Types.SQLXML:
+            return PG_TYPE_XML;
         	
         case Types.LONGVARCHAR:
         case Types.CLOB:            
-        case Types.SQLXML:        	
             return PG_TYPE_TEXT;
             
         case Types.ARRAY:
-        	return PG_TYPE_TEXTARRAY;
+            if (typeName.equals("boolean[]")) //$NON-NLS-1$
+                return PG_TYPE_BOOLARRAY;
+            if (typeName.equals("byte[]") || //$NON-NLS-1$
+                typeName.equals("short[]")) //$NON-NLS-1$
+                return PG_TYPE_INT2ARRAY;
+            if (typeName.equals("integer[]")) //$NON-NLS-1$
+                return PG_TYPE_INT4ARRAY;
+            if (typeName.equals("long[]")) //$NON-NLS-1$
+                return PG_TYPE_INT8ARRAY;
+            if (typeName.equals("float[]")) //$NON-NLS-1$
+                return PG_TYPE_FLOAT4ARRAY;
+            if (typeName.equals("double[]")) //$NON-NLS-1$
+                return PG_TYPE_FLOAT8ARRAY;
+            if (typeName.equals("biginiteger[]") || //$NON-NLS-1$
+                typeName.equals("bigdecimal[]")) //$NON-NLS-1$
+                return PG_TYPE_NUMERICARRAY;
+            if (typeName.equals("date[]")) //$NON-NLS-1$
+                return PG_TYPE_DATEARRAY;
+            if (typeName.equals("time[]")) //$NON-NLS-1$
+                return PG_TYPE_TIMEARRAY;
+            if (typeName.equals("timestamp[]")) //$NON-NLS-1$
+                return PG_TYPE_TIMESTAMP_NO_TMZONEARRAY;
+            if (typeName.equals("geometry[]")) //$NON-NLS-1$
+                return PG_TYPE_GEOMETRYARRAY;
+            if (typeName.equals("xml[]")) //$NON-NLS-1$
+                return PG_TYPE_XMLARRAY;
+            return PG_TYPE_TEXTARRAY;
         	
         default:
             return PG_TYPE_UNKNOWN;
diff --git a/runtime/src/main/java/org/teiid/odbc/ScriptReader.java b/runtime/src/main/java/org/teiid/odbc/ScriptReader.java
index 49ee9b5ee5..d1ac02c45a 100644
--- a/runtime/src/main/java/org/teiid/odbc/ScriptReader.java
+++ b/runtime/src/main/java/org/teiid/odbc/ScriptReader.java
@@ -198,16 +198,7 @@ private String readStatementLoop() throws IOException {
                             	if (expressionStart != -1 && expressionEnd == start -1) {
                             		//special handling for regclass cast - it won't always work
                             		if ("regclass".equalsIgnoreCase(type)) { //$NON-NLS-1$
-                            			String name = builder.substring(expressionStart);
-                        				if (name.startsWith("'\"") && name.length() > 4) { //$NON-NLS-1$ 
-                            				name = name.substring(2, name.length()-2);
-                            				name = '\''+ name + '\'';
-                            			}
-                        				if (name.startsWith("'")) { //$NON-NLS-1$ 
-                        					builder.setLength(expressionStart);
-                            				builder.append(name.toUpperCase());
-                        				}
-                            			builder.insert(expressionStart, "(SELECT oid FROM pg_class WHERE upper(relname) = "); //$NON-NLS-1$
+                            			builder.insert(expressionStart, "regclass("); //$NON-NLS-1$
                             			builder.append(")"); //$NON-NLS-1$ 
                             		} else if ("regproc".equalsIgnoreCase(type)) { //$NON-NLS-1$
                             			String name = builder.substring(expressionStart);
diff --git a/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java b/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
index ca0075a88e..fe5562d92d 100644
--- a/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
+++ b/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
@@ -29,10 +29,12 @@
 import java.io.Writer;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 import java.security.GeneralSecurityException;
 import java.sql.Array;
 import java.sql.Blob;
+import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
@@ -53,10 +55,13 @@
 import org.jboss.netty.handler.ssl.SslHandler;
 import org.teiid.client.util.ResultsFuture;
 import org.teiid.core.types.ArrayImpl;
+import org.teiid.core.types.GeometryType;
 import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.core.util.PropertiesUtils;
 import org.teiid.core.util.ReflectionHelper;
 import org.teiid.core.util.SqlUtil;
 import org.teiid.core.util.StringUtil;
+import org.teiid.core.util.TimestampWithTimezone;
 import org.teiid.jdbc.ResultSetImpl;
 import org.teiid.jdbc.TeiidSQLException;
 import org.teiid.logging.LogConstants;
@@ -65,8 +70,10 @@
 import org.teiid.net.socket.ServiceInvocationStruct;
 import org.teiid.odbc.ODBCClientRemote;
 import org.teiid.odbc.PGUtil.PgColInfo;
+import org.teiid.query.function.GeometryUtils;
 import org.teiid.runtime.RuntimePlugin;
 import org.teiid.transport.pg.PGbytea;
+import org.teiid.transport.pg.TimestampUtils;
 /**
  * Represents the messages going from Server --> PG ODBC Client  
  * Some parts of this code is taken from H2's implementation of ODBC
@@ -98,16 +105,18 @@ private final class ResultsWorkItem implements Runnable {
 		private final List<PgColInfo> cols;
 		private final ResultSetImpl rs;
 		private final ResultsFuture<Integer> result;
+		private final short[] resultColumnFormat;
 		private int rows2Send;
 		private int rowsSent = 0;
 		private int rowsInBuffer = 0;
 		String sql;
 
-		private ResultsWorkItem(List<PgColInfo> cols, ResultSetImpl rs, ResultsFuture<Integer> result, int rows2Send) {
+		private ResultsWorkItem(List<PgColInfo> cols, ResultSetImpl rs, ResultsFuture<Integer> result, int rows2Send, short[] resultColumnFormat) {
 			this.cols = cols;
 			this.rs = rs;
 			this.result = result;
 			this.rows2Send = rows2Send;
+			this.resultColumnFormat = resultColumnFormat;
 			initBuffer(maxBufferSize / 8);
 		}
 
@@ -145,7 +154,7 @@ private boolean processRow(ResultsFuture<Boolean> future) {
 			boolean processNext = true;
 			try {
     			if (future.get()) {
-    				sendDataRow(rs, cols);
+    				sendDataRow(rs, cols, resultColumnFormat);
     				rowsSent++;
     				rowsInBuffer++;
     				boolean done = rowsSent == rows2Send;
@@ -349,19 +358,21 @@ public void sendParameterDescription(int[] paramType) {
 	}
 
 	@Override
-	public void sendResultSetDescription(List<PgColInfo> cols) {
-		sendRowDescription(cols);
+	public void sendResultSetDescription(List<PgColInfo> cols,
+	        short[] resultColumnFormat) {
+		sendRowDescription(cols, resultColumnFormat);
 	}
 	
 	@Override
 	public void sendResults(String sql, ResultSetImpl rs, List<PgColInfo> cols,
-			ResultsFuture<Integer> result, CursorDirection direction, int rowCount, boolean describeRows) {
+	        ResultsFuture<Integer> result, CursorDirection direction,
+	        int rowCount, boolean describeRows, short[] resultColumnFormat) {
 		if (nextFuture != null) {
 			sendErrorResponse(new IllegalStateException("Pending results have not been sent")); //$NON-NLS-1$
 		}
     	
     	if (describeRows) {
-    		sendRowDescription(cols);
+    		sendRowDescription(cols, resultColumnFormat);
     	}
     	ResultsWorkItem r;
 		try {
@@ -384,7 +395,7 @@ public void sendResults(String sql, ResultSetImpl rs, List<PgColInfo> cols,
 				}
 				rowCount = 1;
 			}
-			r = new ResultsWorkItem(cols, rs, result, rowCount);
+			r = new ResultsWorkItem(cols, rs, result, rowCount, resultColumnFormat);
 	    	r.sql = sql;
 	    	if (singleResult != null) {
 	    		ResultsFuture<Boolean> resultsFuture = new ResultsFuture<Boolean>();
@@ -441,10 +452,16 @@ private void sendEmptyQueryResponse() {
 	@Override
 	public void sendCommandComplete(String sql, Integer count) {
 		startMessage('C');
+		String tag = getCompletionTag(sql, count);
+		writeString(tag);
+		sendMessage();
+	}
+
+	public static String getCompletionTag(String sql, Integer count) {
 		String tag;
 		if (StringUtil.startsWithIgnoreCase(sql, "BEGIN") || StringUtil.startsWithIgnoreCase(sql, "START TRANSACTION")) {
 			tag = "BEGIN";
-		} else if (sql.indexOf(' ') == -1) {
+		} else if (sql.indexOf(' ') == -1 || sql.equals("CLOSE CURSOR")) {
 			//should already be a completion tag
 			tag = sql.toUpperCase();
 			if (count != null) {
@@ -457,22 +474,26 @@ public void sendCommandComplete(String sql, Integer count) {
 			if (tag.equals("EXEC") || tag.equals("CALL")) {
 				tag = "SELECT"; 
 			}
-			if (count != null) {
+			if (count != null && !(tag.equalsIgnoreCase("ROLLBACK") || tag.equalsIgnoreCase("SAVEPOINT") || tag.equalsIgnoreCase("RELEASE"))) {
 				tag += " " + count;
 			}
 		}
-		writeString(tag);
-		sendMessage();
+		return tag;
 	}
 
-	private void sendDataRow(ResultSet rs, List<PgColInfo> cols) throws SQLException, IOException {
+	private void sendDataRow(ResultSet rs, List<PgColInfo> cols, short[] resultColumnFormat) throws SQLException, IOException {
 		startMessage('D', -1);
 		int lengthIndex = this.dataOut.writerIndex() - 4;
 		writeShort(cols.size());
 		for (int i = 0; i < cols.size(); i++) {
 			int dataBytesIndex = this.dataOut.writerIndex();
 			writeInt(-1);
-			getContent(rs, cols.get(i), i+1);
+			if (!isBinary(cols.get(i).type)
+			        || (resultColumnFormat==null || (resultColumnFormat.length==1?resultColumnFormat[0]==0:resultColumnFormat[i]==0))) {
+	            getContent(rs, cols.get(i), i+1);
+			} else {
+                getBinaryContent(rs, cols.get(i), i+1);
+			}
 			writer.flush();
 			if (!rs.wasNull()) {
 				int bytes = this.dataOut.writerIndex() - dataBytesIndex - 4;
@@ -482,6 +503,63 @@ private void sendDataRow(ResultSet rs, List<PgColInfo> cols) throws SQLException
 		this.dataOut.setInt(lengthIndex, this.dataOut.writerIndex() - lengthIndex);
 	}
 	
+    private void getBinaryContent(ResultSet rs, PgColInfo col, int column) throws SQLException, TeiidSQLException, IOException {
+	    switch (col.type) {
+	    case PG_TYPE_INT2:
+	        short sval = rs.getShort(column);
+	        if (!rs.wasNull()) {
+	            dataOut.writeShort(sval);
+	        }
+	        break;
+        case PG_TYPE_INT4:
+            int ival = rs.getInt(column);
+            if (!rs.wasNull()) {
+                dataOut.writeInt(ival);
+            }
+            break;
+        case PG_TYPE_INT8:
+            long lval = rs.getLong(column);
+            if (!rs.wasNull()) {
+                dataOut.writeLong(lval);
+            }
+            break;
+        case PG_TYPE_FLOAT4:
+            float fval = rs.getFloat(column);
+            if (!rs.wasNull()) {
+                dataOut.writeInt(Float.floatToIntBits(fval));
+            }
+            break;
+        case PG_TYPE_FLOAT8:
+            double dval = rs.getDouble(column);
+            if (!rs.wasNull()) {
+                dataOut.writeLong(Double.doubleToLongBits(dval));
+            }
+            break;
+	    case PG_TYPE_BYTEA:
+	        Blob blob = rs.getBlob(column);
+            if (blob != null) {
+                try {
+                    byte[] bytes = ObjectConverterUtil.convertToByteArray(blob.getBinaryStream(), this.maxLobSize);
+                    write(bytes);
+                } catch(OutOfMemoryError e) {
+                    throw new StreamCorruptedException("data too big: " + e.getMessage()); //$NON-NLS-1$ 
+                }
+            }
+            break;
+	    case PG_TYPE_DATE:
+	        Date d = rs.getDate(column);
+	        if (d != null) {
+	            long millis = d.getTime();
+	            millis += TimestampWithTimezone.getCalendar().getTimeZone().getOffset(millis);
+	            long secs = TimestampUtils.toPgSecs(millis / 1000);
+	            dataOut.writeInt((int) (secs / 86400));
+	        }
+	        break;
+	    default:
+	        throw new AssertionError();
+	    }
+	}
+	
 	private void getContent(ResultSet rs, PgColInfo col, int column) throws SQLException, TeiidSQLException, IOException {
 		switch (col.type) {
 			case PG_TYPE_BOOL:
@@ -501,7 +579,15 @@ private void getContent(ResultSet rs, PgColInfo col, int column) throws SQLExcep
 			    	writer.write(value);
 		    	}
 		    	break;
-		    
+		    case PG_TYPE_GEOMETRY:
+		        Object val = rs.getObject(column);
+		        if (val != null) {
+	                Blob blob = GeometryUtils.geometryToEwkb((GeometryType)rs.unwrap(ResultSetImpl.class).getRawCurrentValue());
+                    String hexewkb = PropertiesUtils.toHex(blob.getBytes(1, (int) blob.length()));
+                    writer.write(hexewkb);
+		        }
+		        break;
+		    case PG_TYPE_XML:
 		    case PG_TYPE_TEXT:
 		    	Reader r = rs.getCharacterStream(column);
 		    	if (r != null) {
@@ -528,6 +614,16 @@ private void getContent(ResultSet rs, PgColInfo col, int column) throws SQLExcep
 		    case PG_TYPE_CHARARRAY:
 		    case PG_TYPE_TEXTARRAY:
 		    case PG_TYPE_OIDARRAY:
+		    case PG_TYPE_BOOLARRAY:
+		    case PG_TYPE_INT2ARRAY:
+		    case PG_TYPE_INT4ARRAY:
+		    case PG_TYPE_INT8ARRAY:
+		    case PG_TYPE_FLOAT4ARRAY:
+		    case PG_TYPE_FLOAT8ARRAY:
+		    case PG_TYPE_NUMERICARRAY:
+		    case PG_TYPE_DATEARRAY:
+		    case PG_TYPE_TIMEARRAY:
+		    case PG_TYPE_TIMESTAMP_NO_TMZONEARRAY:
 		    	{
 		    	Array obj = rs.getArray(column);
 		    	if (obj != null) {
@@ -580,7 +676,11 @@ private void getContent(ResultSet rs, PgColInfo col, int column) throws SQLExcep
 		    	break;
 		    	
 		    default:
-		    	throw new TeiidSQLException("unknown datatype failed to convert"); 
+		    	Object obj = rs.getObject(column);
+		    	if (obj != null) {
+		    		throw new TeiidSQLException("unknown datatype "+ col.type+ " failed to convert");
+		    	}
+		    	break;
 		}
 	}
 	
@@ -647,7 +747,21 @@ private void sendErrorResponse(Throwable t) {
 		sendMessage();
 	}
 	
-	private void sendRowDescription(List<PgColInfo> cols) {
+	boolean isBinary(int oid) {
+	    switch (oid) {
+	    case PG_TYPE_INT2:
+	    case PG_TYPE_INT4:
+	    case PG_TYPE_INT8:
+	    case PG_TYPE_FLOAT4:
+	    case PG_TYPE_FLOAT8:
+	    case PG_TYPE_BYTEA:
+	    case PG_TYPE_DATE:
+	        return true;
+	    }
+	    return false;
+	}
+	
+	private void sendRowDescription(List<PgColInfo> cols, short[] resultColumnFormat) {
 		if (cols == null) {
 			//send NoData
 			startMessage('n');
@@ -656,7 +770,8 @@ private void sendRowDescription(List<PgColInfo> cols) {
 		}
 		startMessage('T');
 		writeShort(cols.size());
-		for (PgColInfo info : cols) {
+		for (int i = 0; i < cols.size(); i++) {
+		    PgColInfo info = cols.get(i);
 			writeString(info.name);
 			// rel ID
 			writeInt(info.reloid);
@@ -668,8 +783,12 @@ private void sendRowDescription(List<PgColInfo> cols) {
 			writeShort(getTypeSize(info.type, info.precision));
 			// pg_attribute.atttypmod
 			writeInt(info.mod);
-			// text
-			writeShort(0);
+			if (!isBinary(info.type) || resultColumnFormat == null) {
+			    //text
+			    writeShort(0);
+			} else {
+                writeShort(resultColumnFormat[resultColumnFormat.length == 1?0:i]);
+			}
 		}
 		sendMessage();
 	}
@@ -829,7 +948,7 @@ private void startMessage(char newMessageType, int estimatedLength) {
 	}
 
 	private void initBuffer(int estimatedLength) {
-		this.dataOut = ChannelBuffers.dynamicBuffer(estimatedLength);
+		this.dataOut = ChannelBuffers.dynamicBuffer(ByteOrder.BIG_ENDIAN, estimatedLength);
 		ChannelBufferOutputStream cbos = new ChannelBufferOutputStream(this.dataOut);
 		this.writer = new OutputStreamWriter(cbos, this.encoding);
 	}
diff --git a/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java b/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
index 86a339b353..c5afded03c 100644
--- a/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
+++ b/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
@@ -218,6 +218,7 @@ private Object buildInitialize(NullTerminatedStringDataInputStream data, Channel
         String clientEncoding = props.getProperty("client_encoding", PgBackendProtocol.DEFAULT_ENCODING);
         props.setProperty("client_encoding", clientEncoding);
         props.setProperty("default_transaction_isolation", "read committed");
+        props.setProperty("integer_datetimes", "on");
         props.setProperty("DateStyle", "ISO");
         props.setProperty("TimeZone", Calendar.getInstance().getTimeZone().getDisplayName());
         this.odbcProxy.initialize(props);
@@ -273,11 +274,14 @@ private Object buildBind(NullTerminatedStringDataInputStream data) throws IOExce
         }
         
         int resultCodeCount = data.readShort();
-        int[] resultColumnFormat = new int[resultCodeCount];
-        for (int i = 0; i < resultCodeCount; i++) {
-            resultColumnFormat[i] = data.readShort();
+        short[] resultColumnFormat = null;
+        if (resultCodeCount != 0) {
+            resultColumnFormat = new short[resultCodeCount];
+            for (int i = 0; i < resultCodeCount; i++) {
+                resultColumnFormat[i] = data.readShort();
+            }
         }
-        this.odbcProxy.bindParameters(bindName, prepName, params, resultCodeCount, resultColumnFormat);
+        this.odbcProxy.bindParameters(bindName, prepName, params, resultCodeCount, resultColumnFormat, this.pgBackendProtocol.getEncoding());
         return message;
 	}	
 
diff --git a/runtime/src/main/java/org/teiid/transport/pg/TimestampUtils.java b/runtime/src/main/java/org/teiid/transport/pg/TimestampUtils.java
new file mode 100644
index 0000000000..e246601f9c
--- /dev/null
+++ b/runtime/src/main/java/org/teiid/transport/pg/TimestampUtils.java
@@ -0,0 +1,97 @@
+/*-------------------------------------------------------------------------
+*
+* Copyright (c) 2003-2011, PostgreSQL Global Development Group
+*
+*
+*-------------------------------------------------------------------------
+*/
+package org.teiid.transport.pg;
+
+import java.sql.Date;
+import java.util.TimeZone;
+
+/**
+ * Slimmed down from org.postgresql.jdbc2.TimestampUtils
+ */
+public class TimestampUtils {
+
+    public static final long DATE_POSITIVE_INFINITY = 9223372036825200000l;
+    public static final long DATE_NEGATIVE_INFINITY = -9223372036832400000l;
+    public static final long DATE_POSITIVE_SMALLER_INFINITY = 185543533774800000l;
+    public static final long DATE_NEGATIVE_SMALLER_INFINITY = -185543533774800000l;
+
+    /**
+     * Returns the SQL Date object matching the given bytes with
+     * {@link Oid#DATE}.
+     * 
+     * @param tz The timezone used.
+     * @param bytes The binary encoded date value.
+     * @return The parsed date object.
+     */
+    public static Date toDate(TimeZone tz, int days) {
+        long secs = toJavaSecs(days * 86400L);
+        long millis = secs * 1000L;
+        int offset = tz.getOffset(millis);
+        if (millis <= DATE_NEGATIVE_SMALLER_INFINITY) {
+            millis = DATE_NEGATIVE_INFINITY;
+            offset = 0;
+        } else if (millis >= DATE_POSITIVE_SMALLER_INFINITY) {
+            millis = DATE_POSITIVE_INFINITY;
+            offset = 0;
+        } 
+        return new Date(millis - offset);
+    }
+
+    /**
+     * Converts the given postgresql seconds to java seconds.
+     * Reverse engineered by inserting varying dates to postgresql
+     * and tuning the formula until the java dates matched.
+     * See {@link #toPgSecs} for the reverse operation.
+     * 
+     * @param secs Postgresql seconds.
+     * @return Java seconds.
+     */
+    private static long toJavaSecs(long secs) {
+        // postgres epoc to java epoc
+        secs += 946684800L;
+    
+        // Julian/Gregorian calendar cutoff point
+        if (secs < -12219292800L) { // October 4, 1582 -> October 15, 1582
+            secs += 86400 * 10;
+            if (secs < -14825808000L) { // 1500-02-28 -> 1500-03-01
+                int extraLeaps = (int) ((secs + 14825808000L) / 3155760000L);
+                extraLeaps--;
+                extraLeaps -= extraLeaps / 4;
+                secs += extraLeaps * 86400L;
+            }
+        }
+        return secs;
+    }
+
+    /**
+     * Converts the given java seconds to postgresql seconds.
+     * See {@link #toJavaSecs} for the reverse operation.
+     * The conversion is valid for any year 100 BC onwards.
+     * 
+     * @param secs Postgresql seconds.
+     * @return Java seconds.
+     */
+     public static long toPgSecs(long secs) {
+        // java epoc to postgres epoc
+        secs -= 946684800L;
+
+        // Julian/Greagorian calendar cutoff point
+        if (secs < -13165977600L) { // October 15, 1582 -> October 4, 1582
+            secs -= 86400 * 10;
+            if (secs < -15773356800L) { // 1500-03-01 -> 1500-02-28
+                int years = (int) ((secs + 15773356800L) / -3155823050L);
+                years++;
+                years -= years/4;
+                secs += years * 86400;
+            }
+        }
+        
+        return secs;
+    }
+
+}
diff --git a/runtime/src/test/java/org/teiid/odbc/TestScriptReader.java b/runtime/src/test/java/org/teiid/odbc/TestScriptReader.java
index 7076837c3d..673c63a5c1 100644
--- a/runtime/src/test/java/org/teiid/odbc/TestScriptReader.java
+++ b/runtime/src/test/java/org/teiid/odbc/TestScriptReader.java
@@ -75,9 +75,9 @@ public class TestScriptReader {
 	
 	@Test public void testRegClassCast() throws Exception {
 		ScriptReader sr = new ScriptReader("where oid='\"a\"'::regclass");
-		sr.setRewrite(true);;
+		sr.setRewrite(true);
 		String result = sr.readStatement();
-		assertEquals("where oid=(SELECT oid FROM pg_class WHERE upper(relname) = 'A')", result);
+		assertEquals("where oid=regclass('\"a\"')", result);
 	}
 	
 	@Test public void testExtraDelim() throws Exception {
diff --git a/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java b/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
index 1fb5526247..16932c3aeb 100644
--- a/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
+++ b/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
@@ -128,10 +128,10 @@ private MetadataFactory createMetadataFactory(String schema, Properties importPr
     	
     	Properties importProperties = new Properties();
     	importProperties.setProperty("importer.importProcedures", Boolean.TRUE.toString());
-    	importProperties.setProperty("importer.excludeTables", "VDB\\.SYS.*");
+    	importProperties.setProperty("importer.excludeTables", "VDB\\.(SYS|pg_catalog).*");
     	importProperties.setProperty("importer.excludeProcedures", "VDB\\..*");
     	MetadataFactory mf = getMetadata(importProperties, conn);
-    	assertEquals(String.valueOf(mf.asMetadataStore().getSchemas().get("TEST").getTables()), 17, mf.asMetadataStore().getSchemas().get("TEST").getTables().size());
+    	assertEquals(String.valueOf(mf.asMetadataStore().getSchemas().get("TEST").getTables()), 3, mf.asMetadataStore().getSchemas().get("TEST").getTables().size());
     	assertEquals(0, mf.asMetadataStore().getSchemas().get("TEST").getProcedures().size());
     }
         
diff --git a/test-integration/common/src/test/java/org/teiid/jdbc/TestInternalConnection.java b/test-integration/common/src/test/java/org/teiid/jdbc/TestInternalConnection.java
index 531778773a..50068c850f 100644
--- a/test-integration/common/src/test/java/org/teiid/jdbc/TestInternalConnection.java
+++ b/test-integration/common/src/test/java/org/teiid/jdbc/TestInternalConnection.java
@@ -28,6 +28,7 @@
 import java.net.InetSocketAddress;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
@@ -157,9 +158,14 @@ public static String doSomething(CommandContext cc, Integer val) throws SQLExcep
 		try {
 			TeiidDriver driver = es.getDriver();
 			conn = driver.connect("jdbc:teiid:test", null);
-			ResultSet rs = conn.createStatement().executeQuery("select func(2)");
+			//execute multiple to check for an id conflict
+			ResultSet rs = conn.createStatement().executeQuery("select func(2) union all select func(3)");
 			rs.next();
 			assertEquals("anonymous@teiid-securityHELLO WORLD2", rs.getString(1));
+			rs.next();
+	        assertEquals("anonymous@teiid-securityHELLO WORLD3", rs.getString(1));
+	        ResultSetMetaData metadata = rs.getMetaData();
+	        assertNotNull(metadata.getColumnName(1));
 		} finally {
 			if (conn != null) {
 				conn.close();
diff --git a/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java b/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
index ed28082c09..e07bf08987 100644
--- a/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
+++ b/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
@@ -49,6 +49,7 @@
 import org.teiid.core.CoreConstants;
 import org.teiid.core.util.ApplicationInfo;
 import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.core.util.PropertiesUtils;
 import org.teiid.core.util.UnitTestUtil;
 import org.teiid.jdbc.util.ResultSetUtil;
 
@@ -58,7 +59,7 @@
 @SuppressWarnings("nls")
 public class TestMMDatabaseMetaData {
     
-    private static final boolean REPLACE_EXPECTED = false;
+    private static final boolean REPLACE_EXPECTED = PropertiesUtils.getBooleanProperty(System.getProperties(), "replace_expected", false);
     private static final boolean WRITE_ACTUAL_RESULTS_TO_FILE = false;
     private static final boolean PRINT_RESULTSETS_TO_CONSOLE = false;
     
diff --git a/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java b/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java
index 7abcb3122a..27d96e4df0 100644
--- a/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java
+++ b/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java
@@ -45,6 +45,7 @@ public TestODBCSchema() {
     	if (this.internalConnection != null) {
     		this.internalConnection.close();
     	}
+    	server.undeployVDB("x");
     }
    
 	@Test public void test_PG_AM() throws Exception {
@@ -168,5 +169,37 @@ public boolean isSourceRequired() {
 			server.undeployVDB("dup");
 		}
 	}
+
+	@Test public void testTypes() throws Exception {
+		ModelMetaData mmd = new ModelMetaData();
+		mmd.setName("x");
+		mmd.setModelType(Type.VIRTUAL);
+		mmd.addSourceMetadata("ddl", "create view v as select null, cast(null as xml), cast(null as boolean), cast(null as byte), cast(null as short), cast(null as integer), cast(null as long),"
+				+ " cast(null as float), cast(null as double), cast(null as bigdecimal), cast(null as biginteger), cast(null as time), cast(null as date), cast(null as timestamp), cast(null as varbinary), "
+				+ " cast(null as char), cast(null as string), cast(null as clob), cast(null as blob), "
+				+ " cast(null as xml[]), cast(null as boolean[]), cast(null as byte[]), cast(null as short[]), cast(null as integer[]), cast(null as long[]), cast(null as bigdecimal[]), cast(null as biginteger[]), "
+				+ " cast(null as float[]), cast(null as double[]), cast(null as time[]), cast(null as date[]), cast(null as timestamp[]), cast(null as varbinary[]), "
+				+ " cast(null as char[]), cast(null as string[]), cast(null as clob[]), cast(null as blob[])");
+		server.deployVDB("x", mmd);
+		
+		this.internalConnection.close();
+		this.internalConnection = server.createConnection("jdbc:teiid:x"); //$NON-NLS-1$ //$NON-NLS-2$
+		
+		execute("select count(oid) = count(distinct oid) from pg_attribute"); //$NON-NLS-1$
+	    this.internalResultSet.next();
+	    assertTrue(this.internalResultSet.getBoolean(1));
+		
+		execute("select oid from pg_class where relname = 'v'"); //$NON-NLS-1$
+        this.internalResultSet.next();
+        int val = this.internalResultSet.getInt(1);
+        
+        String sql = "select n.nspname, c.relname, a.attname, a.atttypid, t.typname, a.attnum, a.attlen, a.atttypmod, a.attnotnull, c.relhasrules, c.relkind, c.oid, pg_get_expr(d.adbin, d.adrelid), case t.typtype when 'd' then t.typbasetype else 0 end, t.typtypmod, c.relhasoids "
+		+ "from (((pg_catalog.pg_class c inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace and "
+		+ "c.oid = ?) inner join pg_catalog.pg_attribute a on (not a.attisdropped) and a.attnum > 0 and a.attrelid = c.oid) inner join pg_catalog.pg_type t on t.oid = a.atttypid) left outer join pg_attrdef d on a.atthasdef and d.adrelid = a.attrelid and d.adnum = a.attnum order by n.nspname, c.relname, attnum";	    
+		
+        execute(sql, new Object[] {val});
+        
+		TestMMDatabaseMetaData.compareResultSet(this.internalResultSet);
+	}
 	
 }
diff --git a/test-integration/common/src/test/java/org/teiid/systemmodel/TestPGMetadata.java b/test-integration/common/src/test/java/org/teiid/systemmodel/TestPGMetadata.java
index b054112b74..a08c9d87e6 100644
--- a/test-integration/common/src/test/java/org/teiid/systemmodel/TestPGMetadata.java
+++ b/test-integration/common/src/test/java/org/teiid/systemmodel/TestPGMetadata.java
@@ -28,12 +28,10 @@
 import org.teiid.adminapi.Model.Type;
 import org.teiid.adminapi.impl.ModelMetaData;
 import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.deployers.VirtualDatabaseException;
-import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository.ConnectorManagerException;
 import org.teiid.jdbc.AbstractMMQueryTestCase;
 import org.teiid.jdbc.FakeServer;
-import org.teiid.translator.TranslatorException;
 
+@SuppressWarnings("nls")
 public class TestPGMetadata extends AbstractMMQueryTestCase {
     static FakeServer server = null;
     
@@ -47,9 +45,7 @@ public static void teardown() {
             server.stop();
     }
 
-    private static VDBMetaData buildVDB(String name)
-            throws ConnectorManagerException, VirtualDatabaseException,
-            TranslatorException {
+    private static VDBMetaData buildVDB(String name) {
         VDBMetaData vdb = new VDBMetaData();
         vdb.setName(name);        
         ModelMetaData mmd = new ModelMetaData();
@@ -78,21 +74,28 @@ public void test_PG_Metadata_ON() throws Exception {
         vdb.addProperty("include-pg-metadata", "true");
         server.deployVDB(vdb);
         this.internalConnection = server.createConnection("jdbc:teiid:y"); //$NON-NLS-1$ //$NON-NLS-2$
-        try {
-            execute("select * FROM pg_am"); //$NON-NLS-1$          
-        } catch (Exception e) {
-            Assert.fail("there should be PG metadata");
-        }
+        execute("select * FROM pg_am"); //$NON-NLS-1$          
     }
     @Test 
     public void test_PG_Metadata_DEFAULT() throws Exception {
         VDBMetaData vdb = buildVDB("z");
         server.deployVDB(vdb);
         this.internalConnection = server.createConnection("jdbc:teiid:z"); //$NON-NLS-1$ //$NON-NLS-2$
-        try {
-            execute("select * FROM pg_am"); //$NON-NLS-1$          
-        } catch (Exception e) {
-            Assert.fail("there should be PG metadata");
-        }
+        execute("select * FROM pg_am"); //$NON-NLS-1$          
     }    
+    
+    @Test public void testTypes() throws Exception {
+        VDBMetaData vdb = buildVDB("t");
+        server.deployVDB(vdb);
+        this.internalConnection = server.createConnection("jdbc:teiid:t"); //$NON-NLS-1$ //$NON-NLS-2$
+        execute("select format_type((select oid from pg_type where typname = '_int2'), 0)"); //$NON-NLS-1$
+        assertResults(new String[] {"expr1[string]", "smallint[]"});
+        
+        execute("select format_type((select oid from pg_type where typname = 'float4'), 0)"); //$NON-NLS-1$
+        assertResults(new String[] {"expr1[string]", "real"});
+        
+        execute("select format_type((select oid from pg_type where typname = 'numeric'), 100)"); //$NON-NLS-1$
+        assertResults(new String[] {"expr1[string]", "numeric(0,96)"});
+    }
+    
 }
diff --git a/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java b/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
index 92e9293d68..58cbad1596 100644
--- a/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
+++ b/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
@@ -55,10 +55,12 @@
 import org.postgresql.core.v3.ExtendedQueryExectutorImpl;
 import org.teiid.adminapi.Model.Type;
 import org.teiid.adminapi.impl.ModelMetaData;
+import org.teiid.adminapi.impl.SessionMetadata;
 import org.teiid.adminapi.impl.VDBMetaData;
 import org.teiid.common.buffer.BufferManagerFactory;
 import org.teiid.core.util.ObjectConverterUtil;
 import org.teiid.core.util.UnitTestUtil;
+import org.teiid.deployers.PgCatalogMetadataStore;
 import org.teiid.jdbc.FakeServer;
 import org.teiid.jdbc.TestMMDatabaseMetaData;
 import org.teiid.net.socket.SocketUtil;
@@ -644,6 +646,7 @@ private void connect(String database) throws SQLException {
 		Statement s = conn.createStatement();
 		ResultSet rs = s.executeQuery("select '2011-01-01'::date");
 		rs.next();
+		assertEquals("2011-01-01", rs.getString(1));
 	}
 	
 	/**
@@ -751,13 +754,62 @@ private void connect(String database) throws SQLException {
 		assertEquals(1, odbcServer.server.getDqp().getRequests().size());
 	}
 	
-	@Test public void testSomething() throws Exception {
+	@Test public void testExportedKey() throws Exception {
 		String sql = ObjectConverterUtil.convertFileToString(UnitTestUtil.getTestDataFile("exported-fk-query.txt"));
 		
 		Statement s = conn.createStatement();
 		s.execute(sql);
 		ResultSet rs = s.getResultSet();
 		assertTrue(rs.next());
+		assertEquals("STATUS_ID", rs.getString(4));
+		assertFalse(rs.next());
 	}
+	
+	@Test public void testRegClass() throws Exception {
+        Statement s = conn.createStatement();
+        ResultSet rs = s.executeQuery("select '\"pg_catalog.pg_class\"'::regclass");
+        rs.next();
+        int oid = rs.getInt(1);
+        rs = s.executeQuery("select oid from pg_class where relname='pg_class'");
+        rs.next();
+        int oid1 = rs.getInt(1);
+        assertEquals(oid, oid1);
+    }
+	
+    @Test public void testGeometry() throws Exception {
+        Statement s = conn.createStatement();
+        s.execute("SELECT ST_GeomFromText('POLYGON ((40 0, 50 50, 0 50, 0 0, 40 0))')");
+        ResultSet rs = s.getResultSet();
+        rs.next();
+        ResultSetMetaData rsmd = rs.getMetaData();
+        assertEquals("geometry", rsmd.getColumnTypeName(1));
+        assertEquals("00200000030000000000000001000000054044000000000000000000000000000040490000000000004049000000000000000000000000000040490000000000000000000000000000000000000000000040440000000000000000000000000000", rs.getString(1));
+    }
+    
+    @Test public void testConstraintDef() throws Exception {
+        Statement s = conn.createStatement();
+        s.execute("SELECT pg_get_constraintdef((select oid from pg_constraint where contype = 'f' and conrelid = (select oid from pg_class where relname = 'Functions')), true)");
+        ResultSet rs = s.getResultSet();
+        rs.next();
+        assertEquals("FOREIGN KEY (VDBName,SchemaName) REFERENCES SYS.Schemas(VDBName,Name)", rs.getString(1));
+    }
+    
+    @Test public void testXML() throws Exception {
+        Statement s = conn.createStatement();
+        s.execute("SELECT xmlelement(name x)");
+        ResultSet rs = s.getResultSet();
+        rs.next();
+        ResultSetMetaData rsmd = rs.getMetaData();
+        assertEquals("xml", rsmd.getColumnTypeName(1));
+        assertEquals("<x></x>", rs.getString(1));
+    }
+    
+    @Test public void testVersion() throws Exception {
+        Statement s = conn.createStatement();
+        s.execute("SELECT version()");
+        ResultSet rs = s.getResultSet();
+        rs.next();
+        assertEquals(PgCatalogMetadataStore.POSTGRESQL_VERSION, rs.getString(1));
+    }
 
 }
diff --git a/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected b/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
index 8d879dd59d..c79b328e1c 100644
--- a/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
+++ b/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
@@ -21,24 +21,29 @@ test                                                               SYSADMIN
 test                                                               SYSADMIN                                                           Usage                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 test                                                               SYSADMIN                                                           VDBResources                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 test                                                               SYSADMIN                                                           Views                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
+test                                                               pg_catalog                                                         geography_columns                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         matpg_datatype                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         matpg_relatt                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_am                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_attrdef                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_attribute                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_class                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+test                                                               pg_catalog                                                         pg_constraint                                                      SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_database                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_description                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_index                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+test                                                               pg_catalog                                                         pg_inherits                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_namespace                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+test                                                               pg_catalog                                                         pg_prepared_xacts                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_proc                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+test                                                               pg_catalog                                                         pg_stats                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_trigger                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_type                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               pg_catalog                                                         pg_user                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               test                                                               all_databases                                                      TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               test                                                               all_models                                                         TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 test                                                               test                                                               all_tables                                                         TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
-Row Count : 38
+Row Count : 43
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName                    12             test            java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 SchemaName                 12             test            java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected b/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
index f87d2d58ae..ebcbab34b3 100644
--- a/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
+++ b/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
@@ -2,9 +2,9 @@ string                                                             string
 VDBName                                                            SchemaName                                                         Name                                                               Type                  NameInSource                                                       IsPhysical  SupportsUpdates  UID                                                 Cardinality  Description                                                        IsSystem  IsMaterialized  OID        
 parts                                                              SYS                                                                Columns                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-9bd42fbd-00000001                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6130d2cf-00000024                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                FunctionParams                                                     Table                 <null>                                                             true        false            tid:2cb59cfd55db-7c45e39e-00000077                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Functions                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6f11277b-0000008a                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                GEOMETRY_COLUMNS                                                   Table                 <null>                                                             false       false            tid:2cb59cfd55db-e1a630f0-000000d5                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                FunctionParams                                                     Table                 <null>                                                             true        false            tid:2cb59cfd55db-7c45e39e-00000079                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Functions                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6f11277b-0000008c                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                GEOMETRY_COLUMNS                                                   Table                 <null>                                                             false       false            tid:2cb59cfd55db-e1a630f0-000000d8                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-c5c6549e-0000003a                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYS                                                                Keys                                                               Table                 <null>                                                             true        false            tid:2cb59cfd55db-0023a214-00000048                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            tid:60b87e792634-14d6450e-0000000e                  -1           <null>                                                             true      false           <null>     
@@ -13,34 +13,39 @@ parts                                                              PartsSupplier
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               Table                 STATUS                                                             true        true             mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         3            <null>                                                             false     false           <null>     
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             Table                 SUPPLIER                                                           true        true             mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           <null>     
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       Table                 SUPPLIER_PARTS                                                     true        true             mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         227          <null>                                                             false     false           <null>     
-parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-00000057                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000006b                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000095                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000009c                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-000000ab                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-00000059                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000006d                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000097                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000009e                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-000000ae                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           StoredProcedures                                                   Table                 <null>                                                             true        false            tid:60b87e792634-c0d02c23-00000030                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-000000b5                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-000000b8                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           Triggers                                                           Table                 <null>                                                             true        false            tid:60b87e792634-5d71c5db-0000001d                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           Usage                                                              Table                 <null>                                                             true        false            tid:60b87e792634-04e38d81-00000001                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            tid:60b87e792634-1e9b1131-00000019                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           Views                                                              Table                 <null>                                                             true        false            tid:60b87e792634-04ed2a4e-00000028                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-000000c6                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-0000006b                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-00000061                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-00000034                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_attrdef                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-ec00662c-0000004d                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_attribute                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-edc4ea54-0000000f                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_class                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-62e78530-00000004                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_database                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-dda8fac3-00000052                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_description                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-3be1b5b4-00000073                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_index                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-633d048a-00000028                  -1           <null>                                                             true      true            <null>     
+parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-000000c9                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         geography_columns                                                  Table                 <null>                                                             false       false            tid:7ff2755e9621-a5547a1a-0000008d                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-00000071                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-00000067                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-0000003a                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_attrdef                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-ec00662c-00000053                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_attribute                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-edc4ea54-00000013                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_class                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-62e78530-00000005                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_constraint                                                      Table                 <null>                                                             false       false            tid:7ff2755e9621-a751cd25-00000095                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_database                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-dda8fac3-00000058                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_description                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-3be1b5b4-0000007b                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_index                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-633d048a-0000002e                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_inherits                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-80857820-00000085                  -1           <null>                                                             true      false           <null>     
 parts                                                              pg_catalog                                                         pg_namespace                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-37a09513-00000001                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_proc                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ec709e-00000037                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_trigger                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-d50d2370-00000043                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_type                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ee5c82-0000001b                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-0000005c                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                spatial_ref_sys                                                    Table                 <null>                                                             false       false            tid:2cb59cfd55db-067724e6-000000ce                  -1           <null>                                                             true      true            <null>     
-Row Count : 40
+parts                                                              pg_catalog                                                         pg_prepared_xacts                                                  Table                 <null>                                                             false       false            tid:7ff2755e9621-7deb875f-00000080                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_proc                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ec709e-0000003d                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_stats                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-63cca057-00000089                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_trigger                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-d50d2370-00000049                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_type                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ee5c82-0000001f                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-00000062                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                spatial_ref_sys                                                    Table                 <null>                                                             false       false            tid:2cb59cfd55db-067724e6-000000d1                  -1           <null>                                                             true      true            <null>     
+Row Count : 45
 getColumnName    getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName          12             parts           java.lang.String    VDBName          string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 SchemaName       12             parts           java.lang.String    SchemaName       string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
index 0aba606518..8774ad3399 100644
--- a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
+++ b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
@@ -237,74 +237,74 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                GEOMETRY_COLUMNS                                                   COORD_DIMENSION                                                    4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                GEOMETRY_COLUMNS                                                   SRID                                                               4            integer                                                            10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                GEOMETRY_COLUMNS                                                   TYPE                                                               12           string                                                             30           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              StringKey                                                          12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              StringKey                                                          12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              IntNum                                                             4            integer                                                            22           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              StringKey                                                          12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              IntNum                                                             4            integer                                                            22           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              StringNum                                                          12           string                                                             10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              IntNum                                                             4            integer                                                            22           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              StringNum                                                          12           string                                                             10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              FloatNum                                                           7            float                                                              20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              StringNum                                                          12           string                                                             10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              FloatNum                                                           7            float                                                              20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              LongNum                                                            -5           long                                                               28           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              FloatNum                                                           7            float                                                              20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              LongNum                                                            -5           long                                                               28           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              DoubleNum                                                          8            double                                                             20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              LongNum                                                            -5           long                                                               28           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              DoubleNum                                                          8            double                                                             20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              ByteNum                                                            -6           byte                                                               8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              DoubleNum                                                          8            double                                                             20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              ByteNum                                                            -6           byte                                                               8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              DateValue                                                          91           date                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              ByteNum                                                            -6           byte                                                               8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              DateValue                                                          91           date                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              TimeValue                                                          92           time                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              DateValue                                                          91           date                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              TimeValue                                                          92           time                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              TimestampValue                                                     93           timestamp                                                          7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              TimeValue                                                          92           time                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              TimestampValue                                                     93           timestamp                                                          7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              BooleanValue                                                       -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              TimestampValue                                                     93           timestamp                                                          7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              BooleanValue                                                       -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              CharValue                                                          1            char                                                               1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              BooleanValue                                                       -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              CharValue                                                          1            char                                                               1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              CharValue                                                          1            char                                                               1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeA                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeA                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeA                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              StringKey                                                          12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              StringKey                                                          12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              IntNum                                                             4            integer                                                            22           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              StringKey                                                          12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              IntNum                                                             4            integer                                                            22           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              StringNum                                                          12           string                                                             10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              IntNum                                                             4            integer                                                            22           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              StringNum                                                          12           string                                                             10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              FloatNum                                                           7            float                                                              20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              StringNum                                                          12           string                                                             10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              FloatNum                                                           7            float                                                              20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              LongNum                                                            -5           long                                                               28           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              FloatNum                                                           7            float                                                              20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              LongNum                                                            -5           long                                                               28           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              DoubleNum                                                          8            double                                                             20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              LongNum                                                            -5           long                                                               28           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              DoubleNum                                                          8            double                                                             20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              ByteNum                                                            -6           byte                                                               8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              DoubleNum                                                          8            double                                                             20           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              ByteNum                                                            -6           byte                                                               8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              DateValue                                                          91           date                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              ByteNum                                                            -6           byte                                                               8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              DateValue                                                          91           date                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              TimeValue                                                          92           time                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              DateValue                                                          91           date                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              TimeValue                                                          92           time                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              TimestampValue                                                     93           timestamp                                                          7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              TimeValue                                                          92           time                                                               7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              TimestampValue                                                     93           timestamp                                                          7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              BooleanValue                                                       -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              TimestampValue                                                     93           timestamp                                                          7            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             7                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              BooleanValue                                                       -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              CharValue                                                          1            char                                                               1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              BooleanValue                                                       -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              CharValue                                                          1            char                                                               1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              CharValue                                                          1            char                                                               1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT1                                                               HugeB                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               HugeB                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT1                                                               HugeB                                                              ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         VDBName                                                            12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         SchemaName                                                         12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                KeyColumns                                                         TableName                                                          12           string                                                             2048         <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -325,7 +325,9 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                Keys                                                               IsIndexed                                                          -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                Keys                                                               RefKeyUID                                                          12           string                                                             50           <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                Keys                                                               UID                                                                12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          SYS                                                                Keys                                                               OID                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               TableUID                                                           12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               RefTableUID                                                        12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                Keys                                                               ColPositions                                                       2003         short[]                                                            2            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               LargeA                                                             IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               LargeA                                                             IntKey                                                             4            integer                                                            22           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               LargeA                                                             StringKey                                                          12           string                                                             10           <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             10                 2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -514,6 +516,7 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          SYS                                                                ReferenceKeyColumns                                                FK_UID                                                             12           string                                                             50           <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                Schemas                                                            VDBName                                                            12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                Schemas                                                            Name                                                               12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYS                                                                Schemas                                                            IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -583,12 +586,12 @@ QT_Ora9DS                                                          BQT1
 QT_Ora9DS                                                          BQT2                                                               SmallB                                                             CharValue                                                          1            char                                                               1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             1                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               SmallB                                                             ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT2                                                               SmallB                                                             ShortValue                                                         5            short                                                              8            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT2                                                               SmallB                                                             BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               SmallB                                                             BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT2                                                               SmallB                                                             BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT2                                                               SmallB                                                             BigIntegerValue                                                    2            biginteger                                                         19           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             28                 15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               SmallB                                                             BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          BQT2                                                               SmallB                                                             ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT2                                                               SmallB                                                             BigDecimalValue                                                    2            bigdecimal                                                         32767        <null>                                                             16383           10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             126                16                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          BQT1                                                               SmallB                                                             ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          BQT2                                                               SmallB                                                             ObjectValue                                                        2000         object                                                             2048         <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             2048               17                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYSADMIN                                                           StoredProcedures                                                   VDBName                                                            12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYSADMIN                                                           StoredProcedures                                                   SchemaName                                                         12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          SYSADMIN                                                           StoredProcedures                                                   Name                                                               12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -790,6 +793,13 @@ QT_Ora9DS                                                          XQTDoc
 QT_Ora9DS                                                          XQTDoc                                                             fixedValueTestDocument                                             fixedValueTest.wrapper.fixed                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTDoc                                                             fixedValueTestDocument                                             fixedValueTest.wrapper.@fixedAttr                                  12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTDoc                                                             fixedValueTestDocument.MappingClasses.wrapper                      key                                                                2            biginteger                                                         19           <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  f_table_catalog                                                    12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  f_table_schema                                                     12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  f_table_name                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  f_geography_column                                                 12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  coord_dimension                                                    4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  srid                                                               4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  type                                                               12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTRecursiveDoc                                                    groupDocument                                                      group                                                              12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTRecursiveDoc                                                    groupDocument                                                      group.pseudoID                                                     12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          XQTRecursiveDoc                                                    groupDocument                                                      group.GroupB                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  0                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -822,8 +832,10 @@ QT_Ora9DS                                                          XQTRecursiveD
 QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     typname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     name                                                               12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     uid                                                                12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     typlen                                                             5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     typlen                                                             5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     typtype                                                            1            char                                                               1            <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     typbasetype                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     typtypmod                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         matpg_relatt                                                       attrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         matpg_relatt                                                       attnum                                                             5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         matpg_relatt                                                       attname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -868,11 +880,21 @@ QT_Ora9DS                                                          pg_catalog
 QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relnamespace                                                       4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relkind                                                            1            char                                                               1            <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relam                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           reltuples                                                          7            float                                                              7            <null>                                                             3               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relpages                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relhasrules                                                        -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relhasoids                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relowner                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relam                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           reltuples                                                          7            float                                                              7            <null>                                                             3               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relpages                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relhasrules                                                        -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relhasoids                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           relnspname                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           reloptions                                                         2003         string[]                                                           4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      conname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      contype                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      consrc                                                             12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      conrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      confrelid                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      conkey                                                             2003         short[]                                                            2            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_database                                                        oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_database                                                        datname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_database                                                        encoding                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -896,8 +918,16 @@ QT_Ora9DS                                                          pg_catalog
 QT_Ora9DS                                                          pg_catalog                                                         pg_index                                                           indkey                                                             2003         short[]                                                            4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_index                                                           indexprs                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_index                                                           indpred                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_inherits                                                        inhrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_inherits                                                        inhparent                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_inherits                                                        inhseqno                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_namespace                                                       oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_namespace                                                       nspname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_namespace                                                       nspowner                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_prepared_xacts                                                  transaction                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_prepared_xacts                                                  gid                                                                12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_prepared_xacts                                                  owner                                                              12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_prepared_xacts                                                  database                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            proname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            proretset                                                          -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -908,6 +938,9 @@ QT_Ora9DS                                                          pg_catalog
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            proargmodes                                                        2003         char[]                                                             2147483647   <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            proallargtypes                                                     2003         integer[]                                                          2147483647   <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            pronamespace                                                       4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_stats                                                           schemaname                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_stats                                                           tablename                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_stats                                                           attname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_trigger                                                         oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_trigger                                                         tgconstrrelid                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_trigger                                                         tgfoid                                                             4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -929,6 +962,8 @@ QT_Ora9DS                                                          pg_catalog
 QT_Ora9DS                                                          pg_catalog                                                         pg_type                                                            typrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_type                                                            typelem                                                            4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_type                                                            typinput                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_type                                                            typdefault                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+QT_Ora9DS                                                          pg_catalog                                                         pg_type                                                            teiid_name                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_user                                                            oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_user                                                            usename                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 QT_Ora9DS                                                          pg_catalog                                                         pg_user                                                            usecreatedb                                                        -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -1157,7 +1192,7 @@ QT_Ora9DS                                                          XQT
 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                                                         32767        <null>                                                             16383           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 : 1157
+Row Count : 1192
 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            true             false       false                 0           true        true          false     false       
 SchemaName        12             QT_Ora9DS       java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
index b80c555ec1..1c496f53a8 100644
--- a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
+++ b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
@@ -2039,13 +2039,13 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                monthname                                                          date                                                               1            91           date                       10           4            0       0            1            Month name for date                                                <null>                                                             1                 YES                                                                tsid:fffffffb2b96ffe-00000157                     
 QT_Ora9DS                                                          SYS                                                                monthname                                                          result                                                             4            12           string                     4000         4000         0       0            1            Month name for timestamp                                           <null>                                                             0                 YES                                                                tsid:fffffffb2b96ffe-0000015a                     
 QT_Ora9DS                                                          SYS                                                                monthname                                                          timestamp                                                          1            93           timestamp                  29           12           0       0            1            Month name for timestamp                                           <null>                                                             1                 YES                                                                tsid:fffffffb2b96ffe-0000015a                     
-QT_Ora9DS                                                          SYS                                                                mvstatus                                                           result                                                             4            4            integer                    10           4            0       10           1            true if the view is valid to use                                   <null>                                                             0                 YES                                                                tsid:000000067f44dce-00000de9                     
-QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param1                                                             1            12           string                     4000         4000         0       0            1            Schema Name                                                        <null>                                                             1                 YES                                                                tsid:000000067f44dce-00000de9                     
-QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param2                                                             1            12           string                     4000         4000         0       0            1            View Name                                                          <null>                                                             2                 YES                                                                tsid:000000067f44dce-00000de9                     
-QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param3                                                             1            -7           boolean                    1            1            0       10           1            Current validity of matview table contents                         <null>                                                             3                 YES                                                                tsid:000000067f44dce-00000de9                     
-QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param4                                                             1            12           string                     4000         4000         0       0            1            Current load status of matview table.                              <null>                                                             4                 YES                                                                tsid:000000067f44dce-00000de9                     
-QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param5                                                             1            12           string                     4000         4000         0       0            1            Action to be taken by the Teiid when status is not valid           <null>                                                             5                 YES                                                                tsid:000000067f44dce-00000de9                     
-QT_Ora9DS                                                          SYS                                                                node_id                                                            result                                                             4            2000         object                     2147483647   2147483647   0       0            1            Returns the node id                                                <null>                                                             0                 YES                                                                tsid:00000007e2eff6b-00000df0                     
+QT_Ora9DS                                                          SYS                                                                mvstatus                                                           result                                                             4            4            integer                    10           4            0       10           1            true if the view is valid to use                                   <null>                                                             0                 YES                                                                tsid:000000067f44dce-00000dfe                     
+QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param1                                                             1            12           string                     4000         4000         0       0            1            Schema Name                                                        <null>                                                             1                 YES                                                                tsid:000000067f44dce-00000dfe                     
+QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param2                                                             1            12           string                     4000         4000         0       0            1            View Name                                                          <null>                                                             2                 YES                                                                tsid:000000067f44dce-00000dfe                     
+QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param3                                                             1            -7           boolean                    1            1            0       10           1            Current validity of matview table contents                         <null>                                                             3                 YES                                                                tsid:000000067f44dce-00000dfe                     
+QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param4                                                             1            12           string                     4000         4000         0       0            1            Current load status of matview table.                              <null>                                                             4                 YES                                                                tsid:000000067f44dce-00000dfe                     
+QT_Ora9DS                                                          SYS                                                                mvstatus                                                           param5                                                             1            12           string                     4000         4000         0       0            1            Action to be taken by the Teiid when status is not valid           <null>                                                             5                 YES                                                                tsid:000000067f44dce-00000dfe                     
+QT_Ora9DS                                                          SYS                                                                node_id                                                            result                                                             4            2000         object                     2147483647   2147483647   0       0            1            Returns the node id                                                <null>                                                             0                 YES                                                                tsid:00000007e2eff6b-00000e05                     
 QT_Ora9DS                                                          SYS                                                                now                                                                result                                                             4            93           timestamp                  29           12           0       0            1            Current timestamp                                                  <null>                                                             0                 YES                                                                tsid:00000000028bdc9-00000137                     
 QT_Ora9DS                                                          SYS                                                                nullif                                                             result                                                             4            -7           boolean                    1            1            0       10           1            null if the parameters are equivalent else param1                  <null>                                                             0                 YES                                                                tsid:fffffffc27f9fd7-00000c1a                     
 QT_Ora9DS                                                          SYS                                                                nullif                                                             op1                                                                1            -7           boolean                    1            1            0       10           1            First parameter                                                    <null>                                                             1                 YES                                                                tsid:fffffffc27f9fd7-00000c1a                     
@@ -2206,15 +2206,15 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                rand                                                               result                                                             4            8            double                     17           8            4       10           1            Generated Random Number                                            <null>                                                             0                 YES                                                                tsid:0000000005c5f18-0000008a                     
 QT_Ora9DS                                                          SYS                                                                rand                                                               seed                                                               1            4            integer                    10           4            0       10           1            Number                                                             <null>                                                             1                 YES                                                                tsid:0000000005c5f18-0000008a                     
 QT_Ora9DS                                                          SYS                                                                rand                                                               result                                                             4            8            double                     17           8            4       10           1            Generated Random Number                                            <null>                                                             0                 YES                                                                tsid:0000000005c5f18-0000008d                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     result                                                             4            12           string                     4000         4000         0       0            1            The string with replacements                                       <null>                                                             0                 YES                                                                tsid:fffffffb37a6c71-00000df2                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param1                                                             1            12           string                     4000         4000         0       0            1            Original string                                                    <null>                                                             1                 YES                                                                tsid:fffffffb37a6c71-00000df2                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param2                                                             1            12           string                     4000         4000         0       0            1            The regular expression                                             <null>                                                             2                 YES                                                                tsid:fffffffb37a6c71-00000df2                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param3                                                             1            12           string                     4000         4000         0       0            1            The replacement string                                             <null>                                                             3                 YES                                                                tsid:fffffffb37a6c71-00000df2                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     result                                                             4            12           string                     4000         4000         0       0            1            The string with replacements                                       <null>                                                             0                 YES                                                                tsid:fffffffb37a6c71-00000df7                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param1                                                             1            12           string                     4000         4000         0       0            1            Original string                                                    <null>                                                             1                 YES                                                                tsid:fffffffb37a6c71-00000df7                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param2                                                             1            12           string                     4000         4000         0       0            1            The regular expression                                             <null>                                                             2                 YES                                                                tsid:fffffffb37a6c71-00000df7                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param3                                                             1            12           string                     4000         4000         0       0            1            The replacement string                                             <null>                                                             3                 YES                                                                tsid:fffffffb37a6c71-00000df7                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param4                                                             1            12           string                     4000         4000         0       0            1            Flags, such as g, i, or m                                          <null>                                                             4                 YES                                                                tsid:fffffffb37a6c71-00000df7                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     result                                                             4            12           string                     4000         4000         0       0            1            The string with replacements                                       <null>                                                             0                 YES                                                                tsid:fffffffb37a6c71-00000e07                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param1                                                             1            12           string                     4000         4000         0       0            1            Original string                                                    <null>                                                             1                 YES                                                                tsid:fffffffb37a6c71-00000e07                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param2                                                             1            12           string                     4000         4000         0       0            1            The regular expression                                             <null>                                                             2                 YES                                                                tsid:fffffffb37a6c71-00000e07                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param3                                                             1            12           string                     4000         4000         0       0            1            The replacement string                                             <null>                                                             3                 YES                                                                tsid:fffffffb37a6c71-00000e07                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     result                                                             4            12           string                     4000         4000         0       0            1            The string with replacements                                       <null>                                                             0                 YES                                                                tsid:fffffffb37a6c71-00000e0c                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param1                                                             1            12           string                     4000         4000         0       0            1            Original string                                                    <null>                                                             1                 YES                                                                tsid:fffffffb37a6c71-00000e0c                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param2                                                             1            12           string                     4000         4000         0       0            1            The regular expression                                             <null>                                                             2                 YES                                                                tsid:fffffffb37a6c71-00000e0c                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param3                                                             1            12           string                     4000         4000         0       0            1            The replacement string                                             <null>                                                             3                 YES                                                                tsid:fffffffb37a6c71-00000e0c                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     param4                                                             1            12           string                     4000         4000         0       0            1            Flags, such as g, i, or m                                          <null>                                                             4                 YES                                                                tsid:fffffffb37a6c71-00000e0c                     
 QT_Ora9DS                                                          SYS                                                                repeat                                                             result                                                             4            12           string                     4000         4000         0       0            1            String repeated with count times                                   <null>                                                             0                 YES                                                                tsid:fffffffc873408e-00000214                     
 QT_Ora9DS                                                          SYS                                                                repeat                                                             string                                                             1            12           string                     4000         4000         0       0            1            String                                                             <null>                                                             1                 YES                                                                tsid:fffffffc873408e-00000214                     
 QT_Ora9DS                                                          SYS                                                                repeat                                                             count                                                              1            4            integer                    10           4            0       10           1            Count times to repeat                                              <null>                                                             2                 YES                                                                tsid:fffffffc873408e-00000214                     
@@ -2416,8 +2416,8 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                st_equals                                                          result                                                             4            -7           boolean                    1            1            0       10           1            True if the geometries are equal.                                  <null>                                                             0                 YES                                                                tsid:00000000125c250-00000cfa                     
 QT_Ora9DS                                                          SYS                                                                st_equals                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry 1                                                         <null>                                                             1                 YES                                                                tsid:00000000125c250-00000cfa                     
 QT_Ora9DS                                                          SYS                                                                st_equals                                                          param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry 2                                                         <null>                                                             2                 YES                                                                tsid:00000000125c250-00000cfa                     
-QT_Ora9DS                                                          SYS                                                                st_extent                                                          result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tsid:0000000018801bb-00000e16                     
-QT_Ora9DS                                                          SYS                                                                st_extent                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tsid:0000000018801bb-00000e16                     
+QT_Ora9DS                                                          SYS                                                                st_extent                                                          result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tsid:0000000018801bb-00000e2b                     
+QT_Ora9DS                                                          SYS                                                                st_extent                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tsid:0000000018801bb-00000e2b                     
 QT_Ora9DS                                                          SYS                                                                st_exteriorring                                                    result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            LinearRing Geometry                                                <null>                                                             0                 YES                                                                tsid:ffffffff601c1ff-00000d81                     
 QT_Ora9DS                                                          SYS                                                                st_exteriorring                                                    param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:ffffffff601c1ff-00000d81                     
 QT_Ora9DS                                                          SYS                                                                st_force_2d                                                        result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            2d Geometry value                                                  <null>                                                             0                 YES                                                                tsid:fffffffb5464757-00000d84                     
@@ -2474,6 +2474,17 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                st_isvalid                                                         param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:ffffffff60f0427-00000d0e                     
 QT_Ora9DS                                                          SYS                                                                st_length                                                          result                                                             4            8            double                     17           8            4       10           1            length                                                             <null>                                                             0                 YES                                                                tsid:00000000c6b7d77-00000d2d                     
 QT_Ora9DS                                                          SYS                                                                st_length                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:00000000c6b7d77-00000d2d                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry representing the bounding box                             <null>                                                             0                 YES                                                                tsid:000000009b5dbcf-00000dbc                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param1                                                             1            8            double                     17           8            4       10           1            xmin                                                               <null>                                                             1                 YES                                                                tsid:000000009b5dbcf-00000dbc                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param2                                                             1            8            double                     17           8            4       10           1            ymin                                                               <null>                                                             2                 YES                                                                tsid:000000009b5dbcf-00000dbc                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param3                                                             1            8            double                     17           8            4       10           1            xmax                                                               <null>                                                             3                 YES                                                                tsid:000000009b5dbcf-00000dbc                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param4                                                             1            8            double                     17           8            4       10           1            ymax                                                               <null>                                                             4                 YES                                                                tsid:000000009b5dbcf-00000dbc                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry representing the bounding box                             <null>                                                             0                 YES                                                                tsid:000000009b5dbcf-00000dc2                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param1                                                             1            8            double                     17           8            4       10           1            xmin                                                               <null>                                                             1                 YES                                                                tsid:000000009b5dbcf-00000dc2                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param2                                                             1            8            double                     17           8            4       10           1            ymin                                                               <null>                                                             2                 YES                                                                tsid:000000009b5dbcf-00000dc2                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param3                                                             1            8            double                     17           8            4       10           1            xmax                                                               <null>                                                             3                 YES                                                                tsid:000000009b5dbcf-00000dc2                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param4                                                             1            8            double                     17           8            4       10           1            ymax                                                               <null>                                                             4                 YES                                                                tsid:000000009b5dbcf-00000dc2                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    param5                                                             1            4            integer                    10           4            0       10           1            srid                                                               <null>                                                             5                 YES                                                                tsid:000000009b5dbcf-00000dc2                     
 QT_Ora9DS                                                          SYS                                                                st_numgeometries                                                   result                                                             4            4            integer                    10           4            0       10           1            the number of geometries or 1 if the Geometry is not a collection  <null>                                                             0                 YES                                                                tsid:00000004f6cb62b-00000d42                     
 QT_Ora9DS                                                          SYS                                                                st_numgeometries                                                   param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:00000004f6cb62b-00000d42                     
 QT_Ora9DS                                                          SYS                                                                st_numinteriorrings                                                result                                                             4            4            integer                    10           4            0       10           1            number of interior rings                                           <null>                                                             0                 YES                                                                tsid:fffffffe38ec7de-00000d45                     
@@ -2488,17 +2499,17 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                st_overlaps                                                        param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:fffffffb924181d-00000d15                     
 QT_Ora9DS                                                          SYS                                                                st_perimeter                                                       result                                                             4            8            double                     17           8            4       10           1            perimeter                                                          <null>                                                             0                 YES                                                                tsid:fffffffb58082b2-00000d39                     
 QT_Ora9DS                                                          SYS                                                                st_perimeter                                                       param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffb58082b2-00000d39                     
-QT_Ora9DS                                                          SYS                                                                st_point                                                           result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Point Geometry                                                     <null>                                                             0                 YES                                                                tsid:00000004b1bcd25-00000dbc                     
-QT_Ora9DS                                                          SYS                                                                st_point                                                           param1                                                             1            8            double                     17           8            4       10           1            X ordinate                                                         <null>                                                             1                 YES                                                                tsid:00000004b1bcd25-00000dbc                     
-QT_Ora9DS                                                          SYS                                                                st_point                                                           param2                                                             1            8            double                     17           8            4       10           1            Y ordinate                                                         <null>                                                             2                 YES                                                                tsid:00000004b1bcd25-00000dbc                     
-QT_Ora9DS                                                          SYS                                                                st_pointn                                                          result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            the Point Geometry if it exists                                    <null>                                                             0                 YES                                                                tsid:000000013c99f6f-00000dc0                     
-QT_Ora9DS                                                          SYS                                                                st_pointn                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            LineString Geometry                                                <null>                                                             1                 YES                                                                tsid:000000013c99f6f-00000dc0                     
-QT_Ora9DS                                                          SYS                                                                st_pointn                                                          param2                                                             1            4            integer                    10           4            0       10           1            index                                                              <null>                                                             2                 YES                                                                tsid:000000013c99f6f-00000dc0                     
-QT_Ora9DS                                                          SYS                                                                st_pointonsurface                                                  result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            surface Point Geometry                                             <null>                                                             0                 YES                                                                tsid:0000000583306ef-00000dc4                     
-QT_Ora9DS                                                          SYS                                                                st_pointonsurface                                                  param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:0000000583306ef-00000dc4                     
-QT_Ora9DS                                                          SYS                                                                st_polygon                                                         result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Polygon Geometry                                                   <null>                                                             0                 YES                                                                tsid:000000061052c4f-00000dc7                     
-QT_Ora9DS                                                          SYS                                                                st_polygon                                                         param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            LineString Geometry shell                                          <null>                                                             1                 YES                                                                tsid:000000061052c4f-00000dc7                     
-QT_Ora9DS                                                          SYS                                                                st_polygon                                                         param2                                                             1            4            integer                    10           4            0       10           1            SRID                                                               <null>                                                             2                 YES                                                                tsid:000000061052c4f-00000dc7                     
+QT_Ora9DS                                                          SYS                                                                st_point                                                           result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Point Geometry                                                     <null>                                                             0                 YES                                                                tsid:00000004b1bcd25-00000dc9                     
+QT_Ora9DS                                                          SYS                                                                st_point                                                           param1                                                             1            8            double                     17           8            4       10           1            X ordinate                                                         <null>                                                             1                 YES                                                                tsid:00000004b1bcd25-00000dc9                     
+QT_Ora9DS                                                          SYS                                                                st_point                                                           param2                                                             1            8            double                     17           8            4       10           1            Y ordinate                                                         <null>                                                             2                 YES                                                                tsid:00000004b1bcd25-00000dc9                     
+QT_Ora9DS                                                          SYS                                                                st_pointn                                                          result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            the Point Geometry if it exists                                    <null>                                                             0                 YES                                                                tsid:000000013c99f6f-00000dcd                     
+QT_Ora9DS                                                          SYS                                                                st_pointn                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            LineString Geometry                                                <null>                                                             1                 YES                                                                tsid:000000013c99f6f-00000dcd                     
+QT_Ora9DS                                                          SYS                                                                st_pointn                                                          param2                                                             1            4            integer                    10           4            0       10           1            index                                                              <null>                                                             2                 YES                                                                tsid:000000013c99f6f-00000dcd                     
+QT_Ora9DS                                                          SYS                                                                st_pointonsurface                                                  result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            surface Point Geometry                                             <null>                                                             0                 YES                                                                tsid:0000000583306ef-00000dd1                     
+QT_Ora9DS                                                          SYS                                                                st_pointonsurface                                                  param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:0000000583306ef-00000dd1                     
+QT_Ora9DS                                                          SYS                                                                st_polygon                                                         result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Polygon Geometry                                                   <null>                                                             0                 YES                                                                tsid:000000061052c4f-00000dd4                     
+QT_Ora9DS                                                          SYS                                                                st_polygon                                                         param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            LineString Geometry shell                                          <null>                                                             1                 YES                                                                tsid:000000061052c4f-00000dd4                     
+QT_Ora9DS                                                          SYS                                                                st_polygon                                                         param2                                                             1            4            integer                    10           4            0       10           1            SRID                                                               <null>                                                             2                 YES                                                                tsid:000000061052c4f-00000dd4                     
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          result                                                             4            -7           boolean                    1            1            0       10           1            the 9 character intersection matrix if the intersection pattern i$ <null>                                                             0                 YES                                                                tsid:000000016a791ea-00000d19                     
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:000000016a791ea-00000d19                     
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:000000016a791ea-00000d19                     
@@ -2506,28 +2517,34 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          result                                                             4            12           string                     4000         4000         0       0            1            the 9 character intersection matrix if the intersection pattern i$ <null>                                                             0                 YES                                                                tsid:000000016a791ea-00000d4e                     
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:000000016a791ea-00000d4e                     
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:000000016a791ea-00000d4e                     
-QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry with the specified srid                                   <null>                                                             0                 YES                                                                tsid:fffffffef159231-00000dcb                     
-QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffef159231-00000dcb                     
-QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         param2                                                             1            4            integer                    10           4            0       10           1            srid                                                               <null>                                                             2                 YES                                                                tsid:fffffffef159231-00000dcb                     
-QT_Ora9DS                                                          SYS                                                                st_simplify                                                        result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry value simplified according to the Douglas Peucker algori$ <null>                                                             0                 YES                                                                tsid:fffffffb6827c1a-00000dcf                     
-QT_Ora9DS                                                          SYS                                                                st_simplify                                                        param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffb6827c1a-00000dcf                     
-QT_Ora9DS                                                          SYS                                                                st_simplify                                                        param2                                                             1            8            double                     17           8            4       10           1            tolerance                                                          <null>                                                             2                 YES                                                                tsid:fffffffb6827c1a-00000dcf                     
+QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry with the specified srid                                   <null>                                                             0                 YES                                                                tsid:fffffffef159231-00000dd8                     
+QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffef159231-00000dd8                     
+QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         param2                                                             1            4            integer                    10           4            0       10           1            srid                                                               <null>                                                             2                 YES                                                                tsid:fffffffef159231-00000dd8                     
+QT_Ora9DS                                                          SYS                                                                st_simplify                                                        result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry value simplified according to the Douglas Peucker algori$ <null>                                                             0                 YES                                                                tsid:fffffffb6827c1a-00000ddc                     
+QT_Ora9DS                                                          SYS                                                                st_simplify                                                        param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffb6827c1a-00000ddc                     
+QT_Ora9DS                                                          SYS                                                                st_simplify                                                        param2                                                             1            8            double                     17           8            4       10           1            tolerance                                                          <null>                                                             2                 YES                                                                tsid:fffffffb6827c1a-00000ddc                     
+QT_Ora9DS                                                          SYS                                                                st_simplifypreservetopology                                        result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry value simplified according to the Douglas Peucker algori$ <null>                                                             0                 YES                                                                tsid:fffffffc265b2d5-00000de0                     
+QT_Ora9DS                                                          SYS                                                                st_simplifypreservetopology                                        param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffc265b2d5-00000de0                     
+QT_Ora9DS                                                          SYS                                                                st_simplifypreservetopology                                        param2                                                             1            8            double                     17           8            4       10           1            tolerance                                                          <null>                                                             2                 YES                                                                tsid:fffffffc265b2d5-00000de0                     
+QT_Ora9DS                                                          SYS                                                                st_snaptogrid                                                      result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            The resulting geometry                                             <null>                                                             0                 YES                                                                tsid:fffffffa210981c-00000de4                     
+QT_Ora9DS                                                          SYS                                                                st_snaptogrid                                                      param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffa210981c-00000de4                     
+QT_Ora9DS                                                          SYS                                                                st_snaptogrid                                                      param2                                                             1            7            float                      7            4            3       10           1            size                                                               <null>                                                             2                 YES                                                                tsid:fffffffa210981c-00000de4                     
 QT_Ora9DS                                                          SYS                                                                st_srid                                                            result                                                             4            4            integer                    10           4            0       10           1            The srid for the geometry.                                         <null>                                                             0                 YES                                                                tsid:fffffff8ef691cb-00000ce6                     
 QT_Ora9DS                                                          SYS                                                                st_srid                                                            param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffff8ef691cb-00000ce6                     
-QT_Ora9DS                                                          SYS                                                                st_startpoint                                                      result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            start Point Geometry                                               <null>                                                             0                 YES                                                                tsid:fffffff858941ff-00000dd3                     
-QT_Ora9DS                                                          SYS                                                                st_startpoint                                                      param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffff858941ff-00000dd3                     
-QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            difference Geometry                                                <null>                                                             0                 YES                                                                tsid:0000000719f9cd9-00000dd6                     
-QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:0000000719f9cd9-00000dd6                     
-QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:0000000719f9cd9-00000dd6                     
+QT_Ora9DS                                                          SYS                                                                st_startpoint                                                      result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            start Point Geometry                                               <null>                                                             0                 YES                                                                tsid:fffffff858941ff-00000de8                     
+QT_Ora9DS                                                          SYS                                                                st_startpoint                                                      param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffff858941ff-00000de8                     
+QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            difference Geometry                                                <null>                                                             0                 YES                                                                tsid:0000000719f9cd9-00000deb                     
+QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:0000000719f9cd9-00000deb                     
+QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:0000000719f9cd9-00000deb                     
 QT_Ora9DS                                                          SYS                                                                st_touches                                                         result                                                             4            -7           boolean                    1            1            0       10           1            true if Geometry1 and Geometry2 touch                              <null>                                                             0                 YES                                                                tsid:00000003512ef42-00000d1e                     
 QT_Ora9DS                                                          SYS                                                                st_touches                                                         param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:00000003512ef42-00000d1e                     
 QT_Ora9DS                                                          SYS                                                                st_touches                                                         param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:00000003512ef42-00000d1e                     
-QT_Ora9DS                                                          SYS                                                                st_transform                                                       result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             0                 YES                                                                tsid:fffffffd294c201-00000dda                     
-QT_Ora9DS                                                          SYS                                                                st_transform                                                       param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffd294c201-00000dda                     
-QT_Ora9DS                                                          SYS                                                                st_transform                                                       param2                                                             1            4            integer                    10           4            0       10           1            SRID                                                               <null>                                                             2                 YES                                                                tsid:fffffffd294c201-00000dda                     
-QT_Ora9DS                                                          SYS                                                                st_union                                                           result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            the union Geometry                                                 <null>                                                             0                 YES                                                                tsid:00000004b61ce64-00000dde                     
-QT_Ora9DS                                                          SYS                                                                st_union                                                           param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:00000004b61ce64-00000dde                     
-QT_Ora9DS                                                          SYS                                                                st_union                                                           param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:00000004b61ce64-00000dde                     
+QT_Ora9DS                                                          SYS                                                                st_transform                                                       result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             0                 YES                                                                tsid:fffffffd294c201-00000def                     
+QT_Ora9DS                                                          SYS                                                                st_transform                                                       param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry                                                           <null>                                                             1                 YES                                                                tsid:fffffffd294c201-00000def                     
+QT_Ora9DS                                                          SYS                                                                st_transform                                                       param2                                                             1            4            integer                    10           4            0       10           1            SRID                                                               <null>                                                             2                 YES                                                                tsid:fffffffd294c201-00000def                     
+QT_Ora9DS                                                          SYS                                                                st_union                                                           result                                                             4            2004         geometry                   2147483647   2147483647   0       0            1            the union Geometry                                                 <null>                                                             0                 YES                                                                tsid:00000004b61ce64-00000df3                     
+QT_Ora9DS                                                          SYS                                                                st_union                                                           param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:00000004b61ce64-00000df3                     
+QT_Ora9DS                                                          SYS                                                                st_union                                                           param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:00000004b61ce64-00000df3                     
 QT_Ora9DS                                                          SYS                                                                st_within                                                          result                                                             4            -7           boolean                    1            1            0       10           1            Boolean                                                            <null>                                                             0                 YES                                                                tsid:00000001f6be6fc-00000d22                     
 QT_Ora9DS                                                          SYS                                                                st_within                                                          param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry1                                                          <null>                                                             1                 YES                                                                tsid:00000001f6be6fc-00000d22                     
 QT_Ora9DS                                                          SYS                                                                st_within                                                          param2                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            Geometry2                                                          <null>                                                             2                 YES                                                                tsid:00000001f6be6fc-00000d22                     
@@ -2555,11 +2572,11 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                tan                                                                number                                                             1            8            double                     17           8            4       10           1            Number                                                             <null>                                                             1                 YES                                                                tsid:00000000028d294-00000100                     
 QT_Ora9DS                                                          SYS                                                                tan                                                                result                                                             4            8            double                     17           8            4       10           1            Tangent of number                                                  <null>                                                             0                 YES                                                                tsid:00000000028d294-00000103                     
 QT_Ora9DS                                                          SYS                                                                tan                                                                number                                                             1            2            bigdecimal                 32767        2147483647   16383   10           1            Number                                                             <null>                                                             1                 YES                                                                tsid:00000000028d294-00000103                     
-QT_Ora9DS                                                          SYS                                                                teiid_session_get                                                  result                                                             4            2000         object                     2147483647   2147483647   0       0            1            the current value                                                  <null>                                                             0                 YES                                                                tsid:00000000f6b6a14-00000de2                     
-QT_Ora9DS                                                          SYS                                                                teiid_session_get                                                  param1                                                             1            12           string                     4000         4000         0       0            1            the string key                                                     <null>                                                             1                 YES                                                                tsid:00000000f6b6a14-00000de2                     
-QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  result                                                             4            2000         object                     2147483647   2147483647   0       0            1            the previous value if one was set                                  <null>                                                             0                 YES                                                                tsid:00000000f6b9720-00000de5                     
-QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  param1                                                             1            12           string                     4000         4000         0       0            1            the string key                                                     <null>                                                             1                 YES                                                                tsid:00000000f6b9720-00000de5                     
-QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  param2                                                             1            2000         object                     2147483647   2147483647   0       0            1            the value                                                          <null>                                                             2                 YES                                                                tsid:00000000f6b9720-00000de5                     
+QT_Ora9DS                                                          SYS                                                                teiid_session_get                                                  result                                                             4            2000         object                     2147483647   2147483647   0       0            1            the current value                                                  <null>                                                             0                 YES                                                                tsid:00000000f6b6a14-00000df7                     
+QT_Ora9DS                                                          SYS                                                                teiid_session_get                                                  param1                                                             1            12           string                     4000         4000         0       0            1            the string key                                                     <null>                                                             1                 YES                                                                tsid:00000000f6b6a14-00000df7                     
+QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  result                                                             4            2000         object                     2147483647   2147483647   0       0            1            the previous value if one was set                                  <null>                                                             0                 YES                                                                tsid:00000000f6b9720-00000dfa                     
+QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  param1                                                             1            12           string                     4000         4000         0       0            1            the string key                                                     <null>                                                             1                 YES                                                                tsid:00000000f6b9720-00000dfa                     
+QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  param2                                                             1            2000         object                     2147483647   2147483647   0       0            1            the value                                                          <null>                                                             2                 YES                                                                tsid:00000000f6b9720-00000dfa                     
 QT_Ora9DS                                                          SYS                                                                timestampadd                                                       result                                                             4            91           date                       10           4            0       0            1            Returned modified date                                             <null>                                                             0                 YES                                                                tsid:00000005eecc2be-00000181                     
 QT_Ora9DS                                                          SYS                                                                timestampadd                                                       interval                                                           1            12           string                     4000         4000         0       0            1            Interval type                                                      <null>                                                             1                 YES                                                                tsid:00000005eecc2be-00000181                     
 QT_Ora9DS                                                          SYS                                                                timestampadd                                                       count                                                              1            4            integer                    10           4            0       10           1            Count number                                                       <null>                                                             2                 YES                                                                tsid:00000005eecc2be-00000181                     
@@ -2579,23 +2596,23 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                timestampdiff                                                      interval                                                           1            12           string                     4000         4000         0       0            1            Interval type                                                      <null>                                                             1                 YES                                                                tsid:00000007a18cd0e-00000190                     
 QT_Ora9DS                                                          SYS                                                                timestampdiff                                                      timestamp1                                                         1            93           timestamp                  29           12           0       0            1            Start timestamp                                                    <null>                                                             2                 YES                                                                tsid:00000007a18cd0e-00000190                     
 QT_Ora9DS                                                          SYS                                                                timestampdiff                                                      timestamp2                                                         1            93           timestamp                  29           12           0       0            1            End timestamp                                                      <null>                                                             3                 YES                                                                tsid:00000007a18cd0e-00000190                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           result                                                             4            2004         blob                       2147483647   2147483647   0       0            1            byte representation Blob                                           <null>                                                             0                 YES                                                                tsid:fffffffa9bd3c9a-00000e01                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param1                                                             1            2005         clob                       2147483647   2147483647   0       0            1            Clob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9bd3c9a-00000e01                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9bd3c9a-00000e01                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           result                                                             4            2004         blob                       2147483647   2147483647   0       0            1            byte representation Blob                                           <null>                                                             0                 YES                                                                tsid:fffffffa9bd3c9a-00000e05                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param1                                                             1            2005         clob                       2147483647   2147483647   0       0            1            Clob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9bd3c9a-00000e05                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9bd3c9a-00000e05                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param3                                                             1            -7           boolean                    1            1            0       10           1            well-formed                                                        <null>                                                             3                 YES                                                                tsid:fffffffa9bd3c9a-00000e05                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           result                                                             4            2005         clob                       2147483647   2147483647   0       0            1            Clob char rep                                                      <null>                                                             0                 YES                                                                tsid:fffffffa9c3540c-00000e0a                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           param1                                                             1            2004         blob                       2147483647   2147483647   0       0            1            Blob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9c3540c-00000e0a                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9c3540c-00000e0a                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           result                                                             4            2005         clob                       2147483647   2147483647   0       0            1            Clob char rep                                                      <null>                                                             0                 YES                                                                tsid:fffffffa9c3540c-00000e0e                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           param1                                                             1            2004         blob                       2147483647   2147483647   0       0            1            Blob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9c3540c-00000e0e                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9c3540c-00000e0e                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           param3                                                             1            -7           boolean                    1            1            0       10           1            well-formed                                                        <null>                                                             3                 YES                                                                tsid:fffffffa9c3540c-00000e0e                     
-QT_Ora9DS                                                          SYS                                                                tokenize                                                           result                                                             4            2003         string[]                   <null>       4000         0       0            1            Return of the string array                                         <null>                                                             0                 YES                                                                tsid:fffffffbe5c83ae-00000dfd                     
-QT_Ora9DS                                                          SYS                                                                tokenize                                                           param1                                                             1            12           string                     4000         4000         0       0            1            String to Tokenize                                                 <null>                                                             1                 YES                                                                tsid:fffffffbe5c83ae-00000dfd                     
-QT_Ora9DS                                                          SYS                                                                tokenize                                                           param2                                                             1            1            char                       1            1            0       0            1            Delimiter to tokenize the string by                                <null>                                                             2                 YES                                                                tsid:fffffffbe5c83ae-00000dfd                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           result                                                             4            2004         blob                       2147483647   2147483647   0       0            1            byte representation Blob                                           <null>                                                             0                 YES                                                                tsid:fffffffa9bd3c9a-00000e16                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param1                                                             1            2005         clob                       2147483647   2147483647   0       0            1            Clob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9bd3c9a-00000e16                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9bd3c9a-00000e16                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           result                                                             4            2004         blob                       2147483647   2147483647   0       0            1            byte representation Blob                                           <null>                                                             0                 YES                                                                tsid:fffffffa9bd3c9a-00000e1a                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param1                                                             1            2005         clob                       2147483647   2147483647   0       0            1            Clob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9bd3c9a-00000e1a                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9bd3c9a-00000e1a                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           param3                                                             1            -7           boolean                    1            1            0       10           1            well-formed                                                        <null>                                                             3                 YES                                                                tsid:fffffffa9bd3c9a-00000e1a                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           result                                                             4            2005         clob                       2147483647   2147483647   0       0            1            Clob char rep                                                      <null>                                                             0                 YES                                                                tsid:fffffffa9c3540c-00000e1f                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           param1                                                             1            2004         blob                       2147483647   2147483647   0       0            1            Blob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9c3540c-00000e1f                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9c3540c-00000e1f                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           result                                                             4            2005         clob                       2147483647   2147483647   0       0            1            Clob char rep                                                      <null>                                                             0                 YES                                                                tsid:fffffffa9c3540c-00000e23                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           param1                                                             1            2004         blob                       2147483647   2147483647   0       0            1            Blob                                                               <null>                                                             1                 YES                                                                tsid:fffffffa9c3540c-00000e23                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           param2                                                             1            12           string                     4000         4000         0       0            1            The encoding                                                       <null>                                                             2                 YES                                                                tsid:fffffffa9c3540c-00000e23                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           param3                                                             1            -7           boolean                    1            1            0       10           1            well-formed                                                        <null>                                                             3                 YES                                                                tsid:fffffffa9c3540c-00000e23                     
+QT_Ora9DS                                                          SYS                                                                tokenize                                                           result                                                             4            2003         string[]                   <null>       4000         0       0            1            Return of the string array                                         <null>                                                             0                 YES                                                                tsid:fffffffbe5c83ae-00000e12                     
+QT_Ora9DS                                                          SYS                                                                tokenize                                                           param1                                                             1            12           string                     4000         4000         0       0            1            String to Tokenize                                                 <null>                                                             1                 YES                                                                tsid:fffffffbe5c83ae-00000e12                     
+QT_Ora9DS                                                          SYS                                                                tokenize                                                           param2                                                             1            1            char                       1            1            0       0            1            Delimiter to tokenize the string by                                <null>                                                             2                 YES                                                                tsid:fffffffbe5c83ae-00000e12                     
 QT_Ora9DS                                                          SYS                                                                translate                                                          result                                                             4            12           string                     4000         4000         0       0            1            Translated string                                                  <null>                                                             0                 YES                                                                tsid:00000003ee80441-0000020f                     
 QT_Ora9DS                                                          SYS                                                                translate                                                          string                                                             1            12           string                     4000         4000         0       0            1            String                                                             <null>                                                             1                 YES                                                                tsid:00000003ee80441-0000020f                     
 QT_Ora9DS                                                          SYS                                                                translate                                                          source                                                             1            12           string                     4000         4000         0       0            1            Source string                                                      <null>                                                             2                 YES                                                                tsid:00000003ee80441-0000020f                     
@@ -2620,8 +2637,8 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                week                                                               date                                                               1            91           date                       10           4            0       0            1            Week of year for date                                              <null>                                                             1                 YES                                                                tsid:0000000005eb2e7-0000015d                     
 QT_Ora9DS                                                          SYS                                                                week                                                               result                                                             4            4            integer                    10           4            0       10           1            Week of year for timestamp                                         <null>                                                             0                 YES                                                                tsid:0000000005eb2e7-00000160                     
 QT_Ora9DS                                                          SYS                                                                week                                                               timestamp                                                          1            93           timestamp                  29           12           0       0            1            Week of year for timestamp                                         <null>                                                             1                 YES                                                                tsid:0000000005eb2e7-00000160                     
-QT_Ora9DS                                                          SYS                                                                xmlText                                                            result                                                             4            2009         xml                        2147483647   2147483647   0       0            1            XML text.                                                          <null>                                                             0                 YES                                                                tsid:fffffff8c2cb8d7-00000e13                     
-QT_Ora9DS                                                          SYS                                                                xmlText                                                            param1                                                             1            12           string                     4000         4000         0       0            1            The text.                                                          <null>                                                             1                 YES                                                                tsid:fffffff8c2cb8d7-00000e13                     
+QT_Ora9DS                                                          SYS                                                                xmlText                                                            result                                                             4            2009         xml                        2147483647   2147483647   0       0            1            XML text.                                                          <null>                                                             0                 YES                                                                tsid:fffffff8c2cb8d7-00000e28                     
+QT_Ora9DS                                                          SYS                                                                xmlText                                                            param1                                                             1            12           string                     4000         4000         0       0            1            The text.                                                          <null>                                                             1                 YES                                                                tsid:fffffff8c2cb8d7-00000e28                     
 QT_Ora9DS                                                          SYS                                                                xmlcomment                                                         result                                                             4            2009         xml                        2147483647   2147483647   0       0            1            XML comment.                                                       <null>                                                             0                 YES                                                                tsid:fffffffaf5c395b-00000c01                     
 QT_Ora9DS                                                          SYS                                                                xmlcomment                                                         value                                                              1            12           string                     4000         4000         0       0            1            The comment text.                                                  <null>                                                             1                 YES                                                                tsid:fffffffaf5c395b-00000c01                     
 QT_Ora9DS                                                          SYS                                                                xmlconcat                                                          result                                                             4            2009         xml                        2147483647   2147483647   0       0            1            XML result                                                         <null>                                                             0                 YES                                                                tsid:fffffffbb7bacde-00000bfd                     
@@ -2678,26 +2695,62 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                ||                                                                 result                                                             4            12           string                     4000         4000         0       0            1            Concatenated strings                                               <null>                                                             0                 YES                                                                tsid:000000000272273-000001be                     
 QT_Ora9DS                                                          SYS                                                                ||                                                                 string1                                                            1            12           string                     4000         4000         0       0            1            Left string                                                        <null>                                                             1                 YES                                                                tsid:000000000272273-000001be                     
 QT_Ora9DS                                                          SYS                                                                ||                                                                 string2                                                            1            12           string                     4000         4000         0       0            1            Right string                                                       <null>                                                             2                 YES                                                                tsid:000000000272273-000001be                     
-QT_Ora9DS                                                          pg_catalog                                                         PostGIS_Lib_Version                                                result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-a35b9c90-00000079                
-QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         result                                                             4            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e548fc4c-0000007d                
-QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         param1                                                             1            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e548fc4c-0000007d                
-QT_Ora9DS                                                          pg_catalog                                                         encode                                                             result                                                             4            2005         clob                       2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-b2963e16-00000078                
-QT_Ora9DS                                                          pg_catalog                                                         encode                                                             param1                                                             1            2004         blob                       2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-b2963e16-00000078                
-QT_Ora9DS                                                          pg_catalog                                                         encode                                                             param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-b2963e16-00000078                
-QT_Ora9DS                                                          pg_catalog                                                         getOid                                                             result                                                             4            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-b5885e94-0000007e                
-QT_Ora9DS                                                          pg_catalog                                                         getOid                                                             param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-b5885e94-0000007e                
-QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-6e44e0cf-0000007a                
-QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-6e44e0cf-0000007a                
-QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-6e44e0cf-0000007a                
-QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-267c14ff-0000007f                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param3                                                             1            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             3                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-Row Count : 2697
+QT_Ora9DS                                                          pg_catalog                                                         PostGIS_Lib_Version                                                result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-a35b9c90-000000a8                
+QT_Ora9DS                                                          pg_catalog                                                         ST_asBinary                                                        result                                                             4            2004         blob                       2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-09fddaf1-000000a7                
+QT_Ora9DS                                                          pg_catalog                                                         ST_asBinary                                                        param1                                                             1            2004         geometry                   2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-09fddaf1-000000a7                
+QT_Ora9DS                                                          pg_catalog                                                         ST_asBinary                                                        param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-09fddaf1-000000a7                
+QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         result                                                             4            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e548fc4c-000000b2                
+QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         param1                                                             1            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e548fc4c-000000b2                
+QT_Ora9DS                                                          pg_catalog                                                         col_description                                                    result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-c26d23bd-000000a5                
+QT_Ora9DS                                                          pg_catalog                                                         col_description                                                    param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-c26d23bd-000000a5                
+QT_Ora9DS                                                          pg_catalog                                                         col_description                                                    param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-c26d23bd-000000a5                
+QT_Ora9DS                                                          pg_catalog                                                         current_schema                                                     result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-a9550b27-000000a3                
+QT_Ora9DS                                                          pg_catalog                                                         encode                                                             result                                                             4            2005         clob                       2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-b2963e16-0000009e                
+QT_Ora9DS                                                          pg_catalog                                                         encode                                                             param1                                                             1            2004         blob                       2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-b2963e16-0000009e                
+QT_Ora9DS                                                          pg_catalog                                                         encode                                                             param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-b2963e16-0000009e                
+QT_Ora9DS                                                          pg_catalog                                                         format_type                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-56f0b282-000000a2                
+QT_Ora9DS                                                          pg_catalog                                                         format_type                                                        param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-56f0b282-000000a2                
+QT_Ora9DS                                                          pg_catalog                                                         format_type                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-56f0b282-000000a2                
+QT_Ora9DS                                                          pg_catalog                                                         getOid                                                             result                                                             4            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-b5885e94-000000b3                
+QT_Ora9DS                                                          pg_catalog                                                         getOid                                                             param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-b5885e94-000000b3                
+QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-6e44e0cf-000000ac                
+QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-6e44e0cf-000000ac                
+QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-6e44e0cf-000000ac                
+QT_Ora9DS                                                          pg_catalog                                                         has_schema_privilege                                               result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-2e936898-000000a0                
+QT_Ora9DS                                                          pg_catalog                                                         has_schema_privilege                                               param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-2e936898-000000a0                
+QT_Ora9DS                                                          pg_catalog                                                         has_schema_privilege                                               param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-2e936898-000000a0                
+QT_Ora9DS                                                          pg_catalog                                                         has_table_privilege                                                result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-daf4b7db-000000a1                
+QT_Ora9DS                                                          pg_catalog                                                         has_table_privilege                                                param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-daf4b7db-000000a1                
+QT_Ora9DS                                                          pg_catalog                                                         has_table_privilege                                                param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-daf4b7db-000000a1                
+QT_Ora9DS                                                          pg_catalog                                                         obj_description                                                    result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-a36cd4b4-0000009f                
+QT_Ora9DS                                                          pg_catalog                                                         obj_description                                                    param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-a36cd4b4-0000009f                
+QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-267c14ff-000000b5                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               param2                                                             1            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param3                                                             1            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             3                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_userbyid                                                    result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-305ef60e-000000a4                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_userbyid                                                    param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-305ef60e-000000a4                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_table_is_visible                                                result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-17e348b6-000000af                
+QT_Ora9DS                                                          pg_catalog                                                         pg_table_is_visible                                                param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-17e348b6-000000af                
+QT_Ora9DS                                                          pg_catalog                                                         pg_type_is_visible                                                 result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-bb134e3a-000000b1                
+QT_Ora9DS                                                          pg_catalog                                                         pg_type_is_visible                                                 param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-bb134e3a-000000b1                
+QT_Ora9DS                                                          pg_catalog                                                         postgis_geos_version                                               result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-f2edeb29-000000a9                
+QT_Ora9DS                                                          pg_catalog                                                         postgis_proj_version                                               result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-9161e844-000000aa                
+QT_Ora9DS                                                          pg_catalog                                                         postgis_version                                                    result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-36e9b5ca-000000ab                
+QT_Ora9DS                                                          pg_catalog                                                         regclass                                                           result                                                             4            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-d6842d64-0000009d                
+QT_Ora9DS                                                          pg_catalog                                                         regclass                                                           param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-d6842d64-0000009d                
+QT_Ora9DS                                                          pg_catalog                                                         version                                                            result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-14f51cd8-000000b4                
+Row Count : 2750
 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    Function_CAT       string             SYS            FunctionParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
 SchemaName         12             QT_Ora9DS       java.lang.String    FUNCTION_SCHEM     string             SYS            FunctionParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
@@ -2718,17 +2771,29 @@ IS_NULLABLE        12             QT_Ora9DS       java.lang.String    IS_NULLABL
 FunctionUID        12             QT_Ora9DS       java.lang.String    SPECIFIC_NAME      string             SYS            FunctionParams  50                    50            0         false            true             false       false                 0           true        true          false     false       
 string                                                             string                                                             string                                                             string                                                             integer      integer      string                     integer      integer      short   integer      integer      string                                                             string                                                             integer           string                                                             string                                            
 Function_CAT                                                       FUNCTION_SCHEM                                                     FUNCTION_NAME                                                      COLUMN_NAME                                                        COLUMN_TYPE  DATA_TYPE    TYPE_NAME                  PRECISION    LENGTH       SCALE   RADIX        NULLABLE     REMARKS                                                            CHAR_OCTET_LENGTH                                                  ORDINAL_POSITION  IS_NULLABLE                                                        SPECIFIC_NAME                                     
-QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         result                                                             4            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e548fc4c-0000007d                
-QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         param1                                                             1            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e548fc4c-0000007d                
-QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-267c14ff-0000007f                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param3                                                             1            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             3                 YES                                                                tid:7ff2755e9621-e8caf286-0000007c                
-Row Count : 10
+QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         result                                                             4            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e548fc4c-000000b2                
+QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         param1                                                             1            2000         object                     2147483647   2147483647   0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e548fc4c-000000b2                
+QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-267c14ff-000000b5                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               param2                                                             1            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param1                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param2                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        param3                                                             1            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             3                 YES                                                                tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_userbyid                                                    result                                                             4            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-305ef60e-000000a4                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_userbyid                                                    param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-305ef60e-000000a4                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        param2                                                             1            12           string                     4000         4000         0       0            1            <null>                                                             <null>                                                             2                 YES                                                                tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_table_is_visible                                                result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-17e348b6-000000af                
+QT_Ora9DS                                                          pg_catalog                                                         pg_table_is_visible                                                param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-17e348b6-000000af                
+QT_Ora9DS                                                          pg_catalog                                                         pg_type_is_visible                                                 result                                                             4            -7           boolean                    1            1            0       10           1            <null>                                                             <null>                                                             0                 YES                                                                tid:7ff2755e9621-bb134e3a-000000b1                
+QT_Ora9DS                                                          pg_catalog                                                         pg_type_is_visible                                                 param1                                                             1            4            integer                    10           4            0       10           1            <null>                                                             <null>                                                             1                 YES                                                                tid:7ff2755e9621-bb134e3a-000000b1                
+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             QT_Ora9DS       java.lang.String    Function_CAT       string             SYS            FunctionParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
 SchemaName         12             QT_Ora9DS       java.lang.String    FUNCTION_SCHEM     string             SYS            FunctionParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
index 8043903a1c..06ef2d07c7 100644
--- a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
+++ b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
@@ -680,8 +680,8 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                month                                                              <null>                                                             1              tsid:0000000065b3573-00000154                     
 QT_Ora9DS                                                          SYS                                                                monthname                                                          <null>                                                             1              tsid:fffffffb2b96ffe-00000157                     
 QT_Ora9DS                                                          SYS                                                                monthname                                                          <null>                                                             1              tsid:fffffffb2b96ffe-0000015a                     
-QT_Ora9DS                                                          SYS                                                                mvstatus                                                           <null>                                                             1              tsid:000000067f44dce-00000de9                     
-QT_Ora9DS                                                          SYS                                                                node_id                                                            <null>                                                             1              tsid:00000007e2eff6b-00000df0                     
+QT_Ora9DS                                                          SYS                                                                mvstatus                                                           <null>                                                             1              tsid:000000067f44dce-00000dfe                     
+QT_Ora9DS                                                          SYS                                                                node_id                                                            <null>                                                             1              tsid:00000007e2eff6b-00000e05                     
 QT_Ora9DS                                                          SYS                                                                now                                                                <null>                                                             1              tsid:00000000028bdc9-00000137                     
 QT_Ora9DS                                                          SYS                                                                nullif                                                             <null>                                                             1              tsid:fffffffc27f9fd7-00000c1a                     
 QT_Ora9DS                                                          SYS                                                                nullif                                                             <null>                                                             1              tsid:fffffffc27f9fd7-00000c23                     
@@ -739,8 +739,8 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                radians                                                            <null>                                                             1              tsid:000000039e5ed65-000000f7                     
 QT_Ora9DS                                                          SYS                                                                rand                                                               <null>                                                             1              tsid:0000000005c5f18-0000008a                     
 QT_Ora9DS                                                          SYS                                                                rand                                                               <null>                                                             1              tsid:0000000005c5f18-0000008d                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     <null>                                                             1              tsid:fffffffb37a6c71-00000df2                     
-QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     <null>                                                             1              tsid:fffffffb37a6c71-00000df7                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     <null>                                                             1              tsid:fffffffb37a6c71-00000e07                     
+QT_Ora9DS                                                          SYS                                                                regexp_replace                                                     <null>                                                             1              tsid:fffffffb37a6c71-00000e0c                     
 QT_Ora9DS                                                          SYS                                                                repeat                                                             <null>                                                             1              tsid:fffffffc873408e-00000214                     
 QT_Ora9DS                                                          SYS                                                                replace                                                            <null>                                                             1              tsid:00000004163c5a7-000001e9                     
 QT_Ora9DS                                                          SYS                                                                right                                                              <null>                                                             1              tsid:0000000069ed50f-000001dc                     
@@ -832,7 +832,7 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                st_endpoint                                                        <null>                                                             1              tsid:00000000156f0a6-00000d7b                     
 QT_Ora9DS                                                          SYS                                                                st_envelope                                                        <null>                                                             1              tsid:00000001f71e2e1-00000d7e                     
 QT_Ora9DS                                                          SYS                                                                st_equals                                                          <null>                                                             1              tsid:00000000125c250-00000cfa                     
-QT_Ora9DS                                                          SYS                                                                st_extent                                                          <null>                                                             1              tsid:0000000018801bb-00000e16                     
+QT_Ora9DS                                                          SYS                                                                st_extent                                                          <null>                                                             1              tsid:0000000018801bb-00000e2b                     
 QT_Ora9DS                                                          SYS                                                                st_exteriorring                                                    <null>                                                             1              tsid:ffffffff601c1ff-00000d81                     
 QT_Ora9DS                                                          SYS                                                                st_force_2d                                                        <null>                                                             1              tsid:fffffffb5464757-00000d84                     
 QT_Ora9DS                                                          SYS                                                                st_geometryn                                                       <null>                                                             1              tsid:fffffffe6cf5cd1-00000db0                     
@@ -857,26 +857,30 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                st_issimple                                                        <null>                                                             1              tsid:fffffffc2900a6d-00000d0b                     
 QT_Ora9DS                                                          SYS                                                                st_isvalid                                                         <null>                                                             1              tsid:ffffffff60f0427-00000d0e                     
 QT_Ora9DS                                                          SYS                                                                st_length                                                          <null>                                                             1              tsid:00000000c6b7d77-00000d2d                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    <null>                                                             1              tsid:000000009b5dbcf-00000dbc                     
+QT_Ora9DS                                                          SYS                                                                st_makeenvelope                                                    <null>                                                             1              tsid:000000009b5dbcf-00000dc2                     
 QT_Ora9DS                                                          SYS                                                                st_numgeometries                                                   <null>                                                             1              tsid:00000004f6cb62b-00000d42                     
 QT_Ora9DS                                                          SYS                                                                st_numinteriorrings                                                <null>                                                             1              tsid:fffffffe38ec7de-00000d45                     
 QT_Ora9DS                                                          SYS                                                                st_numpoints                                                       <null>                                                             1              tsid:00000000e9b227e-00000d48                     
 QT_Ora9DS                                                          SYS                                                                st_orderingequals                                                  <null>                                                             1              tsid:fffffffe70ebb24-00000d11                     
 QT_Ora9DS                                                          SYS                                                                st_overlaps                                                        <null>                                                             1              tsid:fffffffb924181d-00000d15                     
 QT_Ora9DS                                                          SYS                                                                st_perimeter                                                       <null>                                                             1              tsid:fffffffb58082b2-00000d39                     
-QT_Ora9DS                                                          SYS                                                                st_point                                                           <null>                                                             1              tsid:00000004b1bcd25-00000dbc                     
-QT_Ora9DS                                                          SYS                                                                st_pointn                                                          <null>                                                             1              tsid:000000013c99f6f-00000dc0                     
-QT_Ora9DS                                                          SYS                                                                st_pointonsurface                                                  <null>                                                             1              tsid:0000000583306ef-00000dc4                     
-QT_Ora9DS                                                          SYS                                                                st_polygon                                                         <null>                                                             1              tsid:000000061052c4f-00000dc7                     
+QT_Ora9DS                                                          SYS                                                                st_point                                                           <null>                                                             1              tsid:00000004b1bcd25-00000dc9                     
+QT_Ora9DS                                                          SYS                                                                st_pointn                                                          <null>                                                             1              tsid:000000013c99f6f-00000dcd                     
+QT_Ora9DS                                                          SYS                                                                st_pointonsurface                                                  <null>                                                             1              tsid:0000000583306ef-00000dd1                     
+QT_Ora9DS                                                          SYS                                                                st_polygon                                                         <null>                                                             1              tsid:000000061052c4f-00000dd4                     
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          <null>                                                             1              tsid:000000016a791ea-00000d19                     
 QT_Ora9DS                                                          SYS                                                                st_relate                                                          <null>                                                             1              tsid:000000016a791ea-00000d4e                     
-QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         <null>                                                             1              tsid:fffffffef159231-00000dcb                     
-QT_Ora9DS                                                          SYS                                                                st_simplify                                                        <null>                                                             1              tsid:fffffffb6827c1a-00000dcf                     
+QT_Ora9DS                                                          SYS                                                                st_setsrid                                                         <null>                                                             1              tsid:fffffffef159231-00000dd8                     
+QT_Ora9DS                                                          SYS                                                                st_simplify                                                        <null>                                                             1              tsid:fffffffb6827c1a-00000ddc                     
+QT_Ora9DS                                                          SYS                                                                st_simplifypreservetopology                                        <null>                                                             1              tsid:fffffffc265b2d5-00000de0                     
+QT_Ora9DS                                                          SYS                                                                st_snaptogrid                                                      <null>                                                             1              tsid:fffffffa210981c-00000de4                     
 QT_Ora9DS                                                          SYS                                                                st_srid                                                            <null>                                                             1              tsid:fffffff8ef691cb-00000ce6                     
-QT_Ora9DS                                                          SYS                                                                st_startpoint                                                      <null>                                                             1              tsid:fffffff858941ff-00000dd3                     
-QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   <null>                                                             1              tsid:0000000719f9cd9-00000dd6                     
+QT_Ora9DS                                                          SYS                                                                st_startpoint                                                      <null>                                                             1              tsid:fffffff858941ff-00000de8                     
+QT_Ora9DS                                                          SYS                                                                st_symdifference                                                   <null>                                                             1              tsid:0000000719f9cd9-00000deb                     
 QT_Ora9DS                                                          SYS                                                                st_touches                                                         <null>                                                             1              tsid:00000003512ef42-00000d1e                     
-QT_Ora9DS                                                          SYS                                                                st_transform                                                       <null>                                                             1              tsid:fffffffd294c201-00000dda                     
-QT_Ora9DS                                                          SYS                                                                st_union                                                           <null>                                                             1              tsid:00000004b61ce64-00000dde                     
+QT_Ora9DS                                                          SYS                                                                st_transform                                                       <null>                                                             1              tsid:fffffffd294c201-00000def                     
+QT_Ora9DS                                                          SYS                                                                st_union                                                           <null>                                                             1              tsid:00000004b61ce64-00000df3                     
 QT_Ora9DS                                                          SYS                                                                st_within                                                          <null>                                                             1              tsid:00000001f6be6fc-00000d22                     
 QT_Ora9DS                                                          SYS                                                                st_x                                                               <null>                                                             1              tsid:0000000005d190d-00000d30                     
 QT_Ora9DS                                                          SYS                                                                st_y                                                               <null>                                                             1              tsid:0000000005d190e-00000d33                     
@@ -887,18 +891,18 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                substring                                                          <null>                                                             1              tsid:00000001fc68144-000001cb                     
 QT_Ora9DS                                                          SYS                                                                tan                                                                <null>                                                             1              tsid:00000000028d294-00000100                     
 QT_Ora9DS                                                          SYS                                                                tan                                                                <null>                                                             1              tsid:00000000028d294-00000103                     
-QT_Ora9DS                                                          SYS                                                                teiid_session_get                                                  <null>                                                             1              tsid:00000000f6b6a14-00000de2                     
-QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  <null>                                                             1              tsid:00000000f6b9720-00000de5                     
+QT_Ora9DS                                                          SYS                                                                teiid_session_get                                                  <null>                                                             1              tsid:00000000f6b6a14-00000df7                     
+QT_Ora9DS                                                          SYS                                                                teiid_session_set                                                  <null>                                                             1              tsid:00000000f6b9720-00000dfa                     
 QT_Ora9DS                                                          SYS                                                                timestampadd                                                       <null>                                                             1              tsid:00000005eecc2be-00000181                     
 QT_Ora9DS                                                          SYS                                                                timestampadd                                                       <null>                                                             1              tsid:00000005eecc2be-00000186                     
 QT_Ora9DS                                                          SYS                                                                timestampadd                                                       <null>                                                             1              tsid:00000005eecc2be-0000018b                     
 QT_Ora9DS                                                          SYS                                                                timestampcreate                                                    <null>                                                             1              tsid:fffffffc35c3485-0000019e                     
 QT_Ora9DS                                                          SYS                                                                timestampdiff                                                      <null>                                                             1              tsid:00000007a18cd0e-00000190                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           <null>                                                             1              tsid:fffffffa9bd3c9a-00000e01                     
-QT_Ora9DS                                                          SYS                                                                to_bytes                                                           <null>                                                             1              tsid:fffffffa9bd3c9a-00000e05                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           <null>                                                             1              tsid:fffffffa9c3540c-00000e0a                     
-QT_Ora9DS                                                          SYS                                                                to_chars                                                           <null>                                                             1              tsid:fffffffa9c3540c-00000e0e                     
-QT_Ora9DS                                                          SYS                                                                tokenize                                                           <null>                                                             1              tsid:fffffffbe5c83ae-00000dfd                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           <null>                                                             1              tsid:fffffffa9bd3c9a-00000e16                     
+QT_Ora9DS                                                          SYS                                                                to_bytes                                                           <null>                                                             1              tsid:fffffffa9bd3c9a-00000e1a                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           <null>                                                             1              tsid:fffffffa9c3540c-00000e1f                     
+QT_Ora9DS                                                          SYS                                                                to_chars                                                           <null>                                                             1              tsid:fffffffa9c3540c-00000e23                     
+QT_Ora9DS                                                          SYS                                                                tokenize                                                           <null>                                                             1              tsid:fffffffbe5c83ae-00000e12                     
 QT_Ora9DS                                                          SYS                                                                translate                                                          <null>                                                             1              tsid:00000003ee80441-0000020f                     
 QT_Ora9DS                                                          SYS                                                                trim                                                               <null>                                                             1              tsid:0000000005d8715-00000ccf                     
 QT_Ora9DS                                                          SYS                                                                ucase                                                              <null>                                                             1              tsid:000000006c64c18-000001a8                     
@@ -910,7 +914,7 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                uuid                                                               <null>                                                             1              tsid:0000000005e06ae-00000cc6                     
 QT_Ora9DS                                                          SYS                                                                week                                                               <null>                                                             1              tsid:0000000005eb2e7-0000015d                     
 QT_Ora9DS                                                          SYS                                                                week                                                               <null>                                                             1              tsid:0000000005eb2e7-00000160                     
-QT_Ora9DS                                                          SYS                                                                xmlText                                                            <null>                                                             1              tsid:fffffff8c2cb8d7-00000e13                     
+QT_Ora9DS                                                          SYS                                                                xmlText                                                            <null>                                                             1              tsid:fffffff8c2cb8d7-00000e28                     
 QT_Ora9DS                                                          SYS                                                                xmlcomment                                                         <null>                                                             1              tsid:fffffffaf5c395b-00000c01                     
 QT_Ora9DS                                                          SYS                                                                xmlconcat                                                          <null>                                                             1              tsid:fffffffbb7bacde-00000bfd                     
 QT_Ora9DS                                                          SYS                                                                xmlpi                                                              <null>                                                             1              tsid:000000006f54743-00000c04                     
@@ -931,15 +935,32 @@ QT_Ora9DS                                                          SYS
 QT_Ora9DS                                                          SYS                                                                year                                                               <null>                                                             1              tsid:0000000005f9b30-00000163                     
 QT_Ora9DS                                                          SYS                                                                year                                                               <null>                                                             1              tsid:0000000005f9b30-00000166                     
 QT_Ora9DS                                                          SYS                                                                ||                                                                 <null>                                                             1              tsid:000000000272273-000001be                     
-QT_Ora9DS                                                          pg_catalog                                                         PostGIS_Lib_Version                                                <null>                                                             1              tid:7ff2755e9621-a35b9c90-00000079                
-QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         <null>                                                             1              tid:7ff2755e9621-e548fc4c-0000007d                
-QT_Ora9DS                                                          pg_catalog                                                         encode                                                             <null>                                                             1              tid:7ff2755e9621-b2963e16-00000078                
-QT_Ora9DS                                                          pg_catalog                                                         getOid                                                             <null>                                                             1              tid:7ff2755e9621-b5885e94-0000007e                
-QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             <null>                                                             1              tid:7ff2755e9621-6e44e0cf-0000007a                
-QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 <null>                                                             1              tid:7ff2755e9621-267c14ff-0000007f                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-0000007c                
-Row Count : 939
+QT_Ora9DS                                                          pg_catalog                                                         PostGIS_Lib_Version                                                <null>                                                             1              tid:7ff2755e9621-a35b9c90-000000a8                
+QT_Ora9DS                                                          pg_catalog                                                         ST_asBinary                                                        <null>                                                             1              tid:7ff2755e9621-09fddaf1-000000a7                
+QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         <null>                                                             1              tid:7ff2755e9621-e548fc4c-000000b2                
+QT_Ora9DS                                                          pg_catalog                                                         col_description                                                    <null>                                                             1              tid:7ff2755e9621-c26d23bd-000000a5                
+QT_Ora9DS                                                          pg_catalog                                                         current_schema                                                     <null>                                                             1              tid:7ff2755e9621-a9550b27-000000a3                
+QT_Ora9DS                                                          pg_catalog                                                         encode                                                             <null>                                                             1              tid:7ff2755e9621-b2963e16-0000009e                
+QT_Ora9DS                                                          pg_catalog                                                         format_type                                                        <null>                                                             1              tid:7ff2755e9621-56f0b282-000000a2                
+QT_Ora9DS                                                          pg_catalog                                                         getOid                                                             <null>                                                             1              tid:7ff2755e9621-b5885e94-000000b3                
+QT_Ora9DS                                                          pg_catalog                                                         has_function_privilege                                             <null>                                                             1              tid:7ff2755e9621-6e44e0cf-000000ac                
+QT_Ora9DS                                                          pg_catalog                                                         has_schema_privilege                                               <null>                                                             1              tid:7ff2755e9621-2e936898-000000a0                
+QT_Ora9DS                                                          pg_catalog                                                         has_table_privilege                                                <null>                                                             1              tid:7ff2755e9621-daf4b7db-000000a1                
+QT_Ora9DS                                                          pg_catalog                                                         obj_description                                                    <null>                                                             1              tid:7ff2755e9621-a36cd4b4-0000009f                
+QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 <null>                                                             1              tid:7ff2755e9621-267c14ff-000000b5                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               <null>                                                             1              tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_userbyid                                                    <null>                                                             1              tid:7ff2755e9621-305ef60e-000000a4                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        <null>                                                             1              tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_table_is_visible                                                <null>                                                             1              tid:7ff2755e9621-17e348b6-000000af                
+QT_Ora9DS                                                          pg_catalog                                                         pg_type_is_visible                                                 <null>                                                             1              tid:7ff2755e9621-bb134e3a-000000b1                
+QT_Ora9DS                                                          pg_catalog                                                         postgis_geos_version                                               <null>                                                             1              tid:7ff2755e9621-f2edeb29-000000a9                
+QT_Ora9DS                                                          pg_catalog                                                         postgis_proj_version                                               <null>                                                             1              tid:7ff2755e9621-9161e844-000000aa                
+QT_Ora9DS                                                          pg_catalog                                                         postgis_version                                                    <null>                                                             1              tid:7ff2755e9621-36e9b5ca-000000ab                
+QT_Ora9DS                                                          pg_catalog                                                         regclass                                                           <null>                                                             1              tid:7ff2755e9621-d6842d64-0000009d                
+QT_Ora9DS                                                          pg_catalog                                                         version                                                            <null>                                                             1              tid:7ff2755e9621-14f51cd8-000000b4                
+Row Count : 960
 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    Function_CAT    string             SYS            Functions     255                   255           0         false            true             false       false                 0           true        true          false     false       
 SchemaName     12             QT_Ora9DS       java.lang.String    FUNCTION_SCHEM  string             SYS            Functions     255                   255           0         false            true             false       false                 1           true        true          false     false       
@@ -949,11 +970,16 @@ FUNCTION_TYPE  4              QT_Ora9DS       java.lang.Integer   FUNCTION_TYPE
 UID            12             QT_Ora9DS       java.lang.String    SPECIFIC_NAME   string             SYS            Functions     50                    50            0         false            true             false       false                 0           true        true          false     false       
 string                                                             string                                                             string                                                             string                                                             integer        string                                            
 Function_CAT                                                       FUNCTION_SCHEM                                                     FUNCTION_NAME                                                      REMARKS                                                            FUNCTION_TYPE  SPECIFIC_NAME                                     
-QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         <null>                                                             1              tid:7ff2755e9621-e548fc4c-0000007d                
-QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 <null>                                                             1              tid:7ff2755e9621-267c14ff-0000007f                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-0000007b                
-QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-0000007c                
-Row Count : 4
+QT_Ora9DS                                                          pg_catalog                                                         asPGVector                                                         <null>                                                             1              tid:7ff2755e9621-e548fc4c-000000b2                
+QT_Ora9DS                                                          pg_catalog                                                         pg_client_encoding                                                 <null>                                                             1              tid:7ff2755e9621-267c14ff-000000b5                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_constraintdef                                               <null>                                                             1              tid:7ff2755e9621-84079f97-000000b0                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-000000ad                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_expr                                                        <null>                                                             1              tid:7ff2755e9621-e8caf286-000000ae                
+QT_Ora9DS                                                          pg_catalog                                                         pg_get_userbyid                                                    <null>                                                             1              tid:7ff2755e9621-305ef60e-000000a4                
+QT_Ora9DS                                                          pg_catalog                                                         pg_has_role                                                        <null>                                                             1              tid:7ff2755e9621-7b642043-000000a6                
+QT_Ora9DS                                                          pg_catalog                                                         pg_table_is_visible                                                <null>                                                             1              tid:7ff2755e9621-17e348b6-000000af                
+QT_Ora9DS                                                          pg_catalog                                                         pg_type_is_visible                                                 <null>                                                             1              tid:7ff2755e9621-bb134e3a-000000b1                
+Row Count : 9
 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    Function_CAT    string             SYS            Functions     255                   255           0         false            true             false       false                 0           true        true          false     false       
 SchemaName     12             QT_Ora9DS       java.lang.String    FUNCTION_SCHEM  string             SYS            Functions     255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected
index 9fd364626b..7f04f7755c 100644
--- a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected
+++ b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected
@@ -39,17 +39,22 @@ QT_Ora9DS                                                          SYSADMIN
 QT_Ora9DS                                                          SYSADMIN                                                           Usage                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 QT_Ora9DS                                                          SYSADMIN                                                           VDBResources                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 QT_Ora9DS                                                          SYSADMIN                                                           Views                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         matpg_relatt                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_am                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_attrdef                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_attribute                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_database                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_description                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_index                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_inherits                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_namespace                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_prepared_xacts                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_stats                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_trigger                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_type                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_user                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
@@ -145,7 +150,7 @@ QT_Ora9DS                                                          XQTNestedDoc
 QT_Ora9DS                                                          XQTNestedDoc                                                       testOptimizableTempTable.MappingClasses.moveToRootTempTable        XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          XQTNestedDoc                                                       testRootTempTable.MappingClasses.TemporaryTable1                   XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          XQTRecursiveDoc                                                    testSimpleTempTable.MappingClasses.TemporaryTable1                 XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
-Row Count : 145
+Row Count : 150
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
index 5d0319e848..607bd742e5 100644
--- a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
+++ b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
@@ -39,17 +39,22 @@ QT_Ora9DS                                                          SYSADMIN
 QT_Ora9DS                                                          SYSADMIN                                                           Usage                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 QT_Ora9DS                                                          SYSADMIN                                                           VDBResources                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 QT_Ora9DS                                                          SYSADMIN                                                           Views                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
+QT_Ora9DS                                                          pg_catalog                                                         geography_columns                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         matpg_datatype                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         matpg_relatt                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_am                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_attrdef                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_attribute                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_class                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_constraint                                                      SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_database                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_description                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_index                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_inherits                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_namespace                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_prepared_xacts                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_proc                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+QT_Ora9DS                                                          pg_catalog                                                         pg_stats                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_trigger                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_type                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          pg_catalog                                                         pg_user                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
@@ -145,7 +150,7 @@ QT_Ora9DS                                                          XQTNestedDoc
 QT_Ora9DS                                                          XQTNestedDoc                                                       testOptimizableTempTable.MappingClasses.moveToRootTempTable        XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          XQTNestedDoc                                                       testRootTempTable.MappingClasses.TemporaryTable1                   XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 QT_Ora9DS                                                          XQTRecursiveDoc                                                    testSimpleTempTable.MappingClasses.TemporaryTable1                 XMLSTAGINGTABLE                                                    <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
-Row Count : 145
+Row Count : 150
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName                    12             QT_Ora9DS       java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 SchemaName                 12             QT_Ora9DS       java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected b/test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
index 00a9413e8c..7b03a72c5a 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
@@ -25,10 +25,10 @@ x                                                                  v
 x                                                                  v                                                                  expr23                                                             1005         _int2                                                              23      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr24                                                             1007         _int4                                                              24      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr25                                                             1016         _int8                                                              25      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
+x                                                                  v                                                                  expr26                                                             1031         _numeric                                                           26      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr27                                                             1031         _numeric                                                           27      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr28                                                             1021         _float4                                                            28      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr29                                                             1022         _float8                                                            29      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
-x                                                                  v                                                                  expr29                                                             1031         _numeric                                                           29      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr30                                                             1183         _time                                                              30      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr31                                                             1182         _date                                                              31      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
 x                                                                  v                                                                  expr32                                                             1115         _timestamp                                                         32      -1      -1           false       false        v        56           <null>                                                             0            -1           false     
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
index 2196f2e5b1..5f4df59f73 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
@@ -117,145 +117,147 @@ adrelid      adnum   adbin
 237          9       <null>                                                             <null>                                                           
 237          10      <null>                                                             <null>                                                           
 237          11      <null>                                                             <null>                                                           
-260          1       <null>                                                             <null>                                                           
-260          2       <null>                                                             <null>                                                           
-260          3       <null>                                                             <null>                                                           
-260          4       <null>                                                             <null>                                                           
-260          5       <null>                                                             <null>                                                           
-260          6       <null>                                                             <null>                                                           
-260          7       <null>                                                             <null>                                                           
-260          8       <null>                                                             <null>                                                           
-260          9       <null>                                                             <null>                                                           
-260          10      <null>                                                             <null>                                                           
-260          11      <null>                                                             <null>                                                           
-260          12      <null>                                                             <null>                                                           
-260          13      <null>                                                             <null>                                                           
-260          14      <null>                                                             <null>                                                           
-260          15      <null>                                                             <null>                                                           
-260          16      <null>                                                             <null>                                                           
-288          1       <null>                                                             <null>                                                           
-288          2       <null>                                                             <null>                                                           
-288          3       <null>                                                             <null>                                                           
-288          4       <null>                                                             <null>                                                           
-288          5       <null>                                                             <null>                                                           
-288          6       <null>                                                             <null>                                                           
-288          7       <null>                                                             <null>                                                           
-288          8       <null>                                                             <null>                                                           
-306          1       <null>                                                             <null>                                                           
-306          2       <null>                                                             <null>                                                           
-306          3       <null>                                                             <null>                                                           
-306          4       <null>                                                             <null>                                                           
-306          5       <null>                                                             <null>                                                           
-315          1       <null>                                                             <null>                                                           
-315          2       <null>                                                             <null>                                                           
-315          3       <null>                                                             <null>                                                           
-315          4       <null>                                                             <null>                                                           
-315          5       <null>                                                             <null>                                                           
-315          6       <null>                                                             <null>                                                           
-315          7       <null>                                                             <null>                                                           
-315          8       <null>                                                             <null>                                                           
-315          9       <null>                                                             <null>                                                           
-315          10      <null>                                                             <null>                                                           
-315          11      <null>                                                             <null>                                                           
-315          12      <null>                                                             <null>                                                           
-315          13      <null>                                                             <null>                                                           
-315          14      <null>                                                             <null>                                                           
-330          1       <null>                                                             <null>                                                           
-330          2       <null>                                                             <null>                                                           
-330          3       <null>                                                             <null>                                                           
-330          4       <null>                                                             <null>                                                           
-330          5       <null>                                                             <null>                                                           
-330          6       <null>                                                             <null>                                                           
-330          7       <null>                                                             <null>                                                           
-343          1       <null>                                                             <null>                                                           
-343          2       <null>                                                             <null>                                                           
-343          3       <null>                                                             <null>                                                           
-343          4       <null>                                                             <null>                                                           
-343          5       <null>                                                             <null>                                                           
-351          1       <null>                                                             <null>                                                           
-351          2       <null>                                                             <null>                                                           
-351          3       <null>                                                             <null>                                                           
-351          4       <null>                                                             <null>                                                           
-351          5       <null>                                                             <null>                                                           
-351          6       <null>                                                             <null>                                                           
-351          7       <null>                                                             <null>                                                           
-351          8       <null>                                                             <null>                                                           
-351          9       <null>                                                             <null>                                                           
-351          10      <null>                                                             <null>                                                           
-351          11      <null>                                                             <null>                                                           
-351          12      <null>                                                             <null>                                                           
-351          13      <null>                                                             <null>                                                           
-374          1       <null>                                                             <null>                                                           
-374          2       <null>                                                             <null>                                                           
-387          1       <null>                                                             <null>                                                           
-387          2       <null>                                                             <null>                                                           
-387          3       <null>                                                             <null>                                                           
-387          4       <null>                                                             <null>                                                           
-387          5       <null>                                                             <null>                                                           
-387          6       <null>                                                             <null>                                                           
-387          7       <null>                                                             <null>                                                           
-387          8       <null>                                                             <null>                                                           
-387          9       <null>                                                             <null>                                                           
-401          1       <null>                                                             <null>                                                           
-401          2       <null>                                                             <null>                                                           
-401          3       <null>                                                             <null>                                                           
-401          4       <null>                                                             <null>                                                           
-401          5       <null>                                                             <null>                                                           
-413          1       <null>                                                             <null>                                                           
-413          2       <null>                                                             <null>                                                           
-413          3       <null>                                                             <null>                                                           
-413          4       <null>                                                             <null>                                                           
-413          5       <null>                                                             <null>                                                           
-413          6       <null>                                                             <null>                                                           
-413          7       <null>                                                             <null>                                                           
-413          8       <null>                                                             <null>                                                           
-413          9       <null>                                                             <null>                                                           
-428          1       <null>                                                             <null>                                                           
-428          2       <null>                                                             <null>                                                           
-428          3       <null>                                                             <null>                                                           
-428          4       <null>                                                             <null>                                                           
-428          5       <null>                                                             <null>                                                           
-428          6       <null>                                                             <null>                                                           
-428          7       <null>                                                             <null>                                                           
-428          8       <null>                                                             <null>                                                           
-428          9       <null>                                                             <null>                                                           
-428          10      <null>                                                             <null>                                                           
-428          11      <null>                                                             <null>                                                           
-443          1       <null>                                                             <null>                                                           
-443          2       <null>                                                             <null>                                                           
-448          1       <null>                                                             <null>                                                           
-448          2       <null>                                                             <null>                                                           
-448          3       <null>                                                             <null>                                                           
-448          4       <null>                                                             <null>                                                           
-448          5       <null>                                                             <null>                                                           
-519          1       <null>                                                             <null>                                                           
-519          2       <null>                                                             <null>                                                           
-519          3       <null>                                                             <null>                                                           
-519          4       <null>                                                             <null>                                                           
-519          5       <null>                                                             <null>                                                           
-531          1       <null>                                                             <null>                                                           
-531          2       <null>                                                             <null>                                                           
-531          3       <null>                                                             <null>                                                           
-531          4       <null>                                                             <null>                                                           
-531          5       <null>                                                             <null>                                                           
-531          6       <null>                                                             <null>                                                           
-531          7       <null>                                                             <null>                                                           
-546          1       <null>                                                             <null>                                                           
-546          2       <null>                                                             <null>                                                           
-549          1       <null>                                                             <null>                                                           
-549          2       <null>                                                             <null>                                                           
-549          3       <null>                                                             <null>                                                           
-549          4       <null>                                                             <null>                                                           
-554          1       <null>                                                             <null>                                                           
-554          2       <null>                                                             <null>                                                           
-554          3       <null>                                                             <null>                                                           
-554          4       <null>                                                             <null>                                                           
-554          5       <null>                                                             <null>                                                           
-554          6       <null>                                                             <null>                                                           
-554          7       <null>                                                             <null>                                                           
-554          8       <null>                                                             <null>                                                           
-554          9       <null>                                                             <null>                                                           
-554          10      <null>                                                             <null>                                                           
+237          12      <null>                                                             <null>                                                           
+237          13      <null>                                                             <null>                                                           
+262          1       <null>                                                             <null>                                                           
+262          2       <null>                                                             <null>                                                           
+262          3       <null>                                                             <null>                                                           
+262          4       <null>                                                             <null>                                                           
+262          5       <null>                                                             <null>                                                           
+262          6       <null>                                                             <null>                                                           
+262          7       <null>                                                             <null>                                                           
+262          8       <null>                                                             <null>                                                           
+262          9       <null>                                                             <null>                                                           
+262          10      <null>                                                             <null>                                                           
+262          11      <null>                                                             <null>                                                           
+262          12      <null>                                                             <null>                                                           
+262          13      <null>                                                             <null>                                                           
+262          14      <null>                                                             <null>                                                           
+262          15      <null>                                                             <null>                                                           
+262          16      <null>                                                             <null>                                                           
+290          1       <null>                                                             <null>                                                           
+290          2       <null>                                                             <null>                                                           
+290          3       <null>                                                             <null>                                                           
+290          4       <null>                                                             <null>                                                           
+290          5       <null>                                                             <null>                                                           
+290          6       <null>                                                             <null>                                                           
+290          7       <null>                                                             <null>                                                           
+290          8       <null>                                                             <null>                                                           
+308          1       <null>                                                             <null>                                                           
+308          2       <null>                                                             <null>                                                           
+308          3       <null>                                                             <null>                                                           
+308          4       <null>                                                             <null>                                                           
+308          5       <null>                                                             <null>                                                           
+317          1       <null>                                                             <null>                                                           
+317          2       <null>                                                             <null>                                                           
+317          3       <null>                                                             <null>                                                           
+317          4       <null>                                                             <null>                                                           
+317          5       <null>                                                             <null>                                                           
+317          6       <null>                                                             <null>                                                           
+317          7       <null>                                                             <null>                                                           
+317          8       <null>                                                             <null>                                                           
+317          9       <null>                                                             <null>                                                           
+317          10      <null>                                                             <null>                                                           
+317          11      <null>                                                             <null>                                                           
+317          12      <null>                                                             <null>                                                           
+317          13      <null>                                                             <null>                                                           
+317          14      <null>                                                             <null>                                                           
+317          15      <null>                                                             <null>                                                           
+333          1       <null>                                                             <null>                                                           
+333          2       <null>                                                             <null>                                                           
+333          3       <null>                                                             <null>                                                           
+333          4       <null>                                                             <null>                                                           
+333          5       <null>                                                             <null>                                                           
+333          6       <null>                                                             <null>                                                           
+333          7       <null>                                                             <null>                                                           
+346          1       <null>                                                             <null>                                                           
+346          2       <null>                                                             <null>                                                           
+346          3       <null>                                                             <null>                                                           
+346          4       <null>                                                             <null>                                                           
+346          5       <null>                                                             <null>                                                           
+354          1       <null>                                                             <null>                                                           
+354          2       <null>                                                             <null>                                                           
+354          3       <null>                                                             <null>                                                           
+354          4       <null>                                                             <null>                                                           
+354          5       <null>                                                             <null>                                                           
+354          6       <null>                                                             <null>                                                           
+354          7       <null>                                                             <null>                                                           
+354          8       <null>                                                             <null>                                                           
+354          9       <null>                                                             <null>                                                           
+354          10      <null>                                                             <null>                                                           
+354          11      <null>                                                             <null>                                                           
+354          12      <null>                                                             <null>                                                           
+354          13      <null>                                                             <null>                                                           
+377          1       <null>                                                             <null>                                                           
+377          2       <null>                                                             <null>                                                           
+390          1       <null>                                                             <null>                                                           
+390          2       <null>                                                             <null>                                                           
+390          3       <null>                                                             <null>                                                           
+390          4       <null>                                                             <null>                                                           
+390          5       <null>                                                             <null>                                                           
+390          6       <null>                                                             <null>                                                           
+390          7       <null>                                                             <null>                                                           
+390          8       <null>                                                             <null>                                                           
+390          9       <null>                                                             <null>                                                           
+404          1       <null>                                                             <null>                                                           
+404          2       <null>                                                             <null>                                                           
+404          3       <null>                                                             <null>                                                           
+404          4       <null>                                                             <null>                                                           
+404          5       <null>                                                             <null>                                                           
+416          1       <null>                                                             <null>                                                           
+416          2       <null>                                                             <null>                                                           
+416          3       <null>                                                             <null>                                                           
+416          4       <null>                                                             <null>                                                           
+416          5       <null>                                                             <null>                                                           
+416          6       <null>                                                             <null>                                                           
+416          7       <null>                                                             <null>                                                           
+416          8       <null>                                                             <null>                                                           
+416          9       <null>                                                             <null>                                                           
+431          1       <null>                                                             <null>                                                           
+431          2       <null>                                                             <null>                                                           
+431          3       <null>                                                             <null>                                                           
+431          4       <null>                                                             <null>                                                           
+431          5       <null>                                                             <null>                                                           
+431          6       <null>                                                             <null>                                                           
+431          7       <null>                                                             <null>                                                           
+431          8       <null>                                                             <null>                                                           
+431          9       <null>                                                             <null>                                                           
+431          10      <null>                                                             <null>                                                           
+431          11      <null>                                                             <null>                                                           
+446          1       <null>                                                             <null>                                                           
+446          2       <null>                                                             <null>                                                           
+451          1       <null>                                                             <null>                                                           
+451          2       <null>                                                             <null>                                                           
+451          3       <null>                                                             <null>                                                           
+451          4       <null>                                                             <null>                                                           
+451          5       <null>                                                             <null>                                                           
+522          1       <null>                                                             <null>                                                           
+522          2       <null>                                                             <null>                                                           
+522          3       <null>                                                             <null>                                                           
+522          4       <null>                                                             <null>                                                           
+522          5       <null>                                                             <null>                                                           
+522          6       <null>                                                             <null>                                                           
+522          7       <null>                                                             <null>                                                           
+530          1       <null>                                                             <null>                                                           
+530          2       <null>                                                             <null>                                                           
+530          3       <null>                                                             <null>                                                           
+530          4       <null>                                                             <null>                                                           
+530          5       <null>                                                             <null>                                                           
+530          6       <null>                                                             <null>                                                           
+530          7       <null>                                                             <null>                                                           
+544          1       <null>                                                             <null>                                                           
+544          2       <null>                                                             <null>                                                           
+544          3       <null>                                                             <null>                                                           
+544          4       <null>                                                             <null>                                                           
+544          5       <null>                                                             <null>                                                           
+544          6       <null>                                                             <null>                                                           
+544          7       <null>                                                             <null>                                                           
+559          1       <null>                                                             <null>                                                           
+559          2       <null>                                                             <null>                                                           
+562          1       <null>                                                             <null>                                                           
+562          2       <null>                                                             <null>                                                           
+562          3       <null>                                                             <null>                                                           
+562          4       <null>                                                             <null>                                                           
 567          1       <null>                                                             <null>                                                           
 567          2       <null>                                                             <null>                                                           
 567          3       <null>                                                             <null>                                                           
@@ -265,67 +267,100 @@ adrelid      adnum   adbin
 567          7       <null>                                                             <null>                                                           
 567          8       <null>                                                             <null>                                                           
 567          9       <null>                                                             <null>                                                           
-579          1       <null>                                                             <null>                                                           
-579          2       <null>                                                             <null>                                                           
-579          3       <null>                                                             <null>                                                           
-579          4       <null>                                                             <null>                                                           
-579          5       <null>                                                             <null>                                                           
-579          6       <null>                                                             <null>                                                           
-579          7       <null>                                                             <null>                                                           
-579          8       <null>                                                             <null>                                                           
-579          9       <null>                                                             <null>                                                           
-589          1       <null>                                                             <null>                                                           
-589          2       <null>                                                             <null>                                                           
-589          3       <null>                                                             <null>                                                           
-589          4       <null>                                                             <null>                                                           
-594          1       <null>                                                             <null>                                                           
-594          2       <null>                                                             <null>                                                           
-594          3       <null>                                                             <null>                                                           
-594          4       <null>                                                             <null>                                                           
-594          5       <null>                                                             <null>                                                           
-594          6       <null>                                                             <null>                                                           
-594          7       <null>                                                             <null>                                                           
-594          8       <null>                                                             <null>                                                           
-594          9       <null>                                                             <null>                                                           
-594          10      <null>                                                             <null>                                                           
-607          1       <null>                                                             <null>                                                           
-607          2       <null>                                                             <null>                                                           
-610          1       <null>                                                             <null>                                                           
-610          2       <null>                                                             <null>                                                           
-610          3       <null>                                                             <null>                                                           
-610          4       <null>                                                             <null>                                                           
-610          5       <null>                                                             <null>                                                           
-610          6       <null>                                                             <null>                                                           
-610          7       <null>                                                             <null>                                                           
-610          8       <null>                                                             <null>                                                           
-610          9       <null>                                                             <null>                                                           
-610          10      <null>                                                             <null>                                                           
-623          1       <null>                                                             <null>                                                           
-623          2       <null>                                                             <null>                                                           
-623          3       <null>                                                             <null>                                                           
-623          4       <null>                                                             <null>                                                           
-623          5       <null>                                                             <null>                                                           
-623          6       <null>                                                             <null>                                                           
-623          7       <null>                                                             <null>                                                           
-623          8       <null>                                                             <null>                                                           
-623          9       <null>                                                             <null>                                                           
-633          1       <null>                                                             <null>                                                           
-633          2       <null>                                                             <null>                                                           
-633          3       <null>                                                             <null>                                                           
-633          4       <null>                                                             <null>                                                           
-633          5       <null>                                                             <null>                                                           
-633          6       <null>                                                             <null>                                                           
-633          7       <null>                                                             <null>                                                           
-633          8       <null>                                                             <null>                                                           
-633          9       <null>                                                             <null>                                                           
-633          10      <null>                                                             <null>                                                           
-633          11      <null>                                                             <null>                                                           
-633          12      <null>                                                             <null>                                                           
-646          1       <null>                                                             <null>                                                           
-646          2       <null>                                                             <null>                                                           
-646          3       <null>                                                             <null>                                                           
-646          4       <null>                                                             <null>                                                           
-Row Count : 325
+567          10      <null>                                                             <null>                                                           
+580          1       <null>                                                             <null>                                                           
+580          2       <null>                                                             <null>                                                           
+580          3       <null>                                                             <null>                                                           
+580          4       <null>                                                             <null>                                                           
+580          5       <null>                                                             <null>                                                           
+580          6       <null>                                                             <null>                                                           
+580          7       <null>                                                             <null>                                                           
+580          8       <null>                                                             <null>                                                           
+580          9       <null>                                                             <null>                                                           
+580          10      <null>                                                             <null>                                                           
+580          11      <null>                                                             <null>                                                           
+580          12      <null>                                                             <null>                                                           
+595          1       <null>                                                             <null>                                                           
+595          2       <null>                                                             <null>                                                           
+595          3       <null>                                                             <null>                                                           
+595          4       <null>                                                             <null>                                                           
+595          5       <null>                                                             <null>                                                           
+595          6       <null>                                                             <null>                                                           
+595          7       <null>                                                             <null>                                                           
+603          1       <null>                                                             <null>                                                           
+603          2       <null>                                                             <null>                                                           
+603          3       <null>                                                             <null>                                                           
+603          4       <null>                                                             <null>                                                           
+603          5       <null>                                                             <null>                                                           
+603          6       <null>                                                             <null>                                                           
+603          7       <null>                                                             <null>                                                           
+603          8       <null>                                                             <null>                                                           
+603          9       <null>                                                             <null>                                                           
+613          1       <null>                                                             <null>                                                           
+613          2       <null>                                                             <null>                                                           
+613          3       <null>                                                             <null>                                                           
+613          4       <null>                                                             <null>                                                           
+618          1       <null>                                                             <null>                                                           
+618          2       <null>                                                             <null>                                                           
+618          3       <null>                                                             <null>                                                           
+618          4       <null>                                                             <null>                                                           
+618          5       <null>                                                             <null>                                                           
+618          6       <null>                                                             <null>                                                           
+618          7       <null>                                                             <null>                                                           
+618          8       <null>                                                             <null>                                                           
+618          9       <null>                                                             <null>                                                           
+618          10      <null>                                                             <null>                                                           
+631          1       <null>                                                             <null>                                                           
+631          2       <null>                                                             <null>                                                           
+631          3       <null>                                                             <null>                                                           
+635          1       <null>                                                             <null>                                                           
+635          2       <null>                                                             <null>                                                           
+635          3       <null>                                                             <null>                                                           
+639          1       <null>                                                             <null>                                                           
+639          2       <null>                                                             <null>                                                           
+639          3       <null>                                                             <null>                                                           
+639          4       <null>                                                             <null>                                                           
+644          1       <null>                                                             <null>                                                           
+644          2       <null>                                                             <null>                                                           
+644          3       <null>                                                             <null>                                                           
+644          4       <null>                                                             <null>                                                           
+644          5       <null>                                                             <null>                                                           
+644          6       <null>                                                             <null>                                                           
+644          7       <null>                                                             <null>                                                           
+644          8       <null>                                                             <null>                                                           
+644          9       <null>                                                             <null>                                                           
+644          10      <null>                                                             <null>                                                           
+657          1       <null>                                                             <null>                                                           
+657          2       <null>                                                             <null>                                                           
+657          3       <null>                                                             <null>                                                           
+661          1       <null>                                                             <null>                                                           
+661          2       <null>                                                             <null>                                                           
+661          3       <null>                                                             <null>                                                           
+661          4       <null>                                                             <null>                                                           
+661          5       <null>                                                             <null>                                                           
+661          6       <null>                                                             <null>                                                           
+661          7       <null>                                                             <null>                                                           
+661          8       <null>                                                             <null>                                                           
+661          9       <null>                                                             <null>                                                           
+671          1       <null>                                                             <null>                                                           
+671          2       <null>                                                             <null>                                                           
+671          3       <null>                                                             <null>                                                           
+671          4       <null>                                                             <null>                                                           
+671          5       <null>                                                             <null>                                                           
+671          6       <null>                                                             <null>                                                           
+671          7       <null>                                                             <null>                                                           
+671          8       <null>                                                             <null>                                                           
+671          9       <null>                                                             <null>                                                           
+671          10      <null>                                                             <null>                                                           
+671          11      <null>                                                             <null>                                                           
+671          12      <null>                                                             <null>                                                           
+671          13      <null>                                                             <null>                                                           
+671          14      <null>                                                             <null>                                                           
+686          1       <null>                                                             <null>                                                           
+686          2       <null>                                                             <null>                                                           
+686          3       <null>                                                             <null>                                                           
+686          4       <null>                                                             <null>                                                           
+Row Count : 360
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 adrelid        4              PartsSupplier   java.lang.Integer   adrelid         integer            pg_catalog     pg_attrdef    11                    10            0         false            false            false       false                 1           true        true          true      false       
 adnum          5              PartsSupplier   java.lang.Short     adnum           short              pg_catalog     pg_attrdef    6                     5             0         false            false            false       false                 1           true        true          true      false       
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
index 4f7e3ef36b..1378eeab77 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
@@ -143,273 +143,308 @@ oid          attrelid     attname
 245          237          IsIndexed                                                          16           1       8       -1           true        false         false    
 246          237          RefKeyUID                                                          1043         -1      9       54           false       false         false    
 247          237          UID                                                                1043         -1      10      54           true        false         false    
-248          237          OID                                                                23           4       11      -1           false       false         false    
-250          249          VDBName                                                            1043         -1      1       259          true        false         false    
-251          249          SchemaName                                                         1043         -1      2       259          false       false         false    
-252          249          TableName                                                          1043         -1      3       2052         true        false         false    
-253          249          Name                                                               1043         -1      4       259          true        false         false    
-259          258          UID                                                                1043         -1      1       54           true        false         false    
-261          260          VDBName                                                            1043         -1      1       259          true        false         false    
-262          260          SchemaName                                                         1043         -1      2       259          false       false         false    
-263          260          ProcedureName                                                      1043         -1      3       259          true        false         false    
-264          260          Name                                                               1043         -1      4       259          true        false         false    
-265          260          DataType                                                           1043         -1      5       29           true        false         false    
-266          260          Position                                                           23           4       6       -1           true        false         false    
-267          260          Type                                                               1043         -1      7       104          true        false         false    
-268          260          Optional                                                           16           1       8       -1           true        false         false    
-269          260          Precision                                                          23           4       9       -1           true        false         false    
-270          260          TypeLength                                                         23           4       10      -1           true        false         false    
-271          260          Scale                                                              23           4       11      -1           true        false         false    
-272          260          Radix                                                              23           4       12      -1           true        false         false    
-273          260          NullType                                                           1043         -1      13      14           true        false         false    
-274          260          UID                                                                1043         -1      14      54           false       false         false    
-275          260          Description                                                        1043         -1      15      259          false       false         false    
-276          260          OID                                                                23           4       16      -1           false       false         false    
-278          277          VDBName                                                            1043         -1      1       259          true        false         false    
-279          277          SchemaName                                                         1043         -1      2       259          false       false         false    
-280          277          ProcedureName                                                      1043         -1      3       259          true        false         false    
-281          277          Name                                                               1043         -1      4       259          true        false         false    
-287          286          UID                                                                1043         -1      1       54           false       false         false    
-289          288          VDBName                                                            1043         -1      1       259          true        false         false    
-290          288          SchemaName                                                         1043         -1      2       259          false       false         false    
-291          288          Name                                                               1043         -1      3       259          true        false         false    
-292          288          NameInSource                                                       1043         -1      4       259          false       false         false    
-293          288          ReturnsResults                                                     16           1       5       -1           true        false         false    
-294          288          UID                                                                1043         -1      6       54           true        false         false    
-295          288          Description                                                        1043         -1      7       259          false       false         false    
-296          288          OID                                                                23           4       8       -1           false       false         false    
-298          297          VDBName                                                            1043         -1      1       259          true        false         false    
-299          297          SchemaName                                                         1043         -1      2       259          false       false         false    
-300          297          Name                                                               1043         -1      3       259          true        false         false    
-305          304          UID                                                                1043         -1      1       54           true        false         false    
-307          306          Name                                                               1043         -1      1       4004         true        false         false    
-308          306          Value                                                              1043         -1      2       4004         true        false         false    
-309          306          UID                                                                1043         -1      3       54           true        false         false    
-310          306          OID                                                                23           4       4       -1           false       false         false    
-311          306          ClobValue                                                          14939        -1      5       -1           false       false         false    
-313          312          UID                                                                1043         -1      1       54           true        false         false    
-314          312          Name                                                               1043         -1      2       4004         true        false         false    
-316          315          PKTABLE_CAT                                                        1043         -1      1       259          false       false         false    
-317          315          PKTABLE_SCHEM                                                      1043         -1      2       259          false       false         false    
-318          315          PKTABLE_NAME                                                       1043         -1      3       259          false       false         false    
-319          315          PKCOLUMN_NAME                                                      1043         -1      4       259          false       false         false    
-320          315          FKTABLE_CAT                                                        1043         -1      5       259          false       false         false    
-321          315          FKTABLE_SCHEM                                                      1043         -1      6       259          false       false         false    
-322          315          FKTABLE_NAME                                                       1043         -1      7       259          false       false         false    
-323          315          FKCOLUMN_NAME                                                      1043         -1      8       259          false       false         false    
-324          315          KEY_SEQ                                                            21           2       9       -1           false       false         false    
-325          315          UPDATE_RULE                                                        23           4       10      -1           false       false         false    
-326          315          DELETE_RULE                                                        23           4       11      -1           false       false         false    
-327          315          FK_NAME                                                            1043         -1      12      259          false       false         false    
-328          315          PK_NAME                                                            1043         -1      13      259          false       false         false    
-329          315          DEFERRABILITY                                                      23           4       14      -1           false       false         false    
-331          330          VDBName                                                            1043         -1      1       259          false       false         false    
-332          330          Name                                                               1043         -1      2       259          false       false         false    
-333          330          IsPhysical                                                         16           1       3       -1           true        false         false    
-334          330          UID                                                                1043         -1      4       54           true        false         false    
-335          330          Description                                                        1043         -1      5       259          false       false         false    
-336          330          PrimaryMetamodelURI                                                1043         -1      6       259          true        false         false    
-337          330          OID                                                                23           4       7       -1           false       false         false    
-339          338          VDBName                                                            1043         -1      1       259          false       false         false    
-340          338          Name                                                               1043         -1      2       259          false       false         false    
-342          341          UID                                                                1043         -1      1       54           true        false         false    
-344          343          srid                                                               23           4       1       -1           false       false         false    
-345          343          auth_name                                                          1043         -1      2       260          false       false         false    
-346          343          auth_srid                                                          23           4       3       -1           false       false         false    
-347          343          srtext                                                             1043         -1      4       2052         false       false         false    
-348          343          proj4text                                                          1043         -1      5       2052         false       false         false    
-350          349          srid                                                               23           4       1       -1           false       false         false    
-352          351          VDBName                                                            1043         -1      1       259          false       false         false    
-353          351          SchemaName                                                         1043         -1      2       259          false       false         false    
-354          351          Name                                                               1043         -1      3       259          true        false         false    
-355          351          Type                                                               1043         -1      4       24           true        false         false    
-356          351          NameInSource                                                       1043         -1      5       259          false       false         false    
-357          351          IsPhysical                                                         16           1       6       -1           true        false         false    
-358          351          SupportsUpdates                                                    16           1       7       -1           true        false         false    
-359          351          UID                                                                1043         -1      8       54           true        false         false    
-360          351          Cardinality                                                        23           4       9       -1           true        false         false    
-361          351          Description                                                        1043         -1      10      259          false       false         false    
-362          351          IsSystem                                                           16           1       11      -1           false       false         false    
-363          351          IsMaterialized                                                     16           1       12      -1           true        false         false    
-364          351          OID                                                                23           4       13      -1           false       false         false    
-366          365          VDBName                                                            1043         -1      1       259          false       false         false    
-367          365          SchemaName                                                         1043         -1      2       259          false       false         false    
-368          365          Name                                                               1043         -1      3       259          true        false         false    
-373          372          UID                                                                1043         -1      1       54           true        false         false    
-375          374          Name                                                               1043         -1      1       259          true        false         false    
-376          374          Version                                                            1043         -1      2       54           true        false         false    
+248          237          TableUID                                                           1043         -1      11      54           true        false         false    
+249          237          RefTableUID                                                        1043         -1      12      54           true        false         false    
+250          237          ColPositions                                                       1005         -1      13      -1           true        false         false    
+252          251          VDBName                                                            1043         -1      1       259          true        false         false    
+253          251          SchemaName                                                         1043         -1      2       259          false       false         false    
+254          251          TableName                                                          1043         -1      3       2052         true        false         false    
+255          251          Name                                                               1043         -1      4       259          true        false         false    
+261          260          UID                                                                1043         -1      1       54           true        false         false    
+263          262          VDBName                                                            1043         -1      1       259          true        false         false    
+264          262          SchemaName                                                         1043         -1      2       259          false       false         false    
+265          262          ProcedureName                                                      1043         -1      3       259          true        false         false    
+266          262          Name                                                               1043         -1      4       259          true        false         false    
+267          262          DataType                                                           1043         -1      5       29           true        false         false    
+268          262          Position                                                           23           4       6       -1           true        false         false    
+269          262          Type                                                               1043         -1      7       104          true        false         false    
+270          262          Optional                                                           16           1       8       -1           true        false         false    
+271          262          Precision                                                          23           4       9       -1           true        false         false    
+272          262          TypeLength                                                         23           4       10      -1           true        false         false    
+273          262          Scale                                                              23           4       11      -1           true        false         false    
+274          262          Radix                                                              23           4       12      -1           true        false         false    
+275          262          NullType                                                           1043         -1      13      14           true        false         false    
+276          262          UID                                                                1043         -1      14      54           false       false         false    
+277          262          Description                                                        1043         -1      15      259          false       false         false    
+278          262          OID                                                                23           4       16      -1           false       false         false    
+280          279          VDBName                                                            1043         -1      1       259          true        false         false    
+281          279          SchemaName                                                         1043         -1      2       259          false       false         false    
+282          279          ProcedureName                                                      1043         -1      3       259          true        false         false    
+283          279          Name                                                               1043         -1      4       259          true        false         false    
+289          288          UID                                                                1043         -1      1       54           false       false         false    
+291          290          VDBName                                                            1043         -1      1       259          true        false         false    
+292          290          SchemaName                                                         1043         -1      2       259          false       false         false    
+293          290          Name                                                               1043         -1      3       259          true        false         false    
+294          290          NameInSource                                                       1043         -1      4       259          false       false         false    
+295          290          ReturnsResults                                                     16           1       5       -1           true        false         false    
+296          290          UID                                                                1043         -1      6       54           true        false         false    
+297          290          Description                                                        1043         -1      7       259          false       false         false    
+298          290          OID                                                                23           4       8       -1           false       false         false    
+300          299          VDBName                                                            1043         -1      1       259          true        false         false    
+301          299          SchemaName                                                         1043         -1      2       259          false       false         false    
+302          299          Name                                                               1043         -1      3       259          true        false         false    
+307          306          UID                                                                1043         -1      1       54           true        false         false    
+309          308          Name                                                               1043         -1      1       4004         true        false         false    
+310          308          Value                                                              1043         -1      2       4004         true        false         false    
+311          308          UID                                                                1043         -1      3       54           true        false         false    
+312          308          OID                                                                23           4       4       -1           false       false         false    
+313          308          ClobValue                                                          25           -1      5       -1           false       false         false    
+315          314          UID                                                                1043         -1      1       54           true        false         false    
+316          314          Name                                                               1043         -1      2       4004         true        false         false    
+318          317          PKTABLE_CAT                                                        1043         -1      1       259          false       false         false    
+319          317          PKTABLE_SCHEM                                                      1043         -1      2       259          false       false         false    
+320          317          PKTABLE_NAME                                                       1043         -1      3       259          false       false         false    
+321          317          PKCOLUMN_NAME                                                      1043         -1      4       259          false       false         false    
+322          317          FKTABLE_CAT                                                        1043         -1      5       259          false       false         false    
+323          317          FKTABLE_SCHEM                                                      1043         -1      6       259          false       false         false    
+324          317          FKTABLE_NAME                                                       1043         -1      7       259          false       false         false    
+325          317          FKCOLUMN_NAME                                                      1043         -1      8       259          false       false         false    
+326          317          KEY_SEQ                                                            21           2       9       -1           false       false         false    
+327          317          UPDATE_RULE                                                        23           4       10      -1           false       false         false    
+328          317          DELETE_RULE                                                        23           4       11      -1           false       false         false    
+329          317          FK_NAME                                                            1043         -1      12      259          false       false         false    
+330          317          PK_NAME                                                            1043         -1      13      259          false       false         false    
+331          317          DEFERRABILITY                                                      23           4       14      -1           false       false         false    
+332          317          FK_UID                                                             1043         -1      15      54           false       false         false    
+334          333          VDBName                                                            1043         -1      1       259          false       false         false    
+335          333          Name                                                               1043         -1      2       259          false       false         false    
+336          333          IsPhysical                                                         16           1       3       -1           true        false         false    
+337          333          UID                                                                1043         -1      4       54           true        false         false    
+338          333          Description                                                        1043         -1      5       259          false       false         false    
+339          333          PrimaryMetamodelURI                                                1043         -1      6       259          true        false         false    
+340          333          OID                                                                23           4       7       -1           false       false         false    
+342          341          VDBName                                                            1043         -1      1       259          false       false         false    
+343          341          Name                                                               1043         -1      2       259          false       false         false    
+345          344          UID                                                                1043         -1      1       54           true        false         false    
+347          346          srid                                                               23           4       1       -1           false       false         false    
+348          346          auth_name                                                          1043         -1      2       260          false       false         false    
+349          346          auth_srid                                                          23           4       3       -1           false       false         false    
+350          346          srtext                                                             1043         -1      4       2052         false       false         false    
+351          346          proj4text                                                          1043         -1      5       2052         false       false         false    
+353          352          srid                                                               23           4       1       -1           false       false         false    
+355          354          VDBName                                                            1043         -1      1       259          false       false         false    
+356          354          SchemaName                                                         1043         -1      2       259          false       false         false    
+357          354          Name                                                               1043         -1      3       259          true        false         false    
+358          354          Type                                                               1043         -1      4       24           true        false         false    
+359          354          NameInSource                                                       1043         -1      5       259          false       false         false    
+360          354          IsPhysical                                                         16           1       6       -1           true        false         false    
+361          354          SupportsUpdates                                                    16           1       7       -1           true        false         false    
+362          354          UID                                                                1043         -1      8       54           true        false         false    
+363          354          Cardinality                                                        23           4       9       -1           true        false         false    
+364          354          Description                                                        1043         -1      10      259          false       false         false    
+365          354          IsSystem                                                           16           1       11      -1           false       false         false    
+366          354          IsMaterialized                                                     16           1       12      -1           true        false         false    
+367          354          OID                                                                23           4       13      -1           false       false         false    
+369          368          VDBName                                                            1043         -1      1       259          false       false         false    
+370          368          SchemaName                                                         1043         -1      2       259          false       false         false    
+371          368          Name                                                               1043         -1      3       259          true        false         false    
+376          375          UID                                                                1043         -1      1       54           true        false         false    
 378          377          Name                                                               1043         -1      1       259          true        false         false    
 379          377          Version                                                            1043         -1      2       54           true        false         false    
-388          387          VDBName                                                            1043         -1      1       259          true        false         false    
-389          387          SchemaName                                                         1043         -1      2       259          true        false         false    
-390          387          Name                                                               1043         -1      3       259          true        false         false    
-391          387          TargetSchemaName                                                   1043         -1      4       259          false       false         false    
-392          387          TargetName                                                         1043         -1      5       4004         false       false         false    
-393          387          Valid                                                              16           1       6       -1           false       false         false    
-394          387          LoadState                                                          1043         -1      7       259          false       false         false    
-395          387          Updated                                                            1114         8       8       -1           false       false         false    
-396          387          Cardinality                                                        23           4       9       -1           false       false         false    
-398          397          VDBName                                                            1043         -1      1       259          true        false         false    
-399          397          SchemaName                                                         1043         -1      2       259          true        false         false    
-400          397          Name                                                               1043         -1      3       259          true        false         false    
-402          401          VDBName                                                            1043         -1      1       259          true        false         false    
-403          401          SchemaName                                                         1043         -1      2       259          true        false         false    
-404          401          Name                                                               1043         -1      3       259          true        false         false    
-405          401          Body                                                               14939        -1      4       -1           true        false         false    
-406          401          UID                                                                1043         -1      5       54           true        false         false    
-408          407          VDBName                                                            1043         -1      1       259          true        false         false    
-409          407          SchemaName                                                         1043         -1      2       259          true        false         false    
-410          407          Name                                                               1043         -1      3       259          true        false         false    
-412          411          UID                                                                1043         -1      1       54           true        false         false    
-414          413          VDBName                                                            1043         -1      1       259          true        false         false    
-415          413          SchemaName                                                         1043         -1      2       259          true        false         false    
-416          413          TableName                                                          1043         -1      3       259          true        false         false    
-417          413          Name                                                               1043         -1      4       259          true        false         false    
-418          413          TriggerType                                                        1043         -1      5       54           true        false         false    
-419          413          TriggerEvent                                                       1043         -1      6       54           true        false         false    
-420          413          Status                                                             1043         -1      7       54           true        false         false    
-421          413          Body                                                               14939        -1      8       -1           false       false         false    
-422          413          TableUID                                                           1043         -1      9       54           true        false         false    
-424          423          VDBName                                                            1043         -1      1       259          true        false         false    
-425          423          SchemaName                                                         1043         -1      2       259          true        false         false    
-426          423          TableName                                                          1043         -1      3       259          true        false         false    
-427          423          Name                                                               1043         -1      4       259          true        false         false    
-429          428          VDBName                                                            1043         -1      1       259          true        false         false    
-430          428          UID                                                                1043         -1      2       54           true        false         false    
-431          428          object_type                                                        1043         -1      3       54           true        false         false    
-432          428          SchemaName                                                         1043         -1      4       259          true        false         false    
-433          428          Name                                                               1043         -1      5       259          true        false         false    
-434          428          ElementName                                                        1043         -1      6       259          false       false         false    
-435          428          Uses_UID                                                           1043         -1      7       54           true        false         false    
-436          428          Uses_object_type                                                   1043         -1      8       54           true        false         false    
-437          428          Uses_SchemaName                                                    1043         -1      9       259          true        false         false    
-438          428          Uses_Name                                                          1043         -1      10      259          true        false         false    
-439          428          Uses_ElementName                                                   1043         -1      11      259          false       false         false    
-441          440          UID                                                                1043         -1      1       54           true        false         false    
-442          440          Uses_UID                                                           1043         -1      2       54           true        false         false    
-444          443          resourcePath                                                       1043         -1      1       259          false       false         false    
-445          443          contents                                                           14939        -1      2       -1           false       false         false    
+381          380          Name                                                               1043         -1      1       259          true        false         false    
+382          380          Version                                                            1043         -1      2       54           true        false         false    
+391          390          VDBName                                                            1043         -1      1       259          true        false         false    
+392          390          SchemaName                                                         1043         -1      2       259          true        false         false    
+393          390          Name                                                               1043         -1      3       259          true        false         false    
+394          390          TargetSchemaName                                                   1043         -1      4       259          false       false         false    
+395          390          TargetName                                                         1043         -1      5       4004         false       false         false    
+396          390          Valid                                                              16           1       6       -1           false       false         false    
+397          390          LoadState                                                          1043         -1      7       259          false       false         false    
+398          390          Updated                                                            1114         8       8       -1           false       false         false    
+399          390          Cardinality                                                        23           4       9       -1           false       false         false    
+401          400          VDBName                                                            1043         -1      1       259          true        false         false    
+402          400          SchemaName                                                         1043         -1      2       259          true        false         false    
+403          400          Name                                                               1043         -1      3       259          true        false         false    
+405          404          VDBName                                                            1043         -1      1       259          true        false         false    
+406          404          SchemaName                                                         1043         -1      2       259          true        false         false    
+407          404          Name                                                               1043         -1      3       259          true        false         false    
+408          404          Body                                                               25           -1      4       -1           true        false         false    
+409          404          UID                                                                1043         -1      5       54           true        false         false    
+411          410          VDBName                                                            1043         -1      1       259          true        false         false    
+412          410          SchemaName                                                         1043         -1      2       259          true        false         false    
+413          410          Name                                                               1043         -1      3       259          true        false         false    
+415          414          UID                                                                1043         -1      1       54           true        false         false    
+417          416          VDBName                                                            1043         -1      1       259          true        false         false    
+418          416          SchemaName                                                         1043         -1      2       259          true        false         false    
+419          416          TableName                                                          1043         -1      3       259          true        false         false    
+420          416          Name                                                               1043         -1      4       259          true        false         false    
+421          416          TriggerType                                                        1043         -1      5       54           true        false         false    
+422          416          TriggerEvent                                                       1043         -1      6       54           true        false         false    
+423          416          Status                                                             1043         -1      7       54           true        false         false    
+424          416          Body                                                               25           -1      8       -1           false       false         false    
+425          416          TableUID                                                           1043         -1      9       54           true        false         false    
+427          426          VDBName                                                            1043         -1      1       259          true        false         false    
+428          426          SchemaName                                                         1043         -1      2       259          true        false         false    
+429          426          TableName                                                          1043         -1      3       259          true        false         false    
+430          426          Name                                                               1043         -1      4       259          true        false         false    
+432          431          VDBName                                                            1043         -1      1       259          true        false         false    
+433          431          UID                                                                1043         -1      2       54           true        false         false    
+434          431          object_type                                                        1043         -1      3       54           true        false         false    
+435          431          SchemaName                                                         1043         -1      4       259          true        false         false    
+436          431          Name                                                               1043         -1      5       259          true        false         false    
+437          431          ElementName                                                        1043         -1      6       259          false       false         false    
+438          431          Uses_UID                                                           1043         -1      7       54           true        false         false    
+439          431          Uses_object_type                                                   1043         -1      8       54           true        false         false    
+440          431          Uses_SchemaName                                                    1043         -1      9       259          true        false         false    
+441          431          Uses_Name                                                          1043         -1      10      259          true        false         false    
+442          431          Uses_ElementName                                                   1043         -1      11      259          false       false         false    
+444          443          UID                                                                1043         -1      1       54           true        false         false    
+445          443          Uses_UID                                                           1043         -1      2       54           true        false         false    
 447          446          resourcePath                                                       1043         -1      1       259          false       false         false    
-449          448          VDBName                                                            1043         -1      1       259          true        false         false    
-450          448          SchemaName                                                         1043         -1      2       259          true        false         false    
-451          448          Name                                                               1043         -1      3       259          true        false         false    
-452          448          Body                                                               14939        -1      4       -1           true        false         false    
-453          448          UID                                                                1043         -1      5       54           true        false         false    
-455          454          VDBName                                                            1043         -1      1       259          true        false         false    
-456          454          SchemaName                                                         1043         -1      2       259          true        false         false    
-457          454          Name                                                               1043         -1      3       259          true        false         false    
-459          458          UID                                                                1043         -1      1       54           true        false         false    
-520          519          oid                                                                23           4       1       -1           false       false         false    
-521          519          typname                                                            1043         -1      2       4004         false       false         false    
-522          519          name                                                               1043         -1      3       4004         false       false         false    
-523          519          uid                                                                1043         -1      4       4004         false       false         false    
-524          519          typlen                                                             21           2       5       -1           false       false         false    
-526          525          oid                                                                23           4       1       -1           false       false         false    
-527          525          name                                                               1043         -1      2       4004         false       false         false    
-529          528          typname                                                            1043         -1      1       4004         false       false         false    
-530          528          oid                                                                23           4       2       -1           false       false         false    
-532          531          attrelid                                                           23           4       1       -1           false       false         false    
-533          531          attnum                                                             21           2       2       -1           false       false         false    
-534          531          attname                                                            1043         -1      3       4004         false       false         false    
-535          531          relname                                                            1043         -1      4       4004         false       false         false    
-536          531          nspname                                                            1043         -1      5       4004         false       false         false    
-537          531          autoinc                                                            16           1       6       -1           false       false         false    
-538          531          typoid                                                             23           4       7       -1           false       false         false    
-540          539          attname                                                            1043         -1      1       4004         false       false         false    
-541          539          relname                                                            1043         -1      2       4004         false       false         false    
-542          539          nspname                                                            1043         -1      3       4004         false       false         false    
-544          543          attrelid                                                           23           4       1       -1           false       false         false    
-545          543          attnum                                                             21           2       2       -1           false       false         false    
-547          546          oid                                                                23           4       1       -1           false       false         false    
-548          546          amname                                                             1043         -1      2       4004         false       false         false    
-550          549          adrelid                                                            23           4       1       -1           false       false         false    
-551          549          adnum                                                              21           2       2       -1           false       false         false    
-552          549          adbin                                                              1043         -1      3       4004         false       false         false    
-553          549          adsrc                                                              1043         -1      4       4004         false       false         false    
-555          554          oid                                                                23           4       1       -1           false       false         false    
-556          554          attrelid                                                           23           4       2       -1           false       false         false    
-557          554          attname                                                            1043         -1      3       4004         false       false         false    
-558          554          atttypid                                                           23           4       4       -1           false       false         false    
-559          554          attlen                                                             21           2       5       -1           false       false         false    
-560          554          attnum                                                             21           2       6       -1           false       false         false    
-561          554          atttypmod                                                          23           4       7       -1           false       false         false    
-562          554          attnotnull                                                         16           1       8       -1           false       false         false    
-563          554          attisdropped                                                       16           1       9       -1           false       false         false    
-564          554          atthasdef                                                          16           1       10      -1           false       false         false    
-566          565          oid                                                                23           4       1       -1           false       false         false    
+448          446          contents                                                           17           -1      2       -1           false       false         false    
+450          449          resourcePath                                                       1043         -1      1       259          false       false         false    
+452          451          VDBName                                                            1043         -1      1       259          true        false         false    
+453          451          SchemaName                                                         1043         -1      2       259          true        false         false    
+454          451          Name                                                               1043         -1      3       259          true        false         false    
+455          451          Body                                                               25           -1      4       -1           true        false         false    
+456          451          UID                                                                1043         -1      5       54           true        false         false    
+458          457          VDBName                                                            1043         -1      1       259          true        false         false    
+459          457          SchemaName                                                         1043         -1      2       259          true        false         false    
+460          457          Name                                                               1043         -1      3       259          true        false         false    
+462          461          UID                                                                1043         -1      1       54           true        false         false    
+523          522          f_table_catalog                                                    1043         -1      1       4004         false       false         false    
+524          522          f_table_schema                                                     1043         -1      2       4004         false       false         false    
+525          522          f_table_name                                                       1043         -1      3       4004         false       false         false    
+526          522          f_geography_column                                                 1043         -1      4       4004         false       false         false    
+527          522          coord_dimension                                                    23           4       5       -1           false       false         false    
+528          522          srid                                                               23           4       6       -1           false       false         false    
+529          522          type                                                               1043         -1      7       4004         false       false         false    
+531          530          oid                                                                23           4       1       -1           false       false         false    
+532          530          typname                                                            1043         -1      2       4004         false       false         false    
+533          530          name                                                               1043         -1      3       4004         false       false         false    
+534          530          typlen                                                             21           2       4       -1           false       false         false    
+535          530          typtype                                                            1043         -1      5       5            false       false         false    
+536          530          typbasetype                                                        23           4       6       -1           false       false         false    
+537          530          typtypmod                                                          23           4       7       -1           false       false         false    
+539          538          oid                                                                23           4       1       -1           false       false         false    
+540          538          name                                                               1043         -1      2       4004         false       false         false    
+542          541          typname                                                            1043         -1      1       4004         false       false         false    
+543          541          oid                                                                23           4       2       -1           false       false         false    
+545          544          attrelid                                                           23           4       1       -1           false       false         false    
+546          544          attnum                                                             21           2       2       -1           false       false         false    
+547          544          attname                                                            1043         -1      3       4004         false       false         false    
+548          544          relname                                                            1043         -1      4       4004         false       false         false    
+549          544          nspname                                                            1043         -1      5       4004         false       false         false    
+550          544          autoinc                                                            16           1       6       -1           false       false         false    
+551          544          typoid                                                             23           4       7       -1           false       false         false    
+553          552          attname                                                            1043         -1      1       4004         false       false         false    
+554          552          relname                                                            1043         -1      2       4004         false       false         false    
+555          552          nspname                                                            1043         -1      3       4004         false       false         false    
+557          556          attrelid                                                           23           4       1       -1           false       false         false    
+558          556          attnum                                                             21           2       2       -1           false       false         false    
+560          559          oid                                                                23           4       1       -1           false       false         false    
+561          559          amname                                                             1043         -1      2       4004         false       false         false    
+563          562          adrelid                                                            23           4       1       -1           false       false         false    
+564          562          adnum                                                              21           2       2       -1           false       false         false    
+565          562          adbin                                                              1043         -1      3       4004         false       false         false    
+566          562          adsrc                                                              1043         -1      4       4004         false       false         false    
 568          567          oid                                                                23           4       1       -1           false       false         false    
-569          567          relname                                                            1043         -1      2       4004         false       false         false    
-570          567          relnamespace                                                       23           4       3       -1           false       false         false    
-571          567          relkind                                                            1042         1       4       5            false       false         false    
-572          567          relam                                                              23           4       5       -1           false       false         false    
-573          567          reltuples                                                          700          4       6       -1           false       false         false    
-574          567          relpages                                                           23           4       7       -1           false       false         false    
-575          567          relhasrules                                                        16           1       8       -1           false       false         false    
-576          567          relhasoids                                                         16           1       9       -1           false       false         false    
-578          577          oid                                                                23           4       1       -1           false       false         false    
-580          579          oid                                                                23           4       1       -1           false       false         false    
-581          579          datname                                                            1043         -1      2       4004         false       false         false    
-582          579          encoding                                                           23           4       3       -1           false       false         false    
-583          579          datlastsysoid                                                      23           4       4       -1           false       false         false    
-584          579          datallowconn                                                       1042         1       5       5            false       false         false    
-585          579          datconfig                                                          705          -2      6       -1           false       false         false    
-586          579          datacl                                                             705          -2      7       -1           false       false         false    
-587          579          datdba                                                             23           4       8       -1           false       false         false    
-588          579          dattablespace                                                      23           4       9       -1           false       false         false    
-590          589          objoid                                                             23           4       1       -1           false       false         false    
-591          589          classoid                                                           23           4       2       -1           false       false         false    
-592          589          objsubid                                                           23           4       3       -1           false       false         false    
-593          589          description                                                        1043         -1      4       4004         false       false         false    
-595          594          oid                                                                23           4       1       -1           false       false         false    
-596          594          indexrelid                                                         23           4       2       -1           false       false         false    
-597          594          indrelid                                                           23           4       3       -1           false       false         false    
-598          594          indnatts                                                           21           2       4       -1           false       false         false    
-599          594          indisclustered                                                     16           1       5       -1           false       false         false    
-600          594          indisunique                                                        16           1       6       -1           false       false         false    
-601          594          indisprimary                                                       16           1       7       -1           false       false         false    
-602          594          indkey                                                             <null>       <null>  8       -1           false       false         false    
-603          594          indexprs                                                           1043         -1      9       4004         false       false         false    
-604          594          indpred                                                            1043         -1      10      4004         false       false         false    
-606          605          oid                                                                23           4       1       -1           false       false         false    
-608          607          oid                                                                23           4       1       -1           false       false         false    
-609          607          nspname                                                            1043         -1      2       4004         false       false         false    
-611          610          oid                                                                23           4       1       -1           false       false         false    
-612          610          proname                                                            1043         -1      2       4004         false       false         false    
-613          610          proretset                                                          16           1       3       -1           false       false         false    
-614          610          prorettype                                                         23           4       4       -1           false       false         false    
-615          610          pronargs                                                           21           2       5       -1           false       false         false    
-616          610          proargtypes                                                        <null>       <null>  6       -1           false       false         false    
-617          610          proargnames                                                        <null>       <null>  7       -1           false       false         false    
-618          610          proargmodes                                                        <null>       <null>  8       -1           false       false         false    
-619          610          proallargtypes                                                     <null>       <null>  9       -1           false       false         false    
-620          610          pronamespace                                                       23           4       10      -1           false       false         false    
-622          621          oid                                                                23           4       1       -1           false       false         false    
-624          623          oid                                                                23           4       1       -1           false       false         false    
-625          623          tgconstrrelid                                                      23           4       2       -1           false       false         false    
-626          623          tgfoid                                                             23           4       3       -1           false       false         false    
-627          623          tgargs                                                             23           4       4       -1           false       false         false    
-628          623          tgnargs                                                            23           4       5       -1           false       false         false    
-629          623          tgdeferrable                                                       16           1       6       -1           false       false         false    
-630          623          tginitdeferred                                                     16           1       7       -1           false       false         false    
-631          623          tgconstrname                                                       1043         -1      8       4004         false       false         false    
-632          623          tgrelid                                                            23           4       9       -1           false       false         false    
-634          633          oid                                                                23           4       1       -1           false       false         false    
-635          633          typname                                                            1043         -1      2       4004         false       false         false    
-636          633          typnamespace                                                       23           4       3       -1           false       false         false    
-637          633          typlen                                                             21           2       4       -1           false       false         false    
-638          633          typtype                                                            1042         1       5       5            false       false         false    
-639          633          typnotnull                                                         16           1       6       -1           false       false         false    
-640          633          typbasetype                                                        23           4       7       -1           false       false         false    
-641          633          typtypmod                                                          23           4       8       -1           false       false         false    
-642          633          typdelim                                                           1042         1       9       5            false       false         false    
-643          633          typrelid                                                           23           4       10      -1           false       false         false    
-644          633          typelem                                                            23           4       11      -1           false       false         false    
-645          633          typinput                                                           23           4       12      -1           false       false         false    
-647          646          oid                                                                23           4       1       -1           false       false         false    
-648          646          usename                                                            1043         -1      2       4004         false       false         false    
-649          646          usecreatedb                                                        16           1       3       -1           false       false         false    
-650          646          usesuper                                                           16           1       4       -1           false       false         false    
-Row Count : 409
+569          567          attrelid                                                           23           4       2       -1           false       false         false    
+570          567          attname                                                            1043         -1      3       4004         false       false         false    
+571          567          atttypid                                                           23           4       4       -1           false       false         false    
+572          567          attlen                                                             21           2       5       -1           false       false         false    
+573          567          attnum                                                             21           2       6       -1           false       false         false    
+574          567          atttypmod                                                          23           4       7       -1           false       false         false    
+575          567          attnotnull                                                         16           1       8       -1           false       false         false    
+576          567          attisdropped                                                       16           1       9       -1           false       false         false    
+577          567          atthasdef                                                          16           1       10      -1           false       false         false    
+579          578          oid                                                                23           4       1       -1           false       false         false    
+581          580          oid                                                                23           4       1       -1           false       false         false    
+582          580          relname                                                            1043         -1      2       4004         false       false         false    
+583          580          relnamespace                                                       23           4       3       -1           false       false         false    
+584          580          relkind                                                            1043         -1      4       5            false       false         false    
+585          580          relowner                                                           23           4       5       -1           false       false         false    
+586          580          relam                                                              23           4       6       -1           false       false         false    
+587          580          reltuples                                                          700          4       7       -1           false       false         false    
+588          580          relpages                                                           23           4       8       -1           false       false         false    
+589          580          relhasrules                                                        16           1       9       -1           false       false         false    
+590          580          relhasoids                                                         16           1       10      -1           false       false         false    
+591          580          relnspname                                                         1043         -1      11      4004         false       false         false    
+592          580          reloptions                                                         1015         -1      12      -1           false       false         false    
+594          593          oid                                                                23           4       1       -1           false       false         false    
+596          595          oid                                                                23           4       1       -1           false       false         false    
+597          595          conname                                                            1043         -1      2       4004         false       false         false    
+598          595          contype                                                            1043         -1      3       4004         false       false         false    
+599          595          consrc                                                             1043         -1      4       4004         false       false         false    
+600          595          conrelid                                                           23           4       5       -1           false       false         false    
+601          595          confrelid                                                          23           4       6       -1           false       false         false    
+602          595          conkey                                                             1005         -1      7       -1           false       false         false    
+604          603          oid                                                                23           4       1       -1           false       false         false    
+605          603          datname                                                            1043         -1      2       4004         false       false         false    
+606          603          encoding                                                           23           4       3       -1           false       false         false    
+607          603          datlastsysoid                                                      23           4       4       -1           false       false         false    
+608          603          datallowconn                                                       1043         -1      5       5            false       false         false    
+609          603          datconfig                                                          705          -2      6       -1           false       false         false    
+610          603          datacl                                                             705          -2      7       -1           false       false         false    
+611          603          datdba                                                             23           4       8       -1           false       false         false    
+612          603          dattablespace                                                      23           4       9       -1           false       false         false    
+614          613          objoid                                                             23           4       1       -1           false       false         false    
+615          613          classoid                                                           23           4       2       -1           false       false         false    
+616          613          objsubid                                                           23           4       3       -1           false       false         false    
+617          613          description                                                        1043         -1      4       4004         false       false         false    
+619          618          oid                                                                23           4       1       -1           false       false         false    
+620          618          indexrelid                                                         23           4       2       -1           false       false         false    
+621          618          indrelid                                                           23           4       3       -1           false       false         false    
+622          618          indnatts                                                           21           2       4       -1           false       false         false    
+623          618          indisclustered                                                     16           1       5       -1           false       false         false    
+624          618          indisunique                                                        16           1       6       -1           false       false         false    
+625          618          indisprimary                                                       16           1       7       -1           false       false         false    
+626          618          indkey                                                             1005         -1      8       -1           false       false         false    
+627          618          indexprs                                                           1043         -1      9       4004         false       false         false    
+628          618          indpred                                                            1043         -1      10      4004         false       false         false    
+630          629          oid                                                                23           4       1       -1           false       false         false    
+632          631          inhrelid                                                           23           4       1       -1           false       false         false    
+633          631          inhparent                                                          23           4       2       -1           false       false         false    
+634          631          inhseqno                                                           23           4       3       -1           false       false         false    
+636          635          oid                                                                23           4       1       -1           false       false         false    
+637          635          nspname                                                            1043         -1      2       4004         false       false         false    
+638          635          nspowner                                                           23           4       3       -1           false       false         false    
+640          639          transaction                                                        1043         -1      1       4004         false       false         false    
+641          639          gid                                                                1043         -1      2       4004         false       false         false    
+642          639          owner                                                              1043         -1      3       4004         false       false         false    
+643          639          database                                                           1043         -1      4       4004         false       false         false    
+645          644          oid                                                                23           4       1       -1           false       false         false    
+646          644          proname                                                            1043         -1      2       4004         false       false         false    
+647          644          proretset                                                          16           1       3       -1           false       false         false    
+648          644          prorettype                                                         23           4       4       -1           false       false         false    
+649          644          pronargs                                                           21           2       5       -1           false       false         false    
+650          644          proargtypes                                                        1007         -1      6       -1           false       false         false    
+651          644          proargnames                                                        1015         -1      7       -1           false       false         false    
+652          644          proargmodes                                                        1015         -1      8       -1           false       false         false    
+653          644          proallargtypes                                                     1007         -1      9       -1           false       false         false    
+654          644          pronamespace                                                       23           4       10      -1           false       false         false    
+656          655          oid                                                                23           4       1       -1           false       false         false    
+658          657          schemaname                                                         1043         -1      1       4004         false       false         false    
+659          657          tablename                                                          1043         -1      2       4004         false       false         false    
+660          657          attname                                                            1043         -1      3       4004         false       false         false    
+662          661          oid                                                                23           4       1       -1           false       false         false    
+663          661          tgconstrrelid                                                      23           4       2       -1           false       false         false    
+664          661          tgfoid                                                             23           4       3       -1           false       false         false    
+665          661          tgargs                                                             23           4       4       -1           false       false         false    
+666          661          tgnargs                                                            23           4       5       -1           false       false         false    
+667          661          tgdeferrable                                                       16           1       6       -1           false       false         false    
+668          661          tginitdeferred                                                     16           1       7       -1           false       false         false    
+669          661          tgconstrname                                                       1043         -1      8       4004         false       false         false    
+670          661          tgrelid                                                            23           4       9       -1           false       false         false    
+672          671          oid                                                                23           4       1       -1           false       false         false    
+673          671          typname                                                            1043         -1      2       4004         false       false         false    
+674          671          typnamespace                                                       23           4       3       -1           false       false         false    
+675          671          typlen                                                             21           2       4       -1           false       false         false    
+676          671          typtype                                                            1043         -1      5       5            false       false         false    
+677          671          typnotnull                                                         16           1       6       -1           false       false         false    
+678          671          typbasetype                                                        23           4       7       -1           false       false         false    
+679          671          typtypmod                                                          23           4       8       -1           false       false         false    
+680          671          typdelim                                                           1043         -1      9       5            false       false         false    
+681          671          typrelid                                                           23           4       10      -1           false       false         false    
+682          671          typelem                                                            23           4       11      -1           false       false         false    
+683          671          typinput                                                           23           4       12      -1           false       false         false    
+684          671          typdefault                                                         1043         -1      13      4004         false       false         false    
+685          671          teiid_name                                                         1043         -1      14      4004         false       false         false    
+687          686          oid                                                                23           4       1       -1           false       false         false    
+688          686          usename                                                            1043         -1      2       4004         false       false         false    
+689          686          usecreatedb                                                        16           1       3       -1           false       false         false    
+690          686          usesuper                                                           16           1       4       -1           false       false         false    
+Row Count : 444
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid            4              PartsSupplier   java.lang.Integer   oid             integer            pg_catalog     pg_attribute  11                    10            0         false            false            false       false                 1           true        true          true      false       
 attrelid       4              PartsSupplier   java.lang.Integer   attrelid        integer            pg_catalog     pg_attribute  11                    10            0         false            false            false       false                 1           true        true          true      false       
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
index 8cad29d389..2899da052b 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
@@ -1,6 +1,6 @@
 integer      integer      string                                                             integer      short   short   integer      boolean     boolean       boolean  
 oid          attrelid     attname                                                            atttypid     attlen  attnum  atttypmod    attnotnull  attisdropped  atthasdef
-57           56           c                                                                  1700         -1      1       2147483647   false       false         false    
+57           56           c                                                                  1700         -1      1       2147450883   false       false         false    
 60           59           VDBName                                                            1043         -1      1       259          true        false         false    
 61           59           SchemaName                                                         1043         -1      2       259          false       false         false    
 62           59           TableName                                                          1043         -1      3       259          true        false         false    
@@ -121,273 +121,308 @@ oid          attrelid     attname
 208          200          IsIndexed                                                          16           1       8       -1           true        false         false    
 209          200          RefKeyUID                                                          1043         -1      9       54           false       false         false    
 210          200          UID                                                                1043         -1      10      54           true        false         false    
-211          200          OID                                                                23           4       11      -1           false       false         false    
-213          212          VDBName                                                            1043         -1      1       259          true        false         false    
-214          212          SchemaName                                                         1043         -1      2       259          false       false         false    
-215          212          TableName                                                          1043         -1      3       2052         true        false         false    
-216          212          Name                                                               1043         -1      4       259          true        false         false    
-222          221          UID                                                                1043         -1      1       54           true        false         false    
-224          223          VDBName                                                            1043         -1      1       259          true        false         false    
-225          223          SchemaName                                                         1043         -1      2       259          false       false         false    
-226          223          ProcedureName                                                      1043         -1      3       259          true        false         false    
-227          223          Name                                                               1043         -1      4       259          true        false         false    
-228          223          DataType                                                           1043         -1      5       29           true        false         false    
-229          223          Position                                                           23           4       6       -1           true        false         false    
-230          223          Type                                                               1043         -1      7       104          true        false         false    
-231          223          Optional                                                           16           1       8       -1           true        false         false    
-232          223          Precision                                                          23           4       9       -1           true        false         false    
-233          223          TypeLength                                                         23           4       10      -1           true        false         false    
-234          223          Scale                                                              23           4       11      -1           true        false         false    
-235          223          Radix                                                              23           4       12      -1           true        false         false    
-236          223          NullType                                                           1043         -1      13      14           true        false         false    
-237          223          UID                                                                1043         -1      14      54           false       false         false    
-238          223          Description                                                        1043         -1      15      259          false       false         false    
-239          223          OID                                                                23           4       16      -1           false       false         false    
-241          240          VDBName                                                            1043         -1      1       259          true        false         false    
-242          240          SchemaName                                                         1043         -1      2       259          false       false         false    
-243          240          ProcedureName                                                      1043         -1      3       259          true        false         false    
-244          240          Name                                                               1043         -1      4       259          true        false         false    
-250          249          UID                                                                1043         -1      1       54           false       false         false    
-252          251          VDBName                                                            1043         -1      1       259          true        false         false    
-253          251          SchemaName                                                         1043         -1      2       259          false       false         false    
-254          251          Name                                                               1043         -1      3       259          true        false         false    
-255          251          NameInSource                                                       1043         -1      4       259          false       false         false    
-256          251          ReturnsResults                                                     16           1       5       -1           true        false         false    
-257          251          UID                                                                1043         -1      6       54           true        false         false    
-258          251          Description                                                        1043         -1      7       259          false       false         false    
-259          251          OID                                                                23           4       8       -1           false       false         false    
-261          260          VDBName                                                            1043         -1      1       259          true        false         false    
-262          260          SchemaName                                                         1043         -1      2       259          false       false         false    
-263          260          Name                                                               1043         -1      3       259          true        false         false    
-268          267          UID                                                                1043         -1      1       54           true        false         false    
-270          269          Name                                                               1043         -1      1       4004         true        false         false    
-271          269          Value                                                              1043         -1      2       4004         true        false         false    
-272          269          UID                                                                1043         -1      3       54           true        false         false    
-273          269          OID                                                                23           4       4       -1           false       false         false    
-274          269          ClobValue                                                          14939        -1      5       -1           false       false         false    
-276          275          UID                                                                1043         -1      1       54           true        false         false    
-277          275          Name                                                               1043         -1      2       4004         true        false         false    
-279          278          PKTABLE_CAT                                                        1043         -1      1       259          false       false         false    
-280          278          PKTABLE_SCHEM                                                      1043         -1      2       259          false       false         false    
-281          278          PKTABLE_NAME                                                       1043         -1      3       259          false       false         false    
-282          278          PKCOLUMN_NAME                                                      1043         -1      4       259          false       false         false    
-283          278          FKTABLE_CAT                                                        1043         -1      5       259          false       false         false    
-284          278          FKTABLE_SCHEM                                                      1043         -1      6       259          false       false         false    
-285          278          FKTABLE_NAME                                                       1043         -1      7       259          false       false         false    
-286          278          FKCOLUMN_NAME                                                      1043         -1      8       259          false       false         false    
-287          278          KEY_SEQ                                                            21           2       9       -1           false       false         false    
-288          278          UPDATE_RULE                                                        23           4       10      -1           false       false         false    
-289          278          DELETE_RULE                                                        23           4       11      -1           false       false         false    
-290          278          FK_NAME                                                            1043         -1      12      259          false       false         false    
-291          278          PK_NAME                                                            1043         -1      13      259          false       false         false    
-292          278          DEFERRABILITY                                                      23           4       14      -1           false       false         false    
-294          293          VDBName                                                            1043         -1      1       259          false       false         false    
-295          293          Name                                                               1043         -1      2       259          false       false         false    
-296          293          IsPhysical                                                         16           1       3       -1           true        false         false    
-297          293          UID                                                                1043         -1      4       54           true        false         false    
-298          293          Description                                                        1043         -1      5       259          false       false         false    
-299          293          PrimaryMetamodelURI                                                1043         -1      6       259          true        false         false    
-300          293          OID                                                                23           4       7       -1           false       false         false    
-302          301          VDBName                                                            1043         -1      1       259          false       false         false    
-303          301          Name                                                               1043         -1      2       259          false       false         false    
-305          304          UID                                                                1043         -1      1       54           true        false         false    
-307          306          srid                                                               23           4       1       -1           false       false         false    
-308          306          auth_name                                                          1043         -1      2       260          false       false         false    
-309          306          auth_srid                                                          23           4       3       -1           false       false         false    
-310          306          srtext                                                             1043         -1      4       2052         false       false         false    
-311          306          proj4text                                                          1043         -1      5       2052         false       false         false    
-313          312          srid                                                               23           4       1       -1           false       false         false    
-315          314          VDBName                                                            1043         -1      1       259          false       false         false    
-316          314          SchemaName                                                         1043         -1      2       259          false       false         false    
-317          314          Name                                                               1043         -1      3       259          true        false         false    
-318          314          Type                                                               1043         -1      4       24           true        false         false    
-319          314          NameInSource                                                       1043         -1      5       259          false       false         false    
-320          314          IsPhysical                                                         16           1       6       -1           true        false         false    
-321          314          SupportsUpdates                                                    16           1       7       -1           true        false         false    
-322          314          UID                                                                1043         -1      8       54           true        false         false    
-323          314          Cardinality                                                        23           4       9       -1           true        false         false    
-324          314          Description                                                        1043         -1      10      259          false       false         false    
-325          314          IsSystem                                                           16           1       11      -1           false       false         false    
-326          314          IsMaterialized                                                     16           1       12      -1           true        false         false    
-327          314          OID                                                                23           4       13      -1           false       false         false    
-329          328          VDBName                                                            1043         -1      1       259          false       false         false    
-330          328          SchemaName                                                         1043         -1      2       259          false       false         false    
-331          328          Name                                                               1043         -1      3       259          true        false         false    
-336          335          UID                                                                1043         -1      1       54           true        false         false    
-338          337          Name                                                               1043         -1      1       259          true        false         false    
-339          337          Version                                                            1043         -1      2       54           true        false         false    
+211          200          TableUID                                                           1043         -1      11      54           true        false         false    
+212          200          RefTableUID                                                        1043         -1      12      54           true        false         false    
+213          200          ColPositions                                                       1005         -1      13      -1           true        false         false    
+215          214          VDBName                                                            1043         -1      1       259          true        false         false    
+216          214          SchemaName                                                         1043         -1      2       259          false       false         false    
+217          214          TableName                                                          1043         -1      3       2052         true        false         false    
+218          214          Name                                                               1043         -1      4       259          true        false         false    
+224          223          UID                                                                1043         -1      1       54           true        false         false    
+226          225          VDBName                                                            1043         -1      1       259          true        false         false    
+227          225          SchemaName                                                         1043         -1      2       259          false       false         false    
+228          225          ProcedureName                                                      1043         -1      3       259          true        false         false    
+229          225          Name                                                               1043         -1      4       259          true        false         false    
+230          225          DataType                                                           1043         -1      5       29           true        false         false    
+231          225          Position                                                           23           4       6       -1           true        false         false    
+232          225          Type                                                               1043         -1      7       104          true        false         false    
+233          225          Optional                                                           16           1       8       -1           true        false         false    
+234          225          Precision                                                          23           4       9       -1           true        false         false    
+235          225          TypeLength                                                         23           4       10      -1           true        false         false    
+236          225          Scale                                                              23           4       11      -1           true        false         false    
+237          225          Radix                                                              23           4       12      -1           true        false         false    
+238          225          NullType                                                           1043         -1      13      14           true        false         false    
+239          225          UID                                                                1043         -1      14      54           false       false         false    
+240          225          Description                                                        1043         -1      15      259          false       false         false    
+241          225          OID                                                                23           4       16      -1           false       false         false    
+243          242          VDBName                                                            1043         -1      1       259          true        false         false    
+244          242          SchemaName                                                         1043         -1      2       259          false       false         false    
+245          242          ProcedureName                                                      1043         -1      3       259          true        false         false    
+246          242          Name                                                               1043         -1      4       259          true        false         false    
+252          251          UID                                                                1043         -1      1       54           false       false         false    
+254          253          VDBName                                                            1043         -1      1       259          true        false         false    
+255          253          SchemaName                                                         1043         -1      2       259          false       false         false    
+256          253          Name                                                               1043         -1      3       259          true        false         false    
+257          253          NameInSource                                                       1043         -1      4       259          false       false         false    
+258          253          ReturnsResults                                                     16           1       5       -1           true        false         false    
+259          253          UID                                                                1043         -1      6       54           true        false         false    
+260          253          Description                                                        1043         -1      7       259          false       false         false    
+261          253          OID                                                                23           4       8       -1           false       false         false    
+263          262          VDBName                                                            1043         -1      1       259          true        false         false    
+264          262          SchemaName                                                         1043         -1      2       259          false       false         false    
+265          262          Name                                                               1043         -1      3       259          true        false         false    
+270          269          UID                                                                1043         -1      1       54           true        false         false    
+272          271          Name                                                               1043         -1      1       4004         true        false         false    
+273          271          Value                                                              1043         -1      2       4004         true        false         false    
+274          271          UID                                                                1043         -1      3       54           true        false         false    
+275          271          OID                                                                23           4       4       -1           false       false         false    
+276          271          ClobValue                                                          25           -1      5       -1           false       false         false    
+278          277          UID                                                                1043         -1      1       54           true        false         false    
+279          277          Name                                                               1043         -1      2       4004         true        false         false    
+281          280          PKTABLE_CAT                                                        1043         -1      1       259          false       false         false    
+282          280          PKTABLE_SCHEM                                                      1043         -1      2       259          false       false         false    
+283          280          PKTABLE_NAME                                                       1043         -1      3       259          false       false         false    
+284          280          PKCOLUMN_NAME                                                      1043         -1      4       259          false       false         false    
+285          280          FKTABLE_CAT                                                        1043         -1      5       259          false       false         false    
+286          280          FKTABLE_SCHEM                                                      1043         -1      6       259          false       false         false    
+287          280          FKTABLE_NAME                                                       1043         -1      7       259          false       false         false    
+288          280          FKCOLUMN_NAME                                                      1043         -1      8       259          false       false         false    
+289          280          KEY_SEQ                                                            21           2       9       -1           false       false         false    
+290          280          UPDATE_RULE                                                        23           4       10      -1           false       false         false    
+291          280          DELETE_RULE                                                        23           4       11      -1           false       false         false    
+292          280          FK_NAME                                                            1043         -1      12      259          false       false         false    
+293          280          PK_NAME                                                            1043         -1      13      259          false       false         false    
+294          280          DEFERRABILITY                                                      23           4       14      -1           false       false         false    
+295          280          FK_UID                                                             1043         -1      15      54           false       false         false    
+297          296          VDBName                                                            1043         -1      1       259          false       false         false    
+298          296          Name                                                               1043         -1      2       259          false       false         false    
+299          296          IsPhysical                                                         16           1       3       -1           true        false         false    
+300          296          UID                                                                1043         -1      4       54           true        false         false    
+301          296          Description                                                        1043         -1      5       259          false       false         false    
+302          296          PrimaryMetamodelURI                                                1043         -1      6       259          true        false         false    
+303          296          OID                                                                23           4       7       -1           false       false         false    
+305          304          VDBName                                                            1043         -1      1       259          false       false         false    
+306          304          Name                                                               1043         -1      2       259          false       false         false    
+308          307          UID                                                                1043         -1      1       54           true        false         false    
+310          309          srid                                                               23           4       1       -1           false       false         false    
+311          309          auth_name                                                          1043         -1      2       260          false       false         false    
+312          309          auth_srid                                                          23           4       3       -1           false       false         false    
+313          309          srtext                                                             1043         -1      4       2052         false       false         false    
+314          309          proj4text                                                          1043         -1      5       2052         false       false         false    
+316          315          srid                                                               23           4       1       -1           false       false         false    
+318          317          VDBName                                                            1043         -1      1       259          false       false         false    
+319          317          SchemaName                                                         1043         -1      2       259          false       false         false    
+320          317          Name                                                               1043         -1      3       259          true        false         false    
+321          317          Type                                                               1043         -1      4       24           true        false         false    
+322          317          NameInSource                                                       1043         -1      5       259          false       false         false    
+323          317          IsPhysical                                                         16           1       6       -1           true        false         false    
+324          317          SupportsUpdates                                                    16           1       7       -1           true        false         false    
+325          317          UID                                                                1043         -1      8       54           true        false         false    
+326          317          Cardinality                                                        23           4       9       -1           true        false         false    
+327          317          Description                                                        1043         -1      10      259          false       false         false    
+328          317          IsSystem                                                           16           1       11      -1           false       false         false    
+329          317          IsMaterialized                                                     16           1       12      -1           true        false         false    
+330          317          OID                                                                23           4       13      -1           false       false         false    
+332          331          VDBName                                                            1043         -1      1       259          false       false         false    
+333          331          SchemaName                                                         1043         -1      2       259          false       false         false    
+334          331          Name                                                               1043         -1      3       259          true        false         false    
+339          338          UID                                                                1043         -1      1       54           true        false         false    
 341          340          Name                                                               1043         -1      1       259          true        false         false    
 342          340          Version                                                            1043         -1      2       54           true        false         false    
-351          350          VDBName                                                            1043         -1      1       259          true        false         false    
-352          350          SchemaName                                                         1043         -1      2       259          true        false         false    
-353          350          Name                                                               1043         -1      3       259          true        false         false    
-354          350          TargetSchemaName                                                   1043         -1      4       259          false       false         false    
-355          350          TargetName                                                         1043         -1      5       4004         false       false         false    
-356          350          Valid                                                              16           1       6       -1           false       false         false    
-357          350          LoadState                                                          1043         -1      7       259          false       false         false    
-358          350          Updated                                                            1114         8       8       -1           false       false         false    
-359          350          Cardinality                                                        23           4       9       -1           false       false         false    
-361          360          VDBName                                                            1043         -1      1       259          true        false         false    
-362          360          SchemaName                                                         1043         -1      2       259          true        false         false    
-363          360          Name                                                               1043         -1      3       259          true        false         false    
-365          364          VDBName                                                            1043         -1      1       259          true        false         false    
-366          364          SchemaName                                                         1043         -1      2       259          true        false         false    
-367          364          Name                                                               1043         -1      3       259          true        false         false    
-368          364          Body                                                               14939        -1      4       -1           true        false         false    
-369          364          UID                                                                1043         -1      5       54           true        false         false    
-371          370          VDBName                                                            1043         -1      1       259          true        false         false    
-372          370          SchemaName                                                         1043         -1      2       259          true        false         false    
-373          370          Name                                                               1043         -1      3       259          true        false         false    
-375          374          UID                                                                1043         -1      1       54           true        false         false    
-377          376          VDBName                                                            1043         -1      1       259          true        false         false    
-378          376          SchemaName                                                         1043         -1      2       259          true        false         false    
-379          376          TableName                                                          1043         -1      3       259          true        false         false    
-380          376          Name                                                               1043         -1      4       259          true        false         false    
-381          376          TriggerType                                                        1043         -1      5       54           true        false         false    
-382          376          TriggerEvent                                                       1043         -1      6       54           true        false         false    
-383          376          Status                                                             1043         -1      7       54           true        false         false    
-384          376          Body                                                               14939        -1      8       -1           false       false         false    
-385          376          TableUID                                                           1043         -1      9       54           true        false         false    
-387          386          VDBName                                                            1043         -1      1       259          true        false         false    
-388          386          SchemaName                                                         1043         -1      2       259          true        false         false    
-389          386          TableName                                                          1043         -1      3       259          true        false         false    
-390          386          Name                                                               1043         -1      4       259          true        false         false    
-392          391          VDBName                                                            1043         -1      1       259          true        false         false    
-393          391          UID                                                                1043         -1      2       54           true        false         false    
-394          391          object_type                                                        1043         -1      3       54           true        false         false    
-395          391          SchemaName                                                         1043         -1      4       259          true        false         false    
-396          391          Name                                                               1043         -1      5       259          true        false         false    
-397          391          ElementName                                                        1043         -1      6       259          false       false         false    
-398          391          Uses_UID                                                           1043         -1      7       54           true        false         false    
-399          391          Uses_object_type                                                   1043         -1      8       54           true        false         false    
-400          391          Uses_SchemaName                                                    1043         -1      9       259          true        false         false    
-401          391          Uses_Name                                                          1043         -1      10      259          true        false         false    
-402          391          Uses_ElementName                                                   1043         -1      11      259          false       false         false    
-404          403          UID                                                                1043         -1      1       54           true        false         false    
-405          403          Uses_UID                                                           1043         -1      2       54           true        false         false    
-407          406          resourcePath                                                       1043         -1      1       259          false       false         false    
-408          406          contents                                                           14939        -1      2       -1           false       false         false    
+344          343          Name                                                               1043         -1      1       259          true        false         false    
+345          343          Version                                                            1043         -1      2       54           true        false         false    
+354          353          VDBName                                                            1043         -1      1       259          true        false         false    
+355          353          SchemaName                                                         1043         -1      2       259          true        false         false    
+356          353          Name                                                               1043         -1      3       259          true        false         false    
+357          353          TargetSchemaName                                                   1043         -1      4       259          false       false         false    
+358          353          TargetName                                                         1043         -1      5       4004         false       false         false    
+359          353          Valid                                                              16           1       6       -1           false       false         false    
+360          353          LoadState                                                          1043         -1      7       259          false       false         false    
+361          353          Updated                                                            1114         8       8       -1           false       false         false    
+362          353          Cardinality                                                        23           4       9       -1           false       false         false    
+364          363          VDBName                                                            1043         -1      1       259          true        false         false    
+365          363          SchemaName                                                         1043         -1      2       259          true        false         false    
+366          363          Name                                                               1043         -1      3       259          true        false         false    
+368          367          VDBName                                                            1043         -1      1       259          true        false         false    
+369          367          SchemaName                                                         1043         -1      2       259          true        false         false    
+370          367          Name                                                               1043         -1      3       259          true        false         false    
+371          367          Body                                                               25           -1      4       -1           true        false         false    
+372          367          UID                                                                1043         -1      5       54           true        false         false    
+374          373          VDBName                                                            1043         -1      1       259          true        false         false    
+375          373          SchemaName                                                         1043         -1      2       259          true        false         false    
+376          373          Name                                                               1043         -1      3       259          true        false         false    
+378          377          UID                                                                1043         -1      1       54           true        false         false    
+380          379          VDBName                                                            1043         -1      1       259          true        false         false    
+381          379          SchemaName                                                         1043         -1      2       259          true        false         false    
+382          379          TableName                                                          1043         -1      3       259          true        false         false    
+383          379          Name                                                               1043         -1      4       259          true        false         false    
+384          379          TriggerType                                                        1043         -1      5       54           true        false         false    
+385          379          TriggerEvent                                                       1043         -1      6       54           true        false         false    
+386          379          Status                                                             1043         -1      7       54           true        false         false    
+387          379          Body                                                               25           -1      8       -1           false       false         false    
+388          379          TableUID                                                           1043         -1      9       54           true        false         false    
+390          389          VDBName                                                            1043         -1      1       259          true        false         false    
+391          389          SchemaName                                                         1043         -1      2       259          true        false         false    
+392          389          TableName                                                          1043         -1      3       259          true        false         false    
+393          389          Name                                                               1043         -1      4       259          true        false         false    
+395          394          VDBName                                                            1043         -1      1       259          true        false         false    
+396          394          UID                                                                1043         -1      2       54           true        false         false    
+397          394          object_type                                                        1043         -1      3       54           true        false         false    
+398          394          SchemaName                                                         1043         -1      4       259          true        false         false    
+399          394          Name                                                               1043         -1      5       259          true        false         false    
+400          394          ElementName                                                        1043         -1      6       259          false       false         false    
+401          394          Uses_UID                                                           1043         -1      7       54           true        false         false    
+402          394          Uses_object_type                                                   1043         -1      8       54           true        false         false    
+403          394          Uses_SchemaName                                                    1043         -1      9       259          true        false         false    
+404          394          Uses_Name                                                          1043         -1      10      259          true        false         false    
+405          394          Uses_ElementName                                                   1043         -1      11      259          false       false         false    
+407          406          UID                                                                1043         -1      1       54           true        false         false    
+408          406          Uses_UID                                                           1043         -1      2       54           true        false         false    
 410          409          resourcePath                                                       1043         -1      1       259          false       false         false    
-412          411          VDBName                                                            1043         -1      1       259          true        false         false    
-413          411          SchemaName                                                         1043         -1      2       259          true        false         false    
-414          411          Name                                                               1043         -1      3       259          true        false         false    
-415          411          Body                                                               14939        -1      4       -1           true        false         false    
-416          411          UID                                                                1043         -1      5       54           true        false         false    
-418          417          VDBName                                                            1043         -1      1       259          true        false         false    
-419          417          SchemaName                                                         1043         -1      2       259          true        false         false    
-420          417          Name                                                               1043         -1      3       259          true        false         false    
-422          421          UID                                                                1043         -1      1       54           true        false         false    
-483          482          oid                                                                23           4       1       -1           false       false         false    
-484          482          typname                                                            1043         -1      2       4004         false       false         false    
-485          482          name                                                               1043         -1      3       4004         false       false         false    
-486          482          uid                                                                1043         -1      4       4004         false       false         false    
-487          482          typlen                                                             21           2       5       -1           false       false         false    
-489          488          oid                                                                23           4       1       -1           false       false         false    
-490          488          name                                                               1043         -1      2       4004         false       false         false    
-492          491          typname                                                            1043         -1      1       4004         false       false         false    
-493          491          oid                                                                23           4       2       -1           false       false         false    
-495          494          attrelid                                                           23           4       1       -1           false       false         false    
-496          494          attnum                                                             21           2       2       -1           false       false         false    
-497          494          attname                                                            1043         -1      3       4004         false       false         false    
-498          494          relname                                                            1043         -1      4       4004         false       false         false    
-499          494          nspname                                                            1043         -1      5       4004         false       false         false    
-500          494          autoinc                                                            16           1       6       -1           false       false         false    
-501          494          typoid                                                             23           4       7       -1           false       false         false    
-503          502          attname                                                            1043         -1      1       4004         false       false         false    
-504          502          relname                                                            1043         -1      2       4004         false       false         false    
-505          502          nspname                                                            1043         -1      3       4004         false       false         false    
-507          506          attrelid                                                           23           4       1       -1           false       false         false    
-508          506          attnum                                                             21           2       2       -1           false       false         false    
-510          509          oid                                                                23           4       1       -1           false       false         false    
-511          509          amname                                                             1043         -1      2       4004         false       false         false    
-513          512          adrelid                                                            23           4       1       -1           false       false         false    
-514          512          adnum                                                              21           2       2       -1           false       false         false    
-515          512          adbin                                                              1043         -1      3       4004         false       false         false    
-516          512          adsrc                                                              1043         -1      4       4004         false       false         false    
-518          517          oid                                                                23           4       1       -1           false       false         false    
-519          517          attrelid                                                           23           4       2       -1           false       false         false    
-520          517          attname                                                            1043         -1      3       4004         false       false         false    
-521          517          atttypid                                                           23           4       4       -1           false       false         false    
-522          517          attlen                                                             21           2       5       -1           false       false         false    
-523          517          attnum                                                             21           2       6       -1           false       false         false    
-524          517          atttypmod                                                          23           4       7       -1           false       false         false    
-525          517          attnotnull                                                         16           1       8       -1           false       false         false    
-526          517          attisdropped                                                       16           1       9       -1           false       false         false    
-527          517          atthasdef                                                          16           1       10      -1           false       false         false    
-529          528          oid                                                                23           4       1       -1           false       false         false    
+411          409          contents                                                           17           -1      2       -1           false       false         false    
+413          412          resourcePath                                                       1043         -1      1       259          false       false         false    
+415          414          VDBName                                                            1043         -1      1       259          true        false         false    
+416          414          SchemaName                                                         1043         -1      2       259          true        false         false    
+417          414          Name                                                               1043         -1      3       259          true        false         false    
+418          414          Body                                                               25           -1      4       -1           true        false         false    
+419          414          UID                                                                1043         -1      5       54           true        false         false    
+421          420          VDBName                                                            1043         -1      1       259          true        false         false    
+422          420          SchemaName                                                         1043         -1      2       259          true        false         false    
+423          420          Name                                                               1043         -1      3       259          true        false         false    
+425          424          UID                                                                1043         -1      1       54           true        false         false    
+486          485          f_table_catalog                                                    1043         -1      1       4004         false       false         false    
+487          485          f_table_schema                                                     1043         -1      2       4004         false       false         false    
+488          485          f_table_name                                                       1043         -1      3       4004         false       false         false    
+489          485          f_geography_column                                                 1043         -1      4       4004         false       false         false    
+490          485          coord_dimension                                                    23           4       5       -1           false       false         false    
+491          485          srid                                                               23           4       6       -1           false       false         false    
+492          485          type                                                               1043         -1      7       4004         false       false         false    
+494          493          oid                                                                23           4       1       -1           false       false         false    
+495          493          typname                                                            1043         -1      2       4004         false       false         false    
+496          493          name                                                               1043         -1      3       4004         false       false         false    
+497          493          typlen                                                             21           2       4       -1           false       false         false    
+498          493          typtype                                                            1043         -1      5       5            false       false         false    
+499          493          typbasetype                                                        23           4       6       -1           false       false         false    
+500          493          typtypmod                                                          23           4       7       -1           false       false         false    
+502          501          oid                                                                23           4       1       -1           false       false         false    
+503          501          name                                                               1043         -1      2       4004         false       false         false    
+505          504          typname                                                            1043         -1      1       4004         false       false         false    
+506          504          oid                                                                23           4       2       -1           false       false         false    
+508          507          attrelid                                                           23           4       1       -1           false       false         false    
+509          507          attnum                                                             21           2       2       -1           false       false         false    
+510          507          attname                                                            1043         -1      3       4004         false       false         false    
+511          507          relname                                                            1043         -1      4       4004         false       false         false    
+512          507          nspname                                                            1043         -1      5       4004         false       false         false    
+513          507          autoinc                                                            16           1       6       -1           false       false         false    
+514          507          typoid                                                             23           4       7       -1           false       false         false    
+516          515          attname                                                            1043         -1      1       4004         false       false         false    
+517          515          relname                                                            1043         -1      2       4004         false       false         false    
+518          515          nspname                                                            1043         -1      3       4004         false       false         false    
+520          519          attrelid                                                           23           4       1       -1           false       false         false    
+521          519          attnum                                                             21           2       2       -1           false       false         false    
+523          522          oid                                                                23           4       1       -1           false       false         false    
+524          522          amname                                                             1043         -1      2       4004         false       false         false    
+526          525          adrelid                                                            23           4       1       -1           false       false         false    
+527          525          adnum                                                              21           2       2       -1           false       false         false    
+528          525          adbin                                                              1043         -1      3       4004         false       false         false    
+529          525          adsrc                                                              1043         -1      4       4004         false       false         false    
 531          530          oid                                                                23           4       1       -1           false       false         false    
-532          530          relname                                                            1043         -1      2       4004         false       false         false    
-533          530          relnamespace                                                       23           4       3       -1           false       false         false    
-534          530          relkind                                                            1042         1       4       5            false       false         false    
-535          530          relam                                                              23           4       5       -1           false       false         false    
-536          530          reltuples                                                          700          4       6       -1           false       false         false    
-537          530          relpages                                                           23           4       7       -1           false       false         false    
-538          530          relhasrules                                                        16           1       8       -1           false       false         false    
-539          530          relhasoids                                                         16           1       9       -1           false       false         false    
-541          540          oid                                                                23           4       1       -1           false       false         false    
-543          542          oid                                                                23           4       1       -1           false       false         false    
-544          542          datname                                                            1043         -1      2       4004         false       false         false    
-545          542          encoding                                                           23           4       3       -1           false       false         false    
-546          542          datlastsysoid                                                      23           4       4       -1           false       false         false    
-547          542          datallowconn                                                       1042         1       5       5            false       false         false    
-548          542          datconfig                                                          705          -2      6       -1           false       false         false    
-549          542          datacl                                                             705          -2      7       -1           false       false         false    
-550          542          datdba                                                             23           4       8       -1           false       false         false    
-551          542          dattablespace                                                      23           4       9       -1           false       false         false    
-553          552          objoid                                                             23           4       1       -1           false       false         false    
-554          552          classoid                                                           23           4       2       -1           false       false         false    
-555          552          objsubid                                                           23           4       3       -1           false       false         false    
-556          552          description                                                        1043         -1      4       4004         false       false         false    
-558          557          oid                                                                23           4       1       -1           false       false         false    
-559          557          indexrelid                                                         23           4       2       -1           false       false         false    
-560          557          indrelid                                                           23           4       3       -1           false       false         false    
-561          557          indnatts                                                           21           2       4       -1           false       false         false    
-562          557          indisclustered                                                     16           1       5       -1           false       false         false    
-563          557          indisunique                                                        16           1       6       -1           false       false         false    
-564          557          indisprimary                                                       16           1       7       -1           false       false         false    
-565          557          indkey                                                             <null>       <null>  8       -1           false       false         false    
-566          557          indexprs                                                           1043         -1      9       4004         false       false         false    
-567          557          indpred                                                            1043         -1      10      4004         false       false         false    
-569          568          oid                                                                23           4       1       -1           false       false         false    
-571          570          oid                                                                23           4       1       -1           false       false         false    
-572          570          nspname                                                            1043         -1      2       4004         false       false         false    
-574          573          oid                                                                23           4       1       -1           false       false         false    
-575          573          proname                                                            1043         -1      2       4004         false       false         false    
-576          573          proretset                                                          16           1       3       -1           false       false         false    
-577          573          prorettype                                                         23           4       4       -1           false       false         false    
-578          573          pronargs                                                           21           2       5       -1           false       false         false    
-579          573          proargtypes                                                        <null>       <null>  6       -1           false       false         false    
-580          573          proargnames                                                        <null>       <null>  7       -1           false       false         false    
-581          573          proargmodes                                                        <null>       <null>  8       -1           false       false         false    
-582          573          proallargtypes                                                     <null>       <null>  9       -1           false       false         false    
-583          573          pronamespace                                                       23           4       10      -1           false       false         false    
-585          584          oid                                                                23           4       1       -1           false       false         false    
-587          586          oid                                                                23           4       1       -1           false       false         false    
-588          586          tgconstrrelid                                                      23           4       2       -1           false       false         false    
-589          586          tgfoid                                                             23           4       3       -1           false       false         false    
-590          586          tgargs                                                             23           4       4       -1           false       false         false    
-591          586          tgnargs                                                            23           4       5       -1           false       false         false    
-592          586          tgdeferrable                                                       16           1       6       -1           false       false         false    
-593          586          tginitdeferred                                                     16           1       7       -1           false       false         false    
-594          586          tgconstrname                                                       1043         -1      8       4004         false       false         false    
-595          586          tgrelid                                                            23           4       9       -1           false       false         false    
-597          596          oid                                                                23           4       1       -1           false       false         false    
-598          596          typname                                                            1043         -1      2       4004         false       false         false    
-599          596          typnamespace                                                       23           4       3       -1           false       false         false    
-600          596          typlen                                                             21           2       4       -1           false       false         false    
-601          596          typtype                                                            1042         1       5       5            false       false         false    
-602          596          typnotnull                                                         16           1       6       -1           false       false         false    
-603          596          typbasetype                                                        23           4       7       -1           false       false         false    
-604          596          typtypmod                                                          23           4       8       -1           false       false         false    
-605          596          typdelim                                                           1042         1       9       5            false       false         false    
-606          596          typrelid                                                           23           4       10      -1           false       false         false    
-607          596          typelem                                                            23           4       11      -1           false       false         false    
-608          596          typinput                                                           23           4       12      -1           false       false         false    
-610          609          oid                                                                23           4       1       -1           false       false         false    
-611          609          usename                                                            1043         -1      2       4004         false       false         false    
-612          609          usecreatedb                                                        16           1       3       -1           false       false         false    
-613          609          usesuper                                                           16           1       4       -1           false       false         false    
-Row Count : 387
+532          530          attrelid                                                           23           4       2       -1           false       false         false    
+533          530          attname                                                            1043         -1      3       4004         false       false         false    
+534          530          atttypid                                                           23           4       4       -1           false       false         false    
+535          530          attlen                                                             21           2       5       -1           false       false         false    
+536          530          attnum                                                             21           2       6       -1           false       false         false    
+537          530          atttypmod                                                          23           4       7       -1           false       false         false    
+538          530          attnotnull                                                         16           1       8       -1           false       false         false    
+539          530          attisdropped                                                       16           1       9       -1           false       false         false    
+540          530          atthasdef                                                          16           1       10      -1           false       false         false    
+542          541          oid                                                                23           4       1       -1           false       false         false    
+544          543          oid                                                                23           4       1       -1           false       false         false    
+545          543          relname                                                            1043         -1      2       4004         false       false         false    
+546          543          relnamespace                                                       23           4       3       -1           false       false         false    
+547          543          relkind                                                            1043         -1      4       5            false       false         false    
+548          543          relowner                                                           23           4       5       -1           false       false         false    
+549          543          relam                                                              23           4       6       -1           false       false         false    
+550          543          reltuples                                                          700          4       7       -1           false       false         false    
+551          543          relpages                                                           23           4       8       -1           false       false         false    
+552          543          relhasrules                                                        16           1       9       -1           false       false         false    
+553          543          relhasoids                                                         16           1       10      -1           false       false         false    
+554          543          relnspname                                                         1043         -1      11      4004         false       false         false    
+555          543          reloptions                                                         1015         -1      12      -1           false       false         false    
+557          556          oid                                                                23           4       1       -1           false       false         false    
+559          558          oid                                                                23           4       1       -1           false       false         false    
+560          558          conname                                                            1043         -1      2       4004         false       false         false    
+561          558          contype                                                            1043         -1      3       4004         false       false         false    
+562          558          consrc                                                             1043         -1      4       4004         false       false         false    
+563          558          conrelid                                                           23           4       5       -1           false       false         false    
+564          558          confrelid                                                          23           4       6       -1           false       false         false    
+565          558          conkey                                                             1005         -1      7       -1           false       false         false    
+567          566          oid                                                                23           4       1       -1           false       false         false    
+568          566          datname                                                            1043         -1      2       4004         false       false         false    
+569          566          encoding                                                           23           4       3       -1           false       false         false    
+570          566          datlastsysoid                                                      23           4       4       -1           false       false         false    
+571          566          datallowconn                                                       1043         -1      5       5            false       false         false    
+572          566          datconfig                                                          705          -2      6       -1           false       false         false    
+573          566          datacl                                                             705          -2      7       -1           false       false         false    
+574          566          datdba                                                             23           4       8       -1           false       false         false    
+575          566          dattablespace                                                      23           4       9       -1           false       false         false    
+577          576          objoid                                                             23           4       1       -1           false       false         false    
+578          576          classoid                                                           23           4       2       -1           false       false         false    
+579          576          objsubid                                                           23           4       3       -1           false       false         false    
+580          576          description                                                        1043         -1      4       4004         false       false         false    
+582          581          oid                                                                23           4       1       -1           false       false         false    
+583          581          indexrelid                                                         23           4       2       -1           false       false         false    
+584          581          indrelid                                                           23           4       3       -1           false       false         false    
+585          581          indnatts                                                           21           2       4       -1           false       false         false    
+586          581          indisclustered                                                     16           1       5       -1           false       false         false    
+587          581          indisunique                                                        16           1       6       -1           false       false         false    
+588          581          indisprimary                                                       16           1       7       -1           false       false         false    
+589          581          indkey                                                             1005         -1      8       -1           false       false         false    
+590          581          indexprs                                                           1043         -1      9       4004         false       false         false    
+591          581          indpred                                                            1043         -1      10      4004         false       false         false    
+593          592          oid                                                                23           4       1       -1           false       false         false    
+595          594          inhrelid                                                           23           4       1       -1           false       false         false    
+596          594          inhparent                                                          23           4       2       -1           false       false         false    
+597          594          inhseqno                                                           23           4       3       -1           false       false         false    
+599          598          oid                                                                23           4       1       -1           false       false         false    
+600          598          nspname                                                            1043         -1      2       4004         false       false         false    
+601          598          nspowner                                                           23           4       3       -1           false       false         false    
+603          602          transaction                                                        1043         -1      1       4004         false       false         false    
+604          602          gid                                                                1043         -1      2       4004         false       false         false    
+605          602          owner                                                              1043         -1      3       4004         false       false         false    
+606          602          database                                                           1043         -1      4       4004         false       false         false    
+608          607          oid                                                                23           4       1       -1           false       false         false    
+609          607          proname                                                            1043         -1      2       4004         false       false         false    
+610          607          proretset                                                          16           1       3       -1           false       false         false    
+611          607          prorettype                                                         23           4       4       -1           false       false         false    
+612          607          pronargs                                                           21           2       5       -1           false       false         false    
+613          607          proargtypes                                                        1007         -1      6       -1           false       false         false    
+614          607          proargnames                                                        1015         -1      7       -1           false       false         false    
+615          607          proargmodes                                                        1015         -1      8       -1           false       false         false    
+616          607          proallargtypes                                                     1007         -1      9       -1           false       false         false    
+617          607          pronamespace                                                       23           4       10      -1           false       false         false    
+619          618          oid                                                                23           4       1       -1           false       false         false    
+621          620          schemaname                                                         1043         -1      1       4004         false       false         false    
+622          620          tablename                                                          1043         -1      2       4004         false       false         false    
+623          620          attname                                                            1043         -1      3       4004         false       false         false    
+625          624          oid                                                                23           4       1       -1           false       false         false    
+626          624          tgconstrrelid                                                      23           4       2       -1           false       false         false    
+627          624          tgfoid                                                             23           4       3       -1           false       false         false    
+628          624          tgargs                                                             23           4       4       -1           false       false         false    
+629          624          tgnargs                                                            23           4       5       -1           false       false         false    
+630          624          tgdeferrable                                                       16           1       6       -1           false       false         false    
+631          624          tginitdeferred                                                     16           1       7       -1           false       false         false    
+632          624          tgconstrname                                                       1043         -1      8       4004         false       false         false    
+633          624          tgrelid                                                            23           4       9       -1           false       false         false    
+635          634          oid                                                                23           4       1       -1           false       false         false    
+636          634          typname                                                            1043         -1      2       4004         false       false         false    
+637          634          typnamespace                                                       23           4       3       -1           false       false         false    
+638          634          typlen                                                             21           2       4       -1           false       false         false    
+639          634          typtype                                                            1043         -1      5       5            false       false         false    
+640          634          typnotnull                                                         16           1       6       -1           false       false         false    
+641          634          typbasetype                                                        23           4       7       -1           false       false         false    
+642          634          typtypmod                                                          23           4       8       -1           false       false         false    
+643          634          typdelim                                                           1043         -1      9       5            false       false         false    
+644          634          typrelid                                                           23           4       10      -1           false       false         false    
+645          634          typelem                                                            23           4       11      -1           false       false         false    
+646          634          typinput                                                           23           4       12      -1           false       false         false    
+647          634          typdefault                                                         1043         -1      13      4004         false       false         false    
+648          634          teiid_name                                                         1043         -1      14      4004         false       false         false    
+650          649          oid                                                                23           4       1       -1           false       false         false    
+651          649          usename                                                            1043         -1      2       4004         false       false         false    
+652          649          usecreatedb                                                        16           1       3       -1           false       false         false    
+653          649          usesuper                                                           16           1       4       -1           false       false         false    
+Row Count : 422
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid            4              overflow        java.lang.Integer   oid             integer            pg_catalog     pg_attribute  11                    10            0         false            false            false       false                 1           true        true          true      false       
 attrelid       4              overflow        java.lang.Integer   attrelid        integer            pg_catalog     pg_attribute  11                    10            0         false            false            false       false                 1           true        true          true      false       
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
index 8a9b8f5379..021b1315e2 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
@@ -1,97 +1,105 @@
-integer      string                                                             integer       char     integer      float      integer      boolean      boolean   
-oid          relname                                                            relnamespace  relkind  relam        reltuples  relpages     relhasrules  relhasoids
-56           PARTSSUPPLIER.PARTS                                                55            r        0            0.0        0            false        false     
-61           PK_PARTS                                                           55            i        0            0.0        0            false        false     
-63           PARTSSUPPLIER.SHIP_VIA                                             55            r        0            0.0        0            false        false     
-66           PK_SHIP_VIA                                                        55            i        0            0.0        0            false        false     
-68           PARTSSUPPLIER.STATUS                                               55            r        0            0.0        0            false        false     
-71           PK_STATUS                                                          55            i        0            0.0        0            false        false     
-73           PARTSSUPPLIER.SUPPLIER                                             55            r        0            0.0        0            false        false     
-79           PK_SUPPLIER                                                        55            i        0            0.0        0            false        false     
-83           PARTSSUPPLIER.SUPPLIER_PARTS                                       55            r        0            0.0        0            false        false     
-88           PK_SUPPLIER_PARTS                                                  55            i        0            0.0        0            false        false     
-96           Columns                                                            95            r        0            0.0        0            false        false     
-128          PK                                                                 95            i        0            0.0        0            false        false     
-137          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-139          DataTypes                                                          95            r        0            0.0        0            false        false     
-159          PK                                                                 95            i        0            0.0        0            false        false     
-161          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-163          FunctionParams                                                     95            r        0            0.0        0            false        false     
-179          PK                                                                 95            i        0            0.0        0            false        false     
-188          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-190          Functions                                                          95            r        0            0.0        0            false        false     
-198          PK                                                                 95            i        0            0.0        0            false        false     
-205          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-207          GEOMETRY_COLUMNS                                                   95            v        0            0.0        0            false        false     
-215          KeyColumns                                                         95            r        0            0.0        0            false        false     
-226          PK                                                                 95            i        0            0.0        0            false        false     
-235          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-237          Keys                                                               95            r        0            0.0        0            false        false     
-249          PK                                                                 95            i        0            0.0        0            false        false     
-258          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-260          ProcedureParams                                                    95            r        0            0.0        0            false        false     
-277          PK                                                                 95            i        0            0.0        0            false        false     
-286          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-288          Procedures                                                         95            r        0            0.0        0            false        false     
-297          PK                                                                 95            i        0            0.0        0            false        false     
-304          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-306          Properties                                                         95            r        0            0.0        0            false        false     
-312          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-315          ReferenceKeyColumns                                                95            r        0            0.0        0            false        false     
-330          Schemas                                                            95            r        0            0.0        0            false        false     
-338          PK                                                                 95            i        0            0.0        0            false        false     
-341          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-343          spatial_ref_sys                                                    95            v        0            0.0        0            false        false     
-349          PK                                                                 95            i        0            0.0        0            false        false     
-351          Tables                                                             95            r        0            0.0        0            false        false     
-365          PK                                                                 95            i        0            0.0        0            false        false     
-372          UNIQUE0                                                            95            i        0            0.0        0            false        false     
-374          VirtualDatabases                                                   95            r        0            0.0        0            false        false     
-377          PK                                                                 95            i        0            0.0        0            false        false     
-387          MatViews                                                           386           r        0            0.0        0            false        false     
-397          PK                                                                 386           i        0            0.0        0            false        false     
-401          StoredProcedures                                                   386           r        0            0.0        0            false        false     
-407          PK                                                                 386           i        0            0.0        0            false        false     
-411          UNIQUE0                                                            386           i        0            0.0        0            false        false     
-413          Triggers                                                           386           r        0            0.0        0            false        false     
-423          PK                                                                 386           i        0            0.0        0            false        false     
-428          Usage                                                              386           r        0            0.0        0            false        false     
-440          PK                                                                 386           i        0            0.0        0            false        false     
-443          VDBResources                                                       386           r        0            0.0        0            false        false     
-446          PK                                                                 386           i        0            0.0        0            false        false     
-448          Views                                                              386           r        0            0.0        0            false        false     
-454          PK                                                                 386           i        0            0.0        0            false        false     
-458          UNIQUE0                                                            386           i        0            0.0        0            false        false     
-519          matpg_datatype                                                     518           v        0            0.0        0            false        false     
-525          matpg_datatype_names                                               518           i        0            0.0        0            false        false     
-528          matpg_datatype_ids                                                 518           i        0            0.0        0            false        false     
-531          matpg_relatt                                                       518           v        0            0.0        0            false        false     
-539          pk_matpg_relatt_names                                              518           i        0            0.0        0            false        false     
-543          idx_matpg_relatt_ids                                               518           i        0            0.0        0            false        false     
-546          pg_am                                                              518           v        0            0.0        0            false        false     
-549          pg_attrdef                                                         518           v        0            0.0        0            false        false     
-554          pg_attribute                                                       518           v        0            0.0        0            false        false     
-565          pk_pg_attr                                                         518           i        0            0.0        0            false        false     
-567          pg_class                                                           518           v        0            0.0        0            false        false     
-577          pk_pg_class                                                        518           i        0            0.0        0            false        false     
-579          pg_database                                                        518           v        0            0.0        0            false        false     
-589          pg_description                                                     518           v        0            0.0        0            false        false     
-594          pg_index                                                           518           v        0            0.0        0            false        false     
-605          pk_pg_index                                                        518           i        0            0.0        0            false        false     
-607          pg_namespace                                                       518           v        0            0.0        0            false        false     
-610          pg_proc                                                            518           v        0            0.0        0            false        false     
-621          pk_pg_proc                                                         518           i        0            0.0        0            false        false     
-623          pg_trigger                                                         518           v        0            0.0        0            false        false     
-633          pg_type                                                            518           v        0            0.0        0            false        false     
-646          pg_user                                                            518           v        0            0.0        0            false        false     
-Row Count : 84
+integer      string                                                             integer       char     integer      integer      float      integer      boolean      boolean     string                                                             string[]                                                         
+oid          relname                                                            relnamespace  relkind  relowner     relam        reltuples  relpages     relhasrules  relhasoids  relnspname                                                         reloptions                                                       
+56           PARTSSUPPLIER.PARTS                                                55            r        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+61           PK_PARTS                                                           55            i        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+63           PARTSSUPPLIER.SHIP_VIA                                             55            r        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+66           PK_SHIP_VIA                                                        55            i        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+68           PARTSSUPPLIER.STATUS                                               55            r        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+71           PK_STATUS                                                          55            i        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+73           PARTSSUPPLIER.SUPPLIER                                             55            r        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+79           PK_SUPPLIER                                                        55            i        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+83           PARTSSUPPLIER.SUPPLIER_PARTS                                       55            r        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+88           PK_SUPPLIER_PARTS                                                  55            i        0            0            0.0        0            false        false       PartsSupplier                                                      <null>                                                           
+96           Columns                                                            95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+128          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+137          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+139          DataTypes                                                          95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+159          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+161          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+163          FunctionParams                                                     95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+179          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+188          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+190          Functions                                                          95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+198          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+205          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+207          GEOMETRY_COLUMNS                                                   95            v        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+215          KeyColumns                                                         95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+226          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+235          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+237          Keys                                                               95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+251          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+260          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+262          ProcedureParams                                                    95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+279          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+288          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+290          Procedures                                                         95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+299          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+306          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+308          Properties                                                         95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+314          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+317          ReferenceKeyColumns                                                95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+333          Schemas                                                            95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+341          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+344          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+346          spatial_ref_sys                                                    95            v        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+352          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+354          Tables                                                             95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+368          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+375          UNIQUE0                                                            95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+377          VirtualDatabases                                                   95            r        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+380          PK                                                                 95            i        0            0            0.0        0            false        false       SYS                                                                <null>                                                           
+390          MatViews                                                           389           r        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+400          PK                                                                 389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+404          StoredProcedures                                                   389           r        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+410          PK                                                                 389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+414          UNIQUE0                                                            389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+416          Triggers                                                           389           r        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+426          PK                                                                 389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+431          Usage                                                              389           r        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+443          PK                                                                 389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+446          VDBResources                                                       389           r        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+449          PK                                                                 389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+451          Views                                                              389           r        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+457          PK                                                                 389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+461          UNIQUE0                                                            389           i        0            0            0.0        0            false        false       SYSADMIN                                                           <null>                                                           
+522          geography_columns                                                  521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+530          matpg_datatype                                                     521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+538          matpg_datatype_names                                               521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+541          matpg_datatype_ids                                                 521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+544          matpg_relatt                                                       521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+552          pk_matpg_relatt_names                                              521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+556          idx_matpg_relatt_ids                                               521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+559          pg_am                                                              521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+562          pg_attrdef                                                         521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+567          pg_attribute                                                       521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+578          pk_pg_attr                                                         521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+580          pg_class                                                           521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+593          pk_pg_class                                                        521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+595          pg_constraint                                                      521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+603          pg_database                                                        521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+613          pg_description                                                     521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+618          pg_index                                                           521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+629          pk_pg_index                                                        521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+631          pg_inherits                                                        521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+635          pg_namespace                                                       521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+639          pg_prepared_xacts                                                  521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+644          pg_proc                                                            521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+655          pk_pg_proc                                                         521           i        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+657          pg_stats                                                           521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+661          pg_trigger                                                         521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+671          pg_type                                                            521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+686          pg_user                                                            521           v        0            0            0.0        0            false        false       pg_catalog                                                         <null>                                                           
+Row Count : 89
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid            4              PartsSupplier   java.lang.Integer   oid             integer            pg_catalog     pg_class      11                    10            0         false            false            false       false                 1           true        true          true      false       
 relname        12             PartsSupplier   java.lang.String    relname         string             pg_catalog     pg_class      4000                  4000          0         false            true             false       false                 1           true        true          false     false       
 relnamespace   4              PartsSupplier   java.lang.Integer   relnamespace    integer            pg_catalog     pg_class      11                    10            0         false            false            false       false                 1           true        true          true      false       
 relkind        1              PartsSupplier   java.lang.String    relkind         char               pg_catalog     pg_class      1                     1             0         false            true             false       false                 1           true        true          false     false       
+relowner       4              PartsSupplier   java.lang.Integer   relowner        integer            pg_catalog     pg_class      11                    10            0         false            false            false       false                 1           true        true          true      false       
 relam          4              PartsSupplier   java.lang.Integer   relam           integer            pg_catalog     pg_class      11                    10            0         false            false            false       false                 1           true        true          true      false       
 reltuples      7              PartsSupplier   java.lang.Float     reltuples       float              pg_catalog     pg_class      9                     7             3         false            false            false       false                 1           true        true          true      false       
 relpages       4              PartsSupplier   java.lang.Integer   relpages        integer            pg_catalog     pg_class      11                    10            0         false            false            false       false                 1           true        true          true      false       
 relhasrules    -7             PartsSupplier   java.lang.Boolean   relhasrules     boolean            pg_catalog     pg_class      5                     1             0         false            false            false       false                 1           true        true          false     false       
 relhasoids     -7             PartsSupplier   java.lang.Boolean   relhasoids      boolean            pg_catalog     pg_class      5                     1             0         false            false            false       false                 1           true        true          false     false       
+relnspname     12             PartsSupplier   java.lang.String    relnspname      string             pg_catalog     pg_class      4000                  4000          0         false            true             false       false                 1           true        true          false     false       
+reloptions     2003           PartsSupplier   java.sql.Array      reloptions      string[]           pg_catalog     pg_class      2147483647            4000          0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
index 52433e111c..f46b7fa449 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
@@ -22,39 +22,39 @@ oid          indexrelid   indrelid     indnatts  indisclustered  indisunique  in
 226          226          215          4         false           true         true          [1, 2, 3, 4]                                                       <null>                                                             <null>                                                           
 231          231          215          3         false           false        false         [1, 2, 3]                                                          <null>                                                             <null>                                                           
 235          235          215          1         false           true         false         [8]                                                                <null>                                                             <null>                                                           
-249          249          237          4         false           true         true          [1, 2, 3, 4]                                                       <null>                                                             <null>                                                           
-254          254          237          3         false           false        false         [1, 2, 3]                                                          <null>                                                             <null>                                                           
-258          258          237          1         false           true         false         [10]                                                               <null>                                                             <null>                                                           
-277          277          260          4         false           true         true          [1, 2, 3, 4]                                                       <null>                                                             <null>                                                           
-282          282          260          3         false           false        false         [1, 2, 3]                                                          <null>                                                             <null>                                                           
-286          286          260          1         false           true         false         [14]                                                               <null>                                                             <null>                                                           
-297          297          288          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
-301          301          288          2         false           false        false         [1, 2]                                                             <null>                                                             <null>                                                           
-304          304          288          1         false           true         false         [6]                                                                <null>                                                             <null>                                                           
-312          312          306          2         false           true         false         [3, 1]                                                             <null>                                                             <null>                                                           
-338          338          330          2         false           true         true          [1, 2]                                                             <null>                                                             <null>                                                           
-341          341          330          1         false           true         false         [4]                                                                <null>                                                             <null>                                                           
-349          349          343          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
-365          365          351          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
-369          369          351          2         false           false        false         [1, 2]                                                             <null>                                                             <null>                                                           
-372          372          351          1         false           true         false         [8]                                                                <null>                                                             <null>                                                           
-377          377          374          2         false           true         true          [1, 2]                                                             <null>                                                             <null>                                                           
-397          397          387          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
-407          407          401          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
-411          411          401          1         false           true         false         [5]                                                                <null>                                                             <null>                                                           
-423          423          413          4         false           true         true          [1, 2, 3, 4]                                                       <null>                                                             <null>                                                           
-440          440          428          2         false           true         true          [2, 7]                                                             <null>                                                             <null>                                                           
-446          446          443          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
-454          454          448          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
-458          458          448          1         false           true         false         [5]                                                                <null>                                                             <null>                                                           
-525          525          519          2         false           true         true          [1, 3]                                                             <null>                                                             <null>                                                           
-528          528          519          2         false           false        false         [2, 1]                                                             <null>                                                             <null>                                                           
-539          539          531          3         false           true         true          [3, 4, 5]                                                          <null>                                                             <null>                                                           
-543          543          531          2         false           false        false         [1, 2]                                                             <null>                                                             <null>                                                           
-565          565          554          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
-577          577          567          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
-605          605          594          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
-621          621          610          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
+251          251          237          4         false           true         true          [1, 2, 3, 4]                                                       <null>                                                             <null>                                                           
+256          256          237          3         false           false        false         [1, 2, 3]                                                          <null>                                                             <null>                                                           
+260          260          237          1         false           true         false         [10]                                                               <null>                                                             <null>                                                           
+279          279          262          4         false           true         true          [1, 2, 3, 4]                                                       <null>                                                             <null>                                                           
+284          284          262          3         false           false        false         [1, 2, 3]                                                          <null>                                                             <null>                                                           
+288          288          262          1         false           true         false         [14]                                                               <null>                                                             <null>                                                           
+299          299          290          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
+303          303          290          2         false           false        false         [1, 2]                                                             <null>                                                             <null>                                                           
+306          306          290          1         false           true         false         [6]                                                                <null>                                                             <null>                                                           
+314          314          308          2         false           true         false         [3, 1]                                                             <null>                                                             <null>                                                           
+341          341          333          2         false           true         true          [1, 2]                                                             <null>                                                             <null>                                                           
+344          344          333          1         false           true         false         [4]                                                                <null>                                                             <null>                                                           
+352          352          346          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
+368          368          354          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
+372          372          354          2         false           false        false         [1, 2]                                                             <null>                                                             <null>                                                           
+375          375          354          1         false           true         false         [8]                                                                <null>                                                             <null>                                                           
+380          380          377          2         false           true         true          [1, 2]                                                             <null>                                                             <null>                                                           
+400          400          390          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
+410          410          404          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
+414          414          404          1         false           true         false         [5]                                                                <null>                                                             <null>                                                           
+426          426          416          4         false           true         true          [1, 2, 3, 4]                                                       <null>                                                             <null>                                                           
+443          443          431          2         false           true         true          [2, 7]                                                             <null>                                                             <null>                                                           
+449          449          446          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
+457          457          451          3         false           true         true          [1, 2, 3]                                                          <null>                                                             <null>                                                           
+461          461          451          1         false           true         false         [5]                                                                <null>                                                             <null>                                                           
+538          538          530          2         false           true         true          [1, 3]                                                             <null>                                                             <null>                                                           
+541          541          530          2         false           false        false         [2, 1]                                                             <null>                                                             <null>                                                           
+552          552          544          3         false           true         true          [3, 4, 5]                                                          <null>                                                             <null>                                                           
+556          556          544          2         false           false        false         [1, 2]                                                             <null>                                                             <null>                                                           
+578          578          567          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
+593          593          580          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
+629          629          618          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
+655          655          644          1         false           true         true          [1]                                                                <null>                                                             <null>                                                           
 Row Count : 55
 getColumnName   getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid             4              PartsSupplier   java.lang.Integer   oid             integer            pg_catalog     pg_index      11                    10            0         false            false            false       false                 1           true        true          true      false       
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
index 383002bb93..a9bea61923 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
@@ -1,10 +1,11 @@
-integer      string                                                           
-oid          nspname                                                          
-55           PartsSupplier                                                    
-518          pg_catalog                                                       
-95           SYS                                                              
-386          SYSADMIN                                                         
+integer      string                                                             integer    
+oid          nspname                                                            nspowner   
+55           PartsSupplier                                                      0          
+521          pg_catalog                                                         0          
+95           SYS                                                                0          
+389          SYSADMIN                                                           0          
 Row Count : 4
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid            4              PartsSupplier   java.lang.Integer   oid             integer            pg_catalog     pg_namespace  11                    10            0         false            false            false       false                 1           true        true          true      false       
 nspname        12             PartsSupplier   java.lang.String    nspname         string             pg_catalog     pg_namespace  4000                  4000          0         false            true             false       false                 1           true        true          false     false       
+nspowner       4              PartsSupplier   java.lang.Integer   nspowner        integer            pg_catalog     pg_namespace  11                    10            0         false            false            false       false                 1           true        true          true      false       
diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
index 34f78956bb..396447df64 100644
--- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
+++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
@@ -1,47 +1,49 @@
-integer      string                                                             integer       short   char     boolean     integer      integer      char      integer      integer      integer    
-oid          typname                                                            typnamespace  typlen  typtype  typnotnull  typbasetype  typtypmod    typdelim  typrelid     typelem      typinput   
-16           boolean                                                            95            1       b        false       0            -1           ,         0            0            <null>     
-17           varbinary                                                          95            -1      b        false       0            -1           ,         0            0            <null>     
-1043         string                                                             95            -1      b        false       0            -1           ,         0            0            <null>     
-25           text                                                               95            -1      b        false       0            -1           ,         0            0            <null>     
-1042         char                                                               95            1       b        false       0            -1           ,         0            0            <null>     
-21           short                                                              95            2       b        false       0            -1           ,         0            0            <null>     
-20           long                                                               95            8       b        false       0            -1           ,         0            0            <null>     
-23           integer                                                            95            4       b        false       0            -1           ,         0            0            <null>     
-26           oid                                                                95            4       b        false       0            -1           ,         0            0            <null>     
-700          float                                                              95            4       b        false       0            -1           ,         0            0            <null>     
-701          double                                                             95            8       b        false       0            -1           ,         0            0            <null>     
-705          unknown                                                            95            -2      b        false       0            -1           ,         0            0            <null>     
-1082         date                                                               95            4       b        false       0            -1           ,         0            0            <null>     
-1083         datetime                                                           95            8       b        false       0            -1           ,         0            0            <null>     
-1114         timestamp                                                          95            8       b        false       0            -1           ,         0            0            <null>     
-1700         decimal                                                            95            -1      b        false       0            -1           ,         0            0            <null>     
-142          xml                                                                95            -1      b        false       0            -1           ,         0            0            <null>     
-14939        lo                                                                 95            -1      b        false       0            -1           ,         0            0            <null>     
-32816        geometry                                                           95            -1      b        false       0            -1           ,         0            0            <null>     
-2278         void                                                               95            4       p        false       0            -1           ,         0            0            <null>     
-2249         record                                                             95            -1      p        false       0            -1           ,         0            0            <null>     
-30           oidvector                                                          95            -1      b        false       0            -1           ,         0            26           <null>     
-1000         _bool                                                              95            -1      b        false       0            -1           ,         0            16           <null>     
-1001         _bytea                                                             95            -1      b        false       0            -1           ,         0            17           <null>     
-1002         _char                                                              95            -1      b        false       0            -1           ,         0            18           <null>     
-1005         _int2                                                              95            -1      b        false       0            -1           ,         0            21           <null>     
-1007         _int4                                                              95            -1      b        false       0            -1           ,         0            23           <null>     
-1009         _text                                                              95            -1      b        false       0            -1           ,         0            25           <null>     
-1028         _oid                                                               95            -1      b        false       0            -1           ,         0            26           <null>     
-1014         _bpchar                                                            95            -1      b        false       0            -1           ,         0            1042         <null>     
-1015         _varchar                                                           95            -1      b        false       0            -1           ,         0            1043         <null>     
-1016         _int8                                                              95            -1      b        false       0            -1           ,         0            20           <null>     
-1021         _float4                                                            95            -1      b        false       0            -1           ,         0            700          <null>     
-1022         _float8                                                            95            -1      b        false       0            -1           ,         0            701          <null>     
-1115         _timestamp                                                         95            -1      b        false       0            -1           ,         0            1114         <null>     
-1182         _date                                                              95            -1      b        false       0            -1           ,         0            1082         <null>     
-1183         _time                                                              95            -1      b        false       0            -1           ,         0            1083         <null>     
-32824        _geometry                                                          95            -1      b        false       0            -1           ,         0            32816        <null>     
-2287         _record                                                            95            -1      b        false       0            -1           ,         0            2249         <null>     
-2283         anyelement                                                         95            4       p        false       0            -1           ,         0            0            <null>     
-22           int2vector                                                         95            -1      b        false       0            -1           ,         0            0            <null>     
-Row Count : 41
+integer      string                                                             integer       short   char     boolean     integer      integer      char      integer      integer      integer      string                                                             string                                                           
+oid          typname                                                            typnamespace  typlen  typtype  typnotnull  typbasetype  typtypmod    typdelim  typrelid     typelem      typinput     typdefault                                                         teiid_name                                                       
+16           bool                                                               95            1       b        false       0            -1           ,         0            0            <null>       <null>                                                             boolean                                                          
+17           bytea                                                              95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             blob                                                             
+1043         varchar                                                            95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             string                                                           
+25           text                                                               95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             clob                                                             
+1042         char                                                               95            1       b        false       0            -1           ,         0            0            <null>       <null>                                                             <null>                                                           
+21           int2                                                               95            2       b        false       0            -1           ,         0            0            <null>       <null>                                                             short                                                            
+20           int8                                                               95            8       b        false       0            -1           ,         0            0            <null>       <null>                                                             long                                                             
+23           int4                                                               95            4       b        false       0            -1           ,         0            0            <null>       <null>                                                             integer                                                          
+26           oid                                                                95            4       b        false       0            -1           ,         0            0            <null>       <null>                                                             <null>                                                           
+700          float4                                                             95            4       b        false       0            -1           ,         0            0            <null>       <null>                                                             float                                                            
+701          float8                                                             95            8       b        false       0            -1           ,         0            0            <null>       <null>                                                             double                                                           
+705          unknown                                                            95            -2      b        false       0            -1           ,         0            0            <null>       <null>                                                             object                                                           
+1082         date                                                               95            4       b        false       0            -1           ,         0            0            <null>       <null>                                                             date                                                             
+1083         time                                                               95            8       b        false       0            -1           ,         0            0            <null>       <null>                                                             time                                                             
+1114         timestamp                                                          95            8       b        false       0            -1           ,         0            0            <null>       <null>                                                             timestamp                                                        
+1700         numeric                                                            95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             bigdecimal                                                       
+142          xml                                                                95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             xml                                                              
+14939        lo                                                                 95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             <null>                                                           
+32816        geometry                                                           95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             geometry                                                         
+2278         void                                                               95            4       p        false       0            -1           ,         0            0            <null>       <null>                                                             <null>                                                           
+2249         record                                                             95            -1      p        false       0            -1           ,         0            0            <null>       <null>                                                             <null>                                                           
+30           oidvector                                                          95            -1      b        false       0            -1           ,         0            26           <null>       <null>                                                             <null>                                                           
+1000         _bool                                                              95            -1      b        false       0            -1           ,         0            16           <null>       <null>                                                             boolean[]                                                        
+1001         _bytea                                                             95            -1      b        false       0            -1           ,         0            17           <null>       <null>                                                             blob[]                                                           
+1002         _char                                                              95            -1      b        false       0            -1           ,         0            18           <null>       <null>                                                             <null>                                                           
+1005         _int2                                                              95            -1      b        false       0            -1           ,         0            21           <null>       <null>                                                             short[]                                                          
+1007         _int4                                                              95            -1      b        false       0            -1           ,         0            23           <null>       <null>                                                             integer[]                                                        
+1009         _text                                                              95            -1      b        false       0            -1           ,         0            25           <null>       <null>                                                             clob[]                                                           
+1028         _oid                                                               95            -1      b        false       0            -1           ,         0            26           <null>       <null>                                                             <null>                                                           
+1014         _bpchar                                                            95            -1      b        false       0            -1           ,         0            1042         <null>       <null>                                                             <null>                                                           
+1015         _varchar                                                           95            -1      b        false       0            -1           ,         0            1043         <null>       <null>                                                             string[]                                                         
+1016         _int8                                                              95            -1      b        false       0            -1           ,         0            20           <null>       <null>                                                             long[]                                                           
+1021         _float4                                                            95            -1      b        false       0            -1           ,         0            700          <null>       <null>                                                             float[]                                                          
+1022         _float8                                                            95            -1      b        false       0            -1           ,         0            701          <null>       <null>                                                             double[]                                                         
+1031         _numeric                                                           95            -1      b        false       0            -1           ,         0            1700         <null>       <null>                                                             bigdecimal[]                                                     
+1115         _timestamp                                                         95            -1      b        false       0            -1           ,         0            1114         <null>       <null>                                                             timestamp[]                                                      
+1182         _date                                                              95            -1      b        false       0            -1           ,         0            1082         <null>       <null>                                                             date[]                                                           
+1183         _time                                                              95            -1      b        false       0            -1           ,         0            1083         <null>       <null>                                                             time[]                                                           
+32824        _geometry                                                          95            -1      b        false       0            -1           ,         0            32816        <null>       <null>                                                             geometry[]                                                       
+143          _xml                                                               95            -1      b        false       0            -1           ,         0            142          <null>       <null>                                                             xml[]                                                            
+2287         _record                                                            95            -1      b        false       0            -1           ,         0            2249         <null>       <null>                                                             <null>                                                           
+2283         anyelement                                                         95            4       p        false       0            -1           ,         0            0            <null>       <null>                                                             <null>                                                           
+22           int2vector                                                         95            -1      b        false       0            -1           ,         0            0            <null>       <null>                                                             <null>                                                           
+Row Count : 43
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid            4              PartsSupplier   java.lang.Integer   oid             integer            pg_catalog     pg_type       11                    10            0         false            false            false       false                 1           true        true          true      false       
 typname        12             PartsSupplier   java.lang.String    typname         string             pg_catalog     pg_type       4000                  4000          0         false            true             false       false                 1           true        true          false     false       
@@ -55,3 +57,5 @@ typdelim       1              PartsSupplier   java.lang.String    typdelim
 typrelid       4              PartsSupplier   java.lang.Integer   typrelid        integer            pg_catalog     pg_type       11                    10            0         false            false            false       false                 1           true        true          true      false       
 typelem        4              PartsSupplier   java.lang.Integer   typelem         integer            pg_catalog     pg_type       11                    10            0         false            false            false       false                 1           true        true          true      false       
 typinput       4              PartsSupplier   java.lang.Integer   typinput        integer            pg_catalog     pg_type       11                    10            0         false            false            false       false                 1           true        true          true      false       
+typdefault     12             PartsSupplier   java.lang.String    typdefault      string             pg_catalog     pg_type       4000                  4000          0         false            true             false       false                 1           true        true          false     false       
+teiid_name     12             PartsSupplier   java.lang.String    teiid_name      string             pg_catalog     pg_type       4000                  4000          0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestODBCSocketTransport/testInt2Vector.expected b/test-integration/common/src/test/resources/TestODBCSocketTransport/testInt2Vector.expected
index 9b792b5819..650f2b8ac4 100644
--- a/test-integration/common/src/test/resources/TestODBCSocketTransport/testInt2Vector.expected
+++ b/test-integration/common/src/test/resources/TestODBCSocketTransport/testInt2Vector.expected
@@ -57,4 +57,4 @@ indkey
 1                                                                
 Row Count : 55
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-indkey         1111                           java.lang.Object    indkey          int2vector                                      2147483647            2147483647    0         false            true             false       false                 2           false       true          false     true        
+indkey         1111                           java.lang.Object    indkey          int2vector                                      2147483647            2147483647    0         false            true             false       false                 1           false       true          false     true        
diff --git a/test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected b/test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
index f284f79a3c..1225800106 100644
--- a/test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
+++ b/test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
@@ -1,17 +1,17 @@
 int4         varchar                                                            bool       int4         int2      oidvector    _text                                                              _char        _oid            int4        
 oid          proname                                                            proretset  prorettype   pronargs  proargtypes  proargnames                                                        proargmodes  proallargtypes  pronamespace
-383          getXMLSchemas                                                      true       2278         1         1043         {"document","schema"}                                              {i,t}        <null>          95          
-460          isLoggable                                                         false      16           2         1043 1043    {"level","context"}                                                <null>       <null>          386         
-464          loadMatView                                                        false      23           3         1043 1043 1$ {"schemaName","viewName","invalidate"}                             <null>       {1043,1043,16}  386         
-469          logMsg                                                             false      16           3         1043 1043 2$ {"level","context","msg"}                                          <null>       {1043,1043,228$ 386         
-474          matViewStatus                                                      true       2249         2         1043 1043    {"schemaName","viewName","TargetSchemaName","TargetName","Valid",$ {i,i,t,t,t,$ {1043,1043,104$ 386         
-485          refreshMatView                                                     false      23           2         1043 16      {"ViewName","Invalidate"}                                          <null>       {1043,16}       386         
-489          refreshMatViewRow                                                  false      23           3         1043 2283 2$ {"ViewName","Key","KeyOther"}                                      <null>       {1043,2283,228$ 386         
-494          refreshMatViewRows                                                 false      23           2         1043 0       {"ViewName","Key"}                                                 <null>       <null>          386         
-498          setColumnStats                                                     false      2278         6         1043 1043 2$ {"tableName","columnName","distinctCount","nullCount","max","min"$ <null>       {1043,1043,20,$ 386         
-505          setProperty                                                        false      14939        3         1043 1043 1$ {"UID","Name","Value"}                                             <null>       {1043,1043,149$ 386         
-510          setTableStats                                                      false      2278         2         1043 20      {"tableName","cardinality"}                                        <null>       {1043,20}       386         
-513          updateMatView                                                      false      23           3         1043 1043 1$ {"schemaName","viewName","refreshCriteria"}                        <null>       <null>          386         
+386          getXMLSchemas                                                      true       2249         1         1043         {"document","schema"}                                              {i,t}        {1043,142}      95          
+463          isLoggable                                                         false      16           2         1043 1043    {"level","context"}                                                <null>       <null>          389         
+467          loadMatView                                                        false      23           3         1043 1043 1$ {"schemaName","viewName","invalidate"}                             <null>       {1043,1043,16}  389         
+472          logMsg                                                             false      16           3         1043 1043 2$ {"level","context","msg"}                                          <null>       {1043,1043,228$ 389         
+477          matViewStatus                                                      true       2249         2         1043 1043    {"schemaName","viewName","TargetSchemaName","TargetName","Valid",$ {i,i,t,t,t,$ {1043,1043,104$ 389         
+488          refreshMatView                                                     false      23           2         1043 16      {"ViewName","Invalidate"}                                          <null>       {1043,16}       389         
+492          refreshMatViewRow                                                  false      23           3         1043 2283 2$ {"ViewName","Key","KeyOther"}                                      <null>       {1043,2283,228$ 389         
+497          refreshMatViewRows                                                 false      23           2         1043 0       {"ViewName","Key"}                                                 <null>       <null>          389         
+501          setColumnStats                                                     false      2278         6         1043 1043 2$ {"tableName","columnName","distinctCount","nullCount","max","min"$ <null>       {1043,1043,20,$ 389         
+508          setProperty                                                        false      25           3         1043 1043 2$ {"UID","Name","Value"}                                             <null>       {1043,1043,25}  389         
+513          setTableStats                                                      false      2278         2         1043 20      {"tableName","cardinality"}                                        <null>       {1043,20}       389         
+516          updateMatView                                                      false      23           3         1043 1043 1$ {"schemaName","viewName","refreshCriteria"}                        <null>       <null>          389         
 Row Count : 12
 getColumnName   getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 oid             4                              java.lang.Integer   oid             int4                                            11                    10            0         false            false            false       false                 1           false       true          true      true        
@@ -19,8 +19,8 @@ proname         12                             java.lang.String    proname
 proretset       -7                             java.lang.Boolean   proretset       bool                                            1                     1             0         false            false            false       false                 1           false       true          false     true        
 prorettype      4                              java.lang.Integer   prorettype      int4                                            11                    10            0         false            false            false       false                 1           false       true          true      true        
 pronargs        5                              java.lang.Integer   pronargs        int2                                            6                     5             0         false            false            false       false                 1           false       true          true      true        
-proargtypes     1111                           java.lang.Object    proargtypes     oidvector                                       10                    10            0         false            false            false       false                 2           false       true          false     true        
-proargnames     2003                           java.sql.Array      proargnames     _text                                           2147483647            2147483647    0         false            true             false       false                 2           false       true          false     true        
-proargmodes     2003                           java.sql.Array      proargmodes     _char                                           1                     1             0         false            true             false       false                 2           false       true          false     true        
-proallargtypes  2003                           java.sql.Array      proallargtypes  _oid                                            10                    10            0         false            false            false       false                 2           false       true          false     true        
+proargtypes     1111                           java.lang.Object    proargtypes     oidvector                                       10                    10            0         false            false            false       false                 1           false       true          false     true        
+proargnames     2003                           java.sql.Array      proargnames     _text                                           2147483647            2147483647    0         false            true             false       false                 1           false       true          false     true        
+proargmodes     2003                           java.sql.Array      proargmodes     _char                                           1                     1             0         false            true             false       false                 1           false       true          false     true        
+proallargtypes  2003                           java.sql.Array      proallargtypes  _oid                                            10                    10            0         false            false            false       false                 1           false       true          false     true        
 pronamespace    4                              java.lang.Integer   pronamespace    int4                                            11                    10            0         false            false            false       false                 1           false       true          true      true        
diff --git a/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected b/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
index 1b20d8f232..68c9e5700e 100644
--- a/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
+++ b/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
@@ -2,9 +2,9 @@ varchar                                                            varchar
 VDBName                                                            SchemaName                                                         Name                                                               Type                  NameInSource                                                       IsPhysical  SupportsUpdates  UID                                                 Cardinality  Description                                                        IsSystem  IsMaterialized  OID        
 parts                                                              SYS                                                                Columns                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-9bd42fbd-00000001                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6130d2cf-00000024                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                FunctionParams                                                     Table                 <null>                                                             true        false            tid:2cb59cfd55db-7c45e39e-00000077                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Functions                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6f11277b-0000008a                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                GEOMETRY_COLUMNS                                                   Table                 <null>                                                             false       false            tid:2cb59cfd55db-e1a630f0-000000d5                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                FunctionParams                                                     Table                 <null>                                                             true        false            tid:2cb59cfd55db-7c45e39e-00000079                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Functions                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6f11277b-0000008c                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                GEOMETRY_COLUMNS                                                   Table                 <null>                                                             false       false            tid:2cb59cfd55db-e1a630f0-000000d8                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-c5c6549e-0000003a                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYS                                                                Keys                                                               Table                 <null>                                                             true        false            tid:2cb59cfd55db-0023a214-00000048                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            tid:60b87e792634-14d6450e-0000000e                  -1           <null>                                                             true      false           <null>     
@@ -13,34 +13,39 @@ parts                                                              PartsSupplier
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               Table                 STATUS                                                             true        true             mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         3            <null>                                                             false     false           <null>     
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             Table                 SUPPLIER                                                           true        true             mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           <null>     
 parts                                                              PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       Table                 SUPPLIER_PARTS                                                     true        true             mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         227          <null>                                                             false     false           <null>     
-parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-00000057                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000006b                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000095                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000009c                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-000000ab                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-00000059                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000006d                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000097                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000009e                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-000000ae                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           StoredProcedures                                                   Table                 <null>                                                             true        false            tid:60b87e792634-c0d02c23-00000030                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-000000b5                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-000000b8                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           Triggers                                                           Table                 <null>                                                             true        false            tid:60b87e792634-5d71c5db-0000001d                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           Usage                                                              Table                 <null>                                                             true        false            tid:60b87e792634-04e38d81-00000001                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            tid:60b87e792634-1e9b1131-00000019                  -1           <null>                                                             true      false           <null>     
 parts                                                              SYSADMIN                                                           Views                                                              Table                 <null>                                                             true        false            tid:60b87e792634-04ed2a4e-00000028                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-000000c6                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-0000006b                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-00000061                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-00000034                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_attrdef                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-ec00662c-0000004d                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_attribute                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-edc4ea54-0000000f                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_class                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-62e78530-00000004                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_database                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-dda8fac3-00000052                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_description                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-3be1b5b4-00000073                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_index                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-633d048a-00000028                  -1           <null>                                                             true      true            <null>     
+parts                                                              SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-000000c9                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         geography_columns                                                  Table                 <null>                                                             false       false            tid:7ff2755e9621-a5547a1a-0000008d                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-00000071                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-00000067                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-0000003a                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_attrdef                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-ec00662c-00000053                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_attribute                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-edc4ea54-00000013                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_class                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-62e78530-00000005                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_constraint                                                      Table                 <null>                                                             false       false            tid:7ff2755e9621-a751cd25-00000095                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_database                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-dda8fac3-00000058                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_description                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-3be1b5b4-0000007b                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_index                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-633d048a-0000002e                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_inherits                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-80857820-00000085                  -1           <null>                                                             true      false           <null>     
 parts                                                              pg_catalog                                                         pg_namespace                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-37a09513-00000001                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_proc                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ec709e-00000037                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_trigger                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-d50d2370-00000043                  -1           <null>                                                             true      false           <null>     
-parts                                                              pg_catalog                                                         pg_type                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ee5c82-0000001b                  -1           <null>                                                             true      true            <null>     
-parts                                                              pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-0000005c                  -1           <null>                                                             true      false           <null>     
-parts                                                              SYS                                                                spatial_ref_sys                                                    Table                 <null>                                                             false       false            tid:2cb59cfd55db-067724e6-000000ce                  -1           <null>                                                             true      true            <null>     
-Row Count : 40
+parts                                                              pg_catalog                                                         pg_prepared_xacts                                                  Table                 <null>                                                             false       false            tid:7ff2755e9621-7deb875f-00000080                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_proc                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ec709e-0000003d                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_stats                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-63cca057-00000089                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_trigger                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-d50d2370-00000049                  -1           <null>                                                             true      false           <null>     
+parts                                                              pg_catalog                                                         pg_type                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ee5c82-0000001f                  -1           <null>                                                             true      true            <null>     
+parts                                                              pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-00000062                  -1           <null>                                                             true      false           <null>     
+parts                                                              SYS                                                                spatial_ref_sys                                                    Table                 <null>                                                             false       false            tid:2cb59cfd55db-067724e6-000000d1                  -1           <null>                                                             true      true            <null>     
+Row Count : 45
 getColumnName    getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName          12                             java.lang.String    VDBName          varchar                                         255                   255           0         false            true             false       false                 1           false       true          false     true        
 SchemaName       12                             java.lang.String    SchemaName       varchar                                         255                   255           0         false            true             false       false                 1           false       true          false     true        
diff --git a/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected b/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
index f5addc405e..f18988492d 100644
--- a/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
+++ b/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
@@ -99,7 +99,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                Keys                                                               IsIndexed                                                          -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                Keys                                                               RefKeyUID                                                          12           string                                                             50           <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      SYS                                                                Keys                                                               OID                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               TableUID                                                           12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               RefTableUID                                                        12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                Keys                                                               ColPositions                                                       2003         short[]                                                            2            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           VDBName                                                            12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           SchemaName                                                         12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Name                                                               12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -169,6 +171,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_UID                                                             12           string                                                             50           <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  15                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               12           string                                                             255          <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                Schemas                                                            IsPhysical                                                         -7           boolean                                                            1            <null>                                                             0               10              0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -223,11 +226,20 @@ PartsSupplier                                                      SYSADMIN
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              UID                                                                12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               12           string                                                             255          <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            12           string                                                             50           <null>                                                             0               0               0            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 NO                                                                 <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_table_catalog                                                    12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_table_schema                                                     12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_table_name                                                       12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_geography_column                                                 12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  coord_dimension                                                    4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  srid                                                               4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  type                                                               12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     name                                                               12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     uid                                                                12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typlen                                                             5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typlen                                                             5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typtype                                                            1            char                                                               1            <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typbasetype                                                        4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typtypmod                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attnum                                                             5            short                                                              5            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -255,11 +267,21 @@ PartsSupplier                                                      pg_catalog
 PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relnamespace                                                       4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relkind                                                            1            char                                                               1            <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relam                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           reltuples                                                          7            float                                                              7            <null>                                                             3               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relpages                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasrules                                                        -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasoids                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relowner                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relam                                                              4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           reltuples                                                          7            float                                                              7            <null>                                                             3               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relpages                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasrules                                                        -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasoids                                                         -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relnspname                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           reloptions                                                         2003         string[]                                                           4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      conname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      contype                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      consrc                                                             12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      conrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      confrelid                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  6                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      conkey                                                             2003         short[]                                                            2            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  7                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_database                                                        oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_database                                                        encoding                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -283,8 +305,16 @@ PartsSupplier                                                      pg_catalog
 PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indkey                                                             2003         short[]                                                            4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indexprs                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indpred                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        inhrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        inhparent                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        inhseqno                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       nspname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       nspowner                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  transaction                                                        12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  gid                                                                12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  owner                                                              12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  database                                                           12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proretset                                                          -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -295,6 +325,9 @@ PartsSupplier                                                      pg_catalog
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proargmodes                                                        2003         char[]                                                             2147483647   <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  8                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proallargtypes                                                     2003         integer[]                                                          2147483647   <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  9                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pronamespace                                                       4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           schemaname                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           tablename                                                          12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           attname                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgconstrrelid                                                      4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgfoid                                                             4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -316,6 +349,8 @@ PartsSupplier                                                      pg_catalog
 PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typrelid                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  10                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typelem                                                            4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  11                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typinput                                                           4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  12                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typdefault                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  13                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            teiid_name                                                         12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  14                YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_user                                                            oid                                                                4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  1                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usename                                                            12           string                                                             4000         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  2                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usecreatedb                                                        -7           boolean                                                            1            <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
@@ -325,7 +360,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    auth_srid                                                          4            integer                                                            10           <null>                                                             0               10              1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  3                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    srtext                                                             12           string                                                             2048         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  4                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
 PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    proj4text                                                          12           string                                                             2048         <null>                                                             0               0               1            <null>                                                             <null>                                                             <null>                                                             <null>                                                             0                  5                 YES                                                                <null>                                                             <null>                                                             <null>                                                             <null>                                                             NO                                                               
-Row Count : 325
+Row Count : 360
 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            true             false       false                 0           true        true          false     false       
 SchemaName        12             PartsSupplier   java.lang.String    TABLE_SCHEM        string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected b/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
index 52452fb498..55ac4d8385 100644
--- a/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
+++ b/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
@@ -21,17 +21,22 @@ PartsSupplier                                                      SYSADMIN
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_am                                                              SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_class                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_database                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_description                                                     SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_index                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_type                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
 PartsSupplier                                                      pg_catalog                                                         pg_user                                                            SYSTEM TABLE                                                       <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             false     
@@ -40,7 +45,7 @@ PartsSupplier                                                      PartsSupplier
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       TABLE                                                              <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             <null>                                                             true      
-Row Count : 40
+Row Count : 45
 getColumnName              getColumnType  getCatalogName  getColumnClassName  getColumnLabel             getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName                    12             PartsSupplier   java.lang.String    TABLE_CAT                  string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 SchemaName                 12             PartsSupplier   java.lang.String    TABLE_SCHEM                string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
index 3d376d7f2e..af68e3bc7f 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
@@ -4,40 +4,42 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              Body                                                               4            <null>                                                             clob                                                               0            2097152      false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Like Only             <null>                                                             <null>                                                             org.teiid.core.types.ClobType                                      0            0                0            tid:60b87e792634-72976bef-0000002c                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           Body                                                               8            <null>                                                             clob                                                               0            2097152      false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Like Only             <null>                                                             <null>                                                             org.teiid.core.types.ClobType                                      0            0                0            tid:60b87e792634-e9edd218-00000025                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   Body                                                               4            <null>                                                             clob                                                               0            2097152      false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Like Only             <null>                                                             <null>                                                             org.teiid.core.types.ClobType                                      0            0                0            tid:60b87e792634-efd46860-00000034                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   COORD_DIMENSION                                                    5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b5f015fe-000000da                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             Cardinality                                                        9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-4ea6ef0c-000000be                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   COORD_DIMENSION                                                    5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b5f0165b-000000dd                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             Cardinality                                                        9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-4ea6ef69-000000c1                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Cardinality                                                        9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:60b87e792634-6c451db4-00000017                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            CharOctetLength                                                    27           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-22aacf78-0000001c                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         ClobValue                                                          5            <null>                                                             clob                                                               0            2097152      false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Like Only             <null>                                                             <null>                                                             org.teiid.core.types.ClobType                                      0            0                0            tid:2cb59cfd55db-47afd0e5-0000009a                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      14           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-2162f388-000000aa                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bd4e3ace-000000a7                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     DataType                                                           6            <null>                                                             string                                                             0            25           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-12d5a016-0000007d                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    DataType                                                           5            <null>                                                             string                                                             0            25           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-27808056-0000005c                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         ClobValue                                                          5            <null>                                                             clob                                                               0            2097152      false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Like Only             <null>                                                             <null>                                                             org.teiid.core.types.ClobType                                      0            0                0            tid:2cb59cfd55db-47afd123-0000009c                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               ColPositions                                                       13           <null>                                                             short[]                                                            0            2            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:2cb59cfd55db-0731c986-00000055                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DEFERRABILITY                                                      14           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-2162f3c6-000000ac                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                DELETE_RULE                                                        11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bd4e3b0c-000000a9                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     DataType                                                           6            <null>                                                             string                                                             0            25           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-12d5a054-0000007f                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    DataType                                                           5            <null>                                                             string                                                             0            25           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-27808094-0000005e                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            DataType                                                           7            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-6847855d-00000008                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            DefaultValue                                                       24           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-dc4bf309-00000019                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         Description                                                        7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3b85e6c0-00000072                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         Description                                                        7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3b85e6fe-00000074                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          Description                                                        18           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-80061b6e-00000036                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               Description                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-84fac678-0000004d                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Description                                                        15           <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a0f759ce-00000086                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          Description                                                        6            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-af0b643e-00000090                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             Description                                                        10           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b57b857a-000000bf                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Description                                                        15           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b5a23a0e-00000066                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            Description                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b9b3a778-000000b0                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Description                                                        15           <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a0f75a0c-00000088                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          Description                                                        6            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-af0b647c-00000092                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             Description                                                        10           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b57b85d7-000000c2                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Description                                                        15           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b5a23a4c-00000068                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            Description                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b9b3a7d5-000000b3                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Description                                                        30           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f6693f15-0000001f                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            DistinctCount                                                      20           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-c22a728c-00000015                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              ElementName                                                        6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-c2184a6d-00000007                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      8            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4747ddad-000000a4                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f5c80e3e-000000a1                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fca7b4bf-000000a3                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d1ff2aa8-000000a2                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7a64ef83-000000a8                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_GEOMETRY_COLUMN                                                  4            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4c2ef36c-000000d9                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_TABLE_CATALOG                                                    1            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-25fe49d1-000000d6                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_TABLE_NAME                                                       3            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f457b3b7-000000d8                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_TABLE_SCHEMA                                                     2            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9f5db04d-000000d7                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKCOLUMN_NAME                                                      8            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4747ddeb-000000a6                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_CAT                                                        5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f5c80e7c-000000a3                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_NAME                                                       7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fca7b4fd-000000a5                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FKTABLE_SCHEM                                                      6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d1ff2ae6-000000a4                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_NAME                                                            12           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7a64efc1-000000aa                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                FK_UID                                                             15           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f9d6afb2-000000ad                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_GEOMETRY_COLUMN                                                  4            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4c2ef3c9-000000dc                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_TABLE_CATALOG                                                    1            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-25fe4a2e-000000d9                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_TABLE_NAME                                                       3            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f457b414-000000db                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   F_TABLE_SCHEMA                                                     2            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9f5db0aa-000000da                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Format                                                             23           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-778ef750-00000018                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a18a3895-0000007a                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionUID                                                        4            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-93bcfb2a-0000007b                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a18a38d3-0000007c                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionUID                                                        4            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-93bcfb68-0000007d                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            IsAutoIncremented                                                  16           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-6754f3ae-00000011                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          IsAutoIncremented                                                  10           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-f0f1d007-0000002e                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            IsCaseSensitive                                                    13           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-3d7cab55-0000000e                  <null>                                                             <null>     
@@ -45,35 +47,35 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                Columns                                                            IsCurrency                                                         15           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-639f86b4-00000010                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               IsIndexed                                                          8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-51134ae3-00000050                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            IsLengthFixed                                                      10           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-35aa7bbd-0000000b                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             IsMaterialized                                                     12           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-d1b2233f-000000c1                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             IsMaterialized                                                     12           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-d1b2239c-000000c4                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          IsPhysical                                                         3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-8ffc53d3-00000027                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             IsPhysical                                                         6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-c571bddf-000000bb                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            IsPhysical                                                         3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-c9a9dfdd-000000ae                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             IsPhysical                                                         6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-c571be3c-000000be                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            IsPhysical                                                         3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-c9a9e03a-000000b1                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          IsSigned                                                           9            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-79a3b498-0000002d                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            IsSigned                                                           14           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-f006d83f-0000000f                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          IsStandard                                                         2            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-192d91b9-00000026                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             IsSystem                                                           11           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-b00021b7-000000c0                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          IsVarArgs                                                          7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-155ac05c-00000091                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             IsSystem                                                           11           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-b0002214-000000c3                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          IsVarArgs                                                          7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-155ac09a-00000093                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            JavaClass                                                          25           <null>                                                             string                                                             0            500          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3d6c478f-0000001a                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          JavaClass                                                          5            <null>                                                             string                                                             0            500          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-c70923e8-00000029                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            9            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:2cb59cfd55db-785a73fd-000000a5                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                KEY_SEQ                                                            9            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:2cb59cfd55db-785a743b-000000a7                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyName                                                            5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7a105977-0000003f                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         KeyType                                                            6            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7a136e26-00000040                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Length                                                             9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-813d3a3f-0000000a                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           LoadState                                                          7            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-a016d771-00000015                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            MaxRange                                                           19           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-1537d992-00000014                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            MinRange                                                           18           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-ab593d64-00000013                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               1            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0af484db-00000096                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3f0ba98f-0000006e                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               1            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0af48519-00000098                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3f0ba9cd-00000070                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-479a6ab8-0000003e                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          Name                                                               1            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-838bde3d-00000025                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-88808947-0000004c                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Name                                                               5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a47d1c9d-0000007c                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-aff6b8bf-000000c7                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b291270d-0000008d                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b9014849-000000b8                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b927fcdd-0000005b                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bd396a47-000000ad                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Name                                                               5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a47d1cdb-0000007e                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-aff6b91c-000000ca                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b291274b-0000008f                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b90148a6-000000bb                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b927fd1b-0000005d                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bd396aa4-000000b0                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f9ef01e4-00000005                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              Name                                                               5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-36ab6191-00000006                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-729cacd8-0000002b                  <null>                                                             <null>     
@@ -81,58 +83,58 @@ PartsSupplier                                                      SYSADMIN
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           Name                                                               4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-e9f31301-00000021                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   Name                                                               3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-efd9a949-00000033                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            NameInSource                                                       6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-2cefbca4-00000007                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         NameInSource                                                       4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-720c644f-0000006f                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         NameInSource                                                       4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-720c648d-00000071                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               NameInSource                                                       6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bb814407-0000004e                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          NameInSource                                                       4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-e591e1cd-0000008e                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             NameInSource                                                       5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-ec020309-000000ba                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          NameInSource                                                       4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-e591e20b-00000090                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             NameInSource                                                       5            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-ec020366-000000bd                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            NullCount                                                          21           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-adde2ae1-00000016                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          NullType                                                           8            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-15a10113-0000002c                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     NullType                                                           13           <null>                                                             string                                                             0            10           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-36923f73-00000084                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    NullType                                                           13           <null>                                                             string                                                             0            10           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4b3d1fb3-00000064                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     NullType                                                           13           <null>                                                             string                                                             0            10           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-36923fb1-00000086                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    NullType                                                           13           <null>                                                             string                                                             0            10           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4b3d1ff1-00000066                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            NullType                                                           17           <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8c0424ba-00000012                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         OID                                                                4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-0ad0c7da-00000099                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         OID                                                                8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-3ee7ec8e-00000073                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         OID                                                                4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-0ad0c818-0000009b                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         OID                                                                8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-3ee7eccc-00000075                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         OID                                                                10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-4776adb7-00000044                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          OID                                                                19           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-8368213c-00000037                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               OID                                                                11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-885ccc46-00000053                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             OID                                                                13           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b8dd8b48-000000c2                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    OID                                                                16           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b9043fdc-00000067                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            OID                                                                7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bd15ad46-000000b2                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             OID                                                                13           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b8dd8ba5-000000c5                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    OID                                                                16           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b904401a-00000069                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            OID                                                                7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bd15ada3-000000b5                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            OID                                                                31           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-f9cb44e3-00000020                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Optional                                                           8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-b827bdb2-0000005f                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Optional                                                           8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-b827bdf0-00000061                  <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_COLOR                                                         3            PART_COLOR                                                         string                                                             0            30           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            30               10           mmuuid:015c0d00-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PART_ID                                                            2            PART_ID                                                            string                                                             0            4            true           true            true             true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            4                10           mmuuid:3fc400c0-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_ID                                                            1            PART_ID                                                            string                                                             0            4            true           true            true             true             true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            4                10           mmuuid:fadcd7c0-73fe-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_NAME                                                          2            PART_NAME                                                          string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:0067e900-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_WEIGHT                                                        4            PART_WEIGHT                                                        string                                                             0            255          false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            255              10           mmuuid:015c0d01-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-98661eb7-000000a0                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-c6b709c8-0000009d                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-49982a75-0000009f                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-231d6bb2-0000009e                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            13           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8b63400d-000000a9                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKCOLUMN_NAME                                                      4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-98661ef5-000000a2                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_CAT                                                        1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-c6b70a06-0000009f                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_NAME                                                       3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-49982ab3-000000a1                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PKTABLE_SCHEM                                                      2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-231d6bf0-000000a0                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                PK_NAME                                                            13           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-8b63404b-000000ab                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Position                                                           5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-2a371082-00000006                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         Position                                                           9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-77e27956-00000043                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Position                                                           7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-d4c52b3b-0000007e                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Position                                                           6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-e9700b7b-0000005d                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Position                                                           7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-d4c52b79-00000080                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Position                                                           6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-e9700bb9-0000005f                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Precision                                                          26           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-1f356797-0000001b                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          Precision                                                          12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-a8d243f0-00000030                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Precision                                                          9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-c9c38250-00000080                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Precision                                                          9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-de6e6290-00000060                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d1df0526-000000b1                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bf0c0e10-0000005a                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Precision                                                          9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-c9c3828e-00000082                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Precision                                                          9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-de6e62ce-00000062                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            PrimaryMetamodelURI                                                6            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d1df0583-000000b4                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bf0c0e4e-0000005c                  <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       QUANTITY                                                           3            QUANTITY                                                           short                                                              0            0            true           true            true             false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    3            0                10           mmuuid:3fc400c1-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          Radix                                                              13           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-88181376-00000031                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Radix                                                              12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-a90951d6-00000083                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Radix                                                              12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bdb43216-00000063                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Radix                                                              12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-a9095214-00000085                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Radix                                                              12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bdb43254-00000065                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Radix                                                              28           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-fe7b371d-0000001d                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         RefKeyUID                                                          7            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-5ab65fd1-00000041                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               RefKeyUID                                                          9            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9b9c7e60-00000051                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         ReturnsResults                                                     5            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-078e9037-00000070                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               RefTableUID                                                        12           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7c55edd1-00000054                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         ReturnsResults                                                     5            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-078e9075-00000072                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          RuntimeType                                                        16           <null>                                                             string                                                             0            64           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-13cebea4-00000034                  <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             SHIPPER_ID                                                         1            SHIPPER_ID                                                         short                                                              0            0            true           true            true             false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    2            0                10           mmuuid:121bc540-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       SHIPPER_ID                                                         4            SHIPPER_ID                                                         short                                                              0            0            true           true            true             false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    2            0                10           mmuuid:3fc400c2-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             SHIPPER_NAME                                                       2            SHIPPER_NAME                                                       string                                                             0            30           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            30               10           mmuuid:130fe940-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   SRID                                                               6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-d40f195c-000000db                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   SRID                                                               6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-d40f19b9-000000de                  <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               STATUS_ID                                                          1            STATUS_ID                                                          short                                                              0            0            true           true            true             false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    2            0                10           mmuuid:201d9600-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               STATUS_NAME                                                        2            STATUS_NAME                                                        string                                                             0            30           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            30               10           mmuuid:201d9601-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_CITY                                                      4            SUPPLIER_CITY                                                      string                                                             0            30           false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            30               10           mmuuid:2fe92a40-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
@@ -142,15 +144,15 @@ PartsSupplier                                                      PartsSupplier
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_STATE                                                     5            SUPPLIER_STATE                                                     string                                                             0            2            false          true            true             true             true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            2                10           mmuuid:2fe92a41-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_STATUS                                                    3            SUPPLIER_STATUS                                                    short                                                              0            0            true           true            true             false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           All Except Like       <null>                                                             <null>                                                             java.lang.Short                                                    2            0                10           mmuuid:2f044882-73ff-1edc-a81c-ecf397b10590         <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          Scale                                                              6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-882708bc-0000002a                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Scale                                                              11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-a918471c-00000082                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Scale                                                              11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bdc3275c-00000062                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Scale                                                              11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-a918475a-00000084                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Scale                                                              11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-bdc3279a-00000064                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Scale                                                              8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-fe8a2c63-00000009                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-006a75de-00000079                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0e7e804e-0000008c                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-14eea18a-000000b7                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-1515561e-00000059                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-006a761c-0000007b                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0e7e808c-0000008e                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-14eea1e7-000000ba                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-1515565c-0000005b                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-55dc5b25-00000003                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9af902d0-0000006d                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-9af9030e-0000006f                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a387c3f9-0000003c                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-e46de288-0000004a                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           SchemaName                                                         2            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-328cd032-00000010                  <null>                                                             <null>     
@@ -162,41 +164,42 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                DataTypes                                                          SearchType                                                         14           <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-cfe020b4-00000032                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           Status                                                             7            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-7e00e068-00000024                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            SupportsSelect                                                     11           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-138587f9-0000000c                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             SupportsUpdates                                                    7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-52aef324-000000bc                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             SupportsUpdates                                                    7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-52aef381-000000bf                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            SupportsUpdates                                                    12           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:2cb59cfd55db-939cacbf-0000000d                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   TYPE                                                               7            <null>                                                             string                                                             0            30           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d40fa8dc-000000dc                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   TYPE                                                               7            <null>                                                             string                                                             0            30           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-d40fa939-000000df                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          3            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-485e2f66-0000003d                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          3            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-89444df5-0000004b                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fab2c692-00000004                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           TableName                                                          3            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-eab6d7af-00000020                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               TableUID                                                           11           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-56d6d05e-00000053                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           TableUID                                                           9            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-b8495a18-00000026                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetName                                                         5            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-6a4a9422-00000013                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                   4            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-4ebf84a3-00000012                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           TriggerEvent                                                       6            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-08927838-00000023                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           TriggerType                                                        5            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-24a18948-00000022                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               Type                                                               7            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-88839df6-0000004f                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Type                                                               8            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a480314c-0000007f                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             Type                                                               4            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b9045cf8-000000b9                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Type                                                               7            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b92b118c-0000005e                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Type                                                               8            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a480318a-00000081                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             Type                                                               4            <null>                                                             string                                                             0            20           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b9045d55-000000bc                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Type                                                               7            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b92b11ca-00000060                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeLength                                                         7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-98a4ae72-0000002b                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     TypeLength                                                         10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b995ecd2-00000081                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    TypeLength                                                         10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-ce40cd12-00000061                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     TypeLength                                                         10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b995ed10-00000083                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    TypeLength                                                         10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-ce40cd50-00000063                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          TypeName                                                           4            <null>                                                             string                                                             0            100          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-5eeea497-00000028                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                3            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0ad0de60-00000098                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                6            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3ee80314-00000071                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                3            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0ad0de9e-0000009a                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                6            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-3ee80352-00000073                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         UID                                                                8            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-4776c43d-00000042                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          UID                                                                15           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-836837c2-00000033                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                10           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-885ce2cc-00000052                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     UID                                                                14           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a4597622-00000085                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          UID                                                                5            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b26d8092-0000008f                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                8            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b8dda1ce-000000bd                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                14           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b9045662-00000065                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                4            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bd15c3cc-000000af                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     UID                                                                14           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-a4597660-00000087                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          UID                                                                5            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b26d80d0-00000091                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                8            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b8dda22b-000000c0                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                14           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b90456a0-00000067                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                4            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-bd15c429-000000b2                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            UID                                                                29           <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f9cb5b69-0000001e                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              UID                                                                2            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-3687bb16-00000003                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              UID                                                                5            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-7279065d-0000002d                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   UID                                                                5            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-efb602ce-00000035                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-ddfdca70-000000a6                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                UPDATE_RULE                                                        10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-ddfdcaae-000000a8                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Updated                                                            8            <null>                                                             timestamp                                                          0            12           false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.sql.Timestamp                                                 0            0                0            tid:60b87e792634-2bba00e1-00000016                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              Uses_ElementName                                                   11           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-2160869a-0000000c                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              Uses_Name                                                          10           <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-c3d8ce04-0000000b                  <null>                                                             <null>     
@@ -204,128 +207,160 @@ PartsSupplier                                                      SYSADMIN
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              Uses_UID                                                           7            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-2a917443-00000008                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              Uses_object_type                                                   8            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-49ae834d-00000009                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-36f28338-00000002                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7c0f2ae3-0000006c                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-7c0f2b21-0000006e                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-849dec0c-0000003b                  <null>                                                             <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-c5840a9b-00000049                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-e1809df1-00000078                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-ef94a861-0000008b                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f604c99d-000000b6                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f62b7e31-00000058                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fa3ceb9b-000000ac                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-e1809e2f-0000007a                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-ef94a89f-0000008d                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f604c9fa-000000b9                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-f62b7e6f-0000005a                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-fa3cebf8-000000af                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-13a2f845-0000000f                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-26f69455-0000001e                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-2cdd2a9d-00000031                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-73aee2e5-00000002                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              VDBName                                                            1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-afa02e2c-00000029                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Valid                                                              6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:60b87e792634-db642822-00000014                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         Value                                                              2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0fb93781-00000097                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            2            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-27ff7ecc-000000c8                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adbin                                                              3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-b0948a13-00000050                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adnum                                                              2            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-b094b892-0000004f                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adrelid                                                            1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-6765c540-0000004e                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adsrc                                                              4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-b094caf0-00000051                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_am                                                              amname                                                             2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-a44d273f-00000036                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atthasdef                                                          10           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-8b558751-00000019                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attisdropped                                                       9            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-9c40981a-00000018                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attlen                                                             5            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-4826ae19-00000014                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attname                                                            3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-73cc52f1-00000012                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attname                                                            3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-81f4e0a8-00000064                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attnotnull                                                         8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-ebd3e35e-00000017                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attnum                                                             6            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-4826b78a-00000015                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attnum                                                             2            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-564f4541-00000063                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attrelid                                                           2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-bd149bb8-00000011                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attrelid                                                           1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-cb3d296f-00000062                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atttypid                                                           4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-bd39f12a-00000013                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atttypmod                                                          7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-a120a8bd-00000016                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    auth_name                                                          2            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b1dc2744-000000d1                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    auth_srid                                                          3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b1deac73-000000d2                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       autoinc                                                            6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-83aa4bcb-00000067                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_description                                                     classoid                                                           2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-2b28c946-00000075                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         Value                                                              2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-0fb937bf-00000099                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            2            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-27ff7f29-000000cb                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adbin                                                              3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-b09487e5-00000056                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adnum                                                              2            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-b094b664-00000055                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adrelid                                                            1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-6765c312-00000054                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         adsrc                                                              4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-b094c8c2-00000057                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_am                                                              amname                                                             2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-a44d2cb2-0000003c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atthasdef                                                          10           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-8b5584e5-0000001d                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attisdropped                                                       9            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-9c4095ae-0000001c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attlen                                                             5            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-4826abad-00000018                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attname                                                            3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-73cc5085-00000016                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attname                                                            3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-81f4e162-0000006a                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           attname                                                            3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-fbeb9ea9-0000008c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attnotnull                                                         8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-ebd3e0f2-0000001b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attnum                                                             6            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-4826b51e-00000019                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attnum                                                             2            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-564f45fb-00000069                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       attrelid                                                           2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-bd14994c-00000015                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attrelid                                                           1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-cb3d2a29-00000068                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atttypid                                                           4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-bd39eebe-00000017                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       atttypmod                                                          7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-a120a651-0000001a                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    auth_name                                                          2            <null>                                                             string                                                             0            256          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-b1dc24b9-000000d4                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    auth_srid                                                          3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-b1dea9e8-000000d5                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       autoinc                                                            6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-83aa4c85-0000006d                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_description                                                     classoid                                                           2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-2b28cef7-0000007d                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      confrelid                                                          6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-1c44745a-0000009b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      conkey                                                             7            <null>                                                             short[]                                                            0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-faf8df27-0000009c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      conname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-846db497-00000097                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      conrelid                                                           5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-29cc6cbc-0000009a                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      consrc                                                             4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-faf8feac-00000099                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       contents                                                           2            <null>                                                             blob                                                               0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             org.teiid.core.types.BlobType                                      0            0                0            tid:60b87e792634-2c5e88bd-0000001b                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datacl                                                             7            <null>                                                             object                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-dad63568-00000059                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datallowconn                                                       5            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-5e2b9813-00000057                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datconfig                                                          6            <null>                                                             object                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-1944356e-00000058                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datdba                                                             8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-dad64081-0000005a                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datlastsysoid                                                      4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-6243d89f-00000056                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-80afd677-00000054                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        dattablespace                                                      9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-5f2f94a4-0000005b                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_description                                                     description                                                        4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-9b185bf0-00000077                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        encoding                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-90a3a928-00000055                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indexprs                                                           9            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-3c9062c4-00000031                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indexrelid                                                         2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-6368f007-0000002a                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indisclustered                                                     5            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-47ce2315-0000002d                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indisprimary                                                       7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-2c22f2be-0000002f                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indisunique                                                        6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-56a13c7f-0000002e                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indkey                                                             8            <null>                                                             short[]                                                            0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-ef456845-00000030                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indnatts                                                           4            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-3d04d106-0000002c                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indpred                                                            10           <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-a9b494a5-00000032                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indrelid                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-3d3ee11a-0000002b                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     name                                                               3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-9edf65cd-0000006e                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       nspname                                                            5            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-2fb8ac52-00000066                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      contype                                                            3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-8470c946-00000098                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  coord_dimension                                                    5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-c02f5bcd-00000092                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  database                                                           4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-dc3a58ad-00000084                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datacl                                                             7            <null>                                                             object                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-dad63622-0000005f                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datallowconn                                                       5            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-5e2b98cd-0000005d                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datconfig                                                          6            <null>                                                             object                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-19443628-0000005e                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datdba                                                             8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-dad6413b-00000060                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datlastsysoid                                                      4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-6243d959-0000005c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        datname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-80afd731-0000005a                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        dattablespace                                                      9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-5f2f955e-00000061                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_description                                                     description                                                        4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-9b1861a1-0000007f                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        encoding                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-90a3a9e2-0000005b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_geography_column                                                 4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-6408d763-00000091                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_table_catalog                                                    1            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-818ce3c0-0000008e                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_table_name                                                       3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-a1e48906-00000090                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  f_table_schema                                                     2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-8a35999c-0000008f                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  gid                                                                2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-7192d6f4-00000082                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indexprs                                                           9            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-3c906837-00000037                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indexrelid                                                         2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-6368f57a-00000030                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indisclustered                                                     5            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-47ce2888-00000033                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indisprimary                                                       7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-2c22f831-00000035                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indisunique                                                        6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-56a141f2-00000034                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indkey                                                             8            <null>                                                             short[]                                                            0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-ef456db8-00000036                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indnatts                                                           4            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-3d04d679-00000032                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indpred                                                            10           <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-a9b49a18-00000038                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           indrelid                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-3d3ee68d-00000031                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        inhparent                                                          2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-a3c4e674-00000087                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        inhrelid                                                           1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-fcf5dd98-00000086                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        inhseqno                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-fd040884-00000088                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     name                                                               3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-9edf639f-00000074                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       nspname                                                            5            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-2fb8ad0c-0000006c                  <null>                                                             <null>     
 PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       nspname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-e0557576-00000003                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       nspowner                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-866d8b68-00000004                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              object_type                                                        3            <null>                                                             string                                                             0            50           false          true            false            true             false     false       false              No Nulls              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-ea664720-00000004                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_description                                                     objoid                                                             1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-c4e3a167-00000074                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_description                                                     objsubid                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-0814e8b8-00000076                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-2aa6299f-00000053                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-35dd0fef-00000029                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_description                                                     objoid                                                             1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-c4e3a718-0000007c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_description                                                     objsubid                                                           3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-0814ee69-0000007e                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-2aa62a59-00000059                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-35dd1562-0000002f                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-4bbaf754-00000096                  <null>                                                             <null>     
 PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-5ace9aea-00000002                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-7f51b3be-00000005                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9c09440f-00000010                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9ead990c-0000006c                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_user                                                            oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-a354931a-0000005d                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-b1cdf706-0000001c                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-d2728b3a-00000044                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-eef9ae2e-00000038                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_am                                                              oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-f8954452-00000035                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proallargtypes                                                     9            <null>                                                             integer[]                                                          0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-f418fc1b-00000040                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proargmodes                                                        8            <null>                                                             char[]                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-c6363cab-0000003f                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proargnames                                                        7            <null>                                                             string[]                                                           0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-c63e18c3-0000003e                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proargtypes                                                        6            <null>                                                             integer[]                                                          0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-c69d99f4-0000003d                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    proj4text                                                          5            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-22ca82a6-000000d4                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-dc8a0f1c-00000039                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pronamespace                                                       10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-d10355b2-00000041                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pronargs                                                           5            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-b3a7dc22-0000003c                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proretset                                                          3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-c7507172-0000003a                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            prorettype                                                         4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-21ae7072-0000003b                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relam                                                              5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-85c60879-00000009                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasoids                                                         9            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-c399e0be-0000000d                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasrules                                                        8            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-c4715c2a-0000000c                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relkind                                                            4            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-c05405a1-00000008                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-c0554498-00000006                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       relname                                                            4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-eb3562a0-00000065                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relnamespace                                                       3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-04453ed6-00000007                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relpages                                                           7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-5f0eb4bf-0000000b                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           reltuples                                                          6            <null>                                                             float                                                              3            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Float                                                    7            0                10           tid:7ff2755e9621-9f589978-0000000a                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-7f51b3dd-00000006                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9c0941a3-00000014                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9ead96de-00000072                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_user                                                            oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-a35490ec-00000063                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-b1cdf782-00000020                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-d2728bf4-0000004a                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-eef9b3a1-0000003e                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_am                                                              oid                                                                1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-f89549c5-0000003b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  owner                                                              3            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-77e539e5-00000083                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proallargtypes                                                     9            <null>                                                             integer[]                                                          0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-f419018e-00000046                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proargmodes                                                        8            <null>                                                             char[]                                                             0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-c636421e-00000045                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proargnames                                                        7            <null>                                                             string[]                                                           0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-c63e1e36-00000044                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proargtypes                                                        6            <null>                                                             integer[]                                                          0            2147483647   false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Unsearchable          <null>                                                             <null>                                                             java.lang.Object                                                   0            0                0            tid:7ff2755e9621-c69d9f67-00000043                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    proj4text                                                          5            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-22ca801b-000000d7                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-dc8a148f-0000003f                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pronamespace                                                       10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-d1035b25-00000047                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pronargs                                                           5            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-b3a7e195-00000042                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            proretset                                                          3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-c75076e5-00000040                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            prorettype                                                         4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-21ae75e5-00000041                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relam                                                              6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-85c60898-0000000b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasoids                                                         10           <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-c399e0dd-0000000f                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relhasrules                                                        9            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-c4715c49-0000000e                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relkind                                                            4            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-c05405c0-00000009                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-c05544b7-00000007                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       relname                                                            4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-eb35635a-0000006b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relnamespace                                                       3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-04453ef5-00000008                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relnspname                                                         11           <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-1f8ba7b0-00000010                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           reloptions                                                         12           <null>                                                             string[]                                                           0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-4f89a5f8-00000011                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relowner                                                           5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-5f0ab7cd-0000000a                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           relpages                                                           8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-5f0eb4de-0000000d                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           reltuples                                                          7            <null>                                                             float                                                              3            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Float                                                    7            0                10           tid:7ff2755e9621-9f589997-0000000c                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       resourcePath                                                       1            <null>                                                             string                                                             0            255          false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:60b87e792634-374412f6-0000001a                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    srid                                                               1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-5b01883c-000000cf                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    srtext                                                             4            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-2585948e-000000d3                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgargs                                                             4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9e3c4b40-00000047                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgconstrname                                                       8            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-2ba0989d-0000004b                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgconstrrelid                                                      2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9f72b482-00000045                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgdeferrable                                                       6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-2e2d78bd-00000049                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgfoid                                                             3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9e3e8607-00000046                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tginitdeferred                                                     7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-cb893452-0000004a                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgnargs                                                            5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-80c2c928-00000048                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgrelid                                                            9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-80fce251-0000004c                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typbasetype                                                        7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-17871652-00000022                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typdelim                                                           9            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-89762000-00000024                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typelem                                                            11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-7ef359d6-00000026                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typinput                                                           12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-89c0bd5b-00000027                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typlen                                                             5            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-6b7bbaec-00000070                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typlen                                                             4            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-7e9c18e6-0000001f                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-6bd6ead8-0000006d                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-7ef748d2-0000001d                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typnamespace                                                       3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-b928886c-0000001e                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typnotnull                                                         6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-68dd732b-00000021                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       typoid                                                             7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-76ffff5b-00000068                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typrelid                                                           10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-8a3b6905-00000025                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typtype                                                            5            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-7efa5d81-00000020                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typtypmod                                                          8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-ebc68c1e-00000023                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     uid                                                                4            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-9eadaf92-0000006f                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usecreatedb                                                        3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-58579251-0000005f                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usename                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-9a8c09e2-0000005e                  <null>                                                             <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usesuper                                                           4            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-938deba4-00000060                  <null>                                                             <null>     
-Row Count : 325
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           schemaname                                                         1            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-0975d9a9-0000008a                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    srid                                                               1            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:2cb59cfd55db-5b0185b1-000000d2                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  srid                                                               6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-aa2326eb-00000093                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    srtext                                                             4            <null>                                                             string                                                             0            2048         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:2cb59cfd55db-25859203-000000d6                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           tablename                                                          2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-adac0156-0000008b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            teiid_name                                                         14           <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-dfefddcf-0000002d                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgargs                                                             4            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9e3c4bfa-0000004d                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgconstrname                                                       8            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-2ba09957-00000051                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgconstrrelid                                                      2            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9f72b53c-0000004b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgdeferrable                                                       6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-2e2d7977-0000004f                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgfoid                                                             3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-9e3e86c1-0000004c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tginitdeferred                                                     7            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-cb89350c-00000050                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgnargs                                                            5            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-80c2c9e2-0000004e                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         tgrelid                                                            9            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-80fce30b-00000052                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  transaction                                                        1            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-f1321a10-00000081                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typbasetype                                                        6            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-0466b62a-00000077                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typbasetype                                                        7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-178716ce-00000026                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typdefault                                                         13           <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-46037b0e-0000002c                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typdelim                                                           9            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-8976207c-00000028                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  type                                                               7            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-aa23b66b-00000094                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typelem                                                            11           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-7ef35a52-0000002a                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typinput                                                           12           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-89c0bdd7-0000002b                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typlen                                                             4            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-6b7bb8be-00000075                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typlen                                                             4            <null>                                                             short                                                              0            2            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Short                                                    5            0                10           tid:7ff2755e9621-7e9c1962-00000023                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-6bd6e8aa-00000073                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typname                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-7ef7494e-00000021                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typnamespace                                                       3            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-b92888e8-00000022                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typnotnull                                                         6            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-68dd73a7-00000025                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       typoid                                                             7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-77000015-0000006e                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typrelid                                                           10           <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-8a3b6981-00000029                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typtype                                                            5            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-6bd9fd59-00000076                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typtype                                                            5            <null>                                                             char                                                               0            1            false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Character                                                0            0                0            tid:7ff2755e9621-7efa5dfd-00000024                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typtypmod                                                          7            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-d8a62bf6-00000078                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            typtypmod                                                          8            <null>                                                             integer                                                            0            4            false          true            false            false            true      false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Integer                                                  10           0                10           tid:7ff2755e9621-ebc68c9a-00000027                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usecreatedb                                                        3            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-58579023-00000065                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usename                                                            2            <null>                                                             string                                                             0            4000         false          true            false            true             false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.String                                                   0            0                0            tid:7ff2755e9621-9a8c07b4-00000064                  <null>                                                             <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_user                                                            usesuper                                                           4            <null>                                                             boolean                                                            0            1            false          true            false            false            false     false       false              Nullable              <null>                                              <null>                                              -1             -1           Searchable            <null>                                                             <null>                                                             java.lang.Boolean                                                  1            0                10           tid:7ff2755e9621-938de976-00000066                  <null>                                                             <null>     
+Row Count : 360
 getColumnName      getColumnType  getCatalogName  getColumnClassName  getColumnLabel     getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName            12             PartsSupplier   java.lang.String    VDBName            string             SYS            Columns       255                   255           0         false            true             false       false                 0           true        true          false     false       
 SchemaName         12             PartsSupplier   java.lang.String    SchemaName         string             SYS            Columns       255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
index 1c785ceaa5..f196932c1e 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
@@ -1,24 +1,60 @@
 string                                                             string                                                             string                                                             string                                              string                                                             string                     integer      string                                                             integer      integer      integer      integer      string      string                                              string                                                           
 VDBName                                                            SchemaName                                                         FunctionName                                                       FunctionUID                                         Name                                                               DataType                   Position     Type                                                               Precision    TypeLength   Scale        Radix        NullType    UID                                                 Description                                                      
-PartsSupplier                                                      pg_catalog                                                         pg_client_encoding                                                 tid:7ff2755e9621-267c14ff-0000007f                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000000                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-0000007a                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-00000001                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-0000007a                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000002                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-0000007a                  result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000003                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         PostGIS_Lib_Version                                                tid:7ff2755e9621-a35b9c90-00000079                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000004                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         encode                                                             tid:7ff2755e9621-b2963e16-00000078                  param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000005                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         encode                                                             tid:7ff2755e9621-b2963e16-00000078                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000006                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         encode                                                             tid:7ff2755e9621-b2963e16-00000078                  result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000007                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         getOid                                                             tid:7ff2755e9621-b5885e94-0000007e                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000008                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         getOid                                                             tid:7ff2755e9621-b5885e94-0000007e                  result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000009                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         asPGVector                                                         tid:7ff2755e9621-e548fc4c-0000007d                  param1                                                             object                     1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-0000000a                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         asPGVector                                                         tid:7ff2755e9621-e548fc4c-0000007d                  result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-0000000b                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007b                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-0000000c                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007b                  param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-0000000d                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007b                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000000e                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007c                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-0000000f                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007c                  param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000010                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007c                  param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000011                       <null>                                                           
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007c                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000012                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         ST_asBinary                                                        tid:7ff2755e9621-09fddaf1-000000a7                  param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000000                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         ST_asBinary                                                        tid:7ff2755e9621-09fddaf1-000000a7                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000001                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         ST_asBinary                                                        tid:7ff2755e9621-09fddaf1-000000a7                  result                                                             blob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000002                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         version                                                            tid:7ff2755e9621-14f51cd8-000000b4                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000003                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_table_is_visible                                                tid:7ff2755e9621-17e348b6-000000af                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-00000004                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_table_is_visible                                                tid:7ff2755e9621-17e348b6-000000af                  result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000005                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_client_encoding                                                 tid:7ff2755e9621-267c14ff-000000b5                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000006                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_schema_privilege                                               tid:7ff2755e9621-2e936898-000000a0                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000007                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_schema_privilege                                               tid:7ff2755e9621-2e936898-000000a0                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000008                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_schema_privilege                                               tid:7ff2755e9621-2e936898-000000a0                  result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000009                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_userbyid                                                    tid:7ff2755e9621-305ef60e-000000a4                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-0000000a                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_userbyid                                                    tid:7ff2755e9621-305ef60e-000000a4                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000000b                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         postgis_version                                                    tid:7ff2755e9621-36e9b5ca-000000ab                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000000c                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         format_type                                                        tid:7ff2755e9621-56f0b282-000000a2                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-0000000d                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         format_type                                                        tid:7ff2755e9621-56f0b282-000000a2                  param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-0000000e                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         format_type                                                        tid:7ff2755e9621-56f0b282-000000a2                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000000f                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-000000ac                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-00000010                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-000000ac                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000011                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-000000ac                  result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000012                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_has_role                                                        tid:7ff2755e9621-7b642043-000000a6                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-00000013                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_has_role                                                        tid:7ff2755e9621-7b642043-000000a6                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000014                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_has_role                                                        tid:7ff2755e9621-7b642043-000000a6                  result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000015                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_constraintdef                                               tid:7ff2755e9621-84079f97-000000b0                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-00000016                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_constraintdef                                               tid:7ff2755e9621-84079f97-000000b0                  param2                                                             boolean                    2            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c38-00000017                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_constraintdef                                               tid:7ff2755e9621-84079f97-000000b0                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000018                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         postgis_proj_version                                               tid:7ff2755e9621-9161e844-000000aa                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000019                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         PostGIS_Lib_Version                                                tid:7ff2755e9621-a35b9c90-000000a8                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000001a                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         obj_description                                                    tid:7ff2755e9621-a36cd4b4-0000009f                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-0000001b                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         obj_description                                                    tid:7ff2755e9621-a36cd4b4-0000009f                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000001c                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         current_schema                                                     tid:7ff2755e9621-a9550b27-000000a3                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000001d                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         encode                                                             tid:7ff2755e9621-b2963e16-0000009e                  param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-0000001e                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         encode                                                             tid:7ff2755e9621-b2963e16-0000009e                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-0000001f                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         encode                                                             tid:7ff2755e9621-b2963e16-0000009e                  result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000020                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         getOid                                                             tid:7ff2755e9621-b5885e94-000000b3                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000021                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         getOid                                                             tid:7ff2755e9621-b5885e94-000000b3                  result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000022                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_type_is_visible                                                 tid:7ff2755e9621-bb134e3a-000000b1                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-00000023                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_type_is_visible                                                 tid:7ff2755e9621-bb134e3a-000000b1                  result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000024                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         col_description                                                    tid:7ff2755e9621-c26d23bd-000000a5                  param1                                                             integer                    1            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c37-00000025                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         col_description                                                    tid:7ff2755e9621-c26d23bd-000000a5                  param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000026                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         col_description                                                    tid:7ff2755e9621-c26d23bd-000000a5                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000027                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         regclass                                                           tid:7ff2755e9621-d6842d64-0000009d                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000028                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         regclass                                                           tid:7ff2755e9621-d6842d64-0000009d                  result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000029                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_table_privilege                                                tid:7ff2755e9621-daf4b7db-000000a1                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-0000002a                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_table_privilege                                                tid:7ff2755e9621-daf4b7db-000000a1                  param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-0000002b                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         has_table_privilege                                                tid:7ff2755e9621-daf4b7db-000000a1                  result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-0000002c                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         asPGVector                                                         tid:7ff2755e9621-e548fc4c-000000b2                  param1                                                             object                     1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-0000002d                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         asPGVector                                                         tid:7ff2755e9621-e548fc4c-000000b2                  result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-0000002e                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ad                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-0000002f                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ad                  param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000030                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ad                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000031                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ae                  param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000032                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ae                  param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000033                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ae                  param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000034                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ae                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000035                       <null>                                                           
+PartsSupplier                                                      pg_catalog                                                         postgis_geos_version                                               tid:7ff2755e9621-f2edeb29-000000a9                  result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000036                       <null>                                                           
 PartsSupplier                                                      SYS                                                                *                                                                  tsid:00000000027131d-00000030                       op1                                                                integer                    1            In                                                                 10           4            0            10           Nullable    tsid:00000000028c163-00000031                       Left operand                                                     
 PartsSupplier                                                      SYS                                                                *                                                                  tsid:00000000027131d-00000030                       op2                                                                integer                    2            In                                                                 10           4            0            10           Nullable    tsid:00000000028c164-00000032                       Right operand                                                    
 PartsSupplier                                                      SYS                                                                *                                                                  tsid:00000000027131d-00000030                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000033                       Left operand * right operand                                     
@@ -364,8 +400,8 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_equals                                                          tsid:00000000125c250-00000cfa                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000cfd                       True if the geometries are equal.                                
 PartsSupplier                                                      SYS                                                                st_endpoint                                                        tsid:00000000156f0a6-00000d7b                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d7c                       LineString Geometry                                              
 PartsSupplier                                                      SYS                                                                st_endpoint                                                        tsid:00000000156f0a6-00000d7b                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000d7d                       end point Geometry                                               
-PartsSupplier                                                      SYS                                                                st_extent                                                          tsid:0000000018801bb-00000e16                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e17                       <null>                                                           
-PartsSupplier                                                      SYS                                                                st_extent                                                          tsid:0000000018801bb-00000e16                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e18                       <null>                                                           
+PartsSupplier                                                      SYS                                                                st_extent                                                          tsid:0000000018801bb-00000e2b                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e2c                       <null>                                                           
+PartsSupplier                                                      SYS                                                                st_extent                                                          tsid:0000000018801bb-00000e2b                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e2d                       <null>                                                           
 PartsSupplier                                                      SYS                                                                rowlimit                                                           tsid:00000000374bd14-000009bd                       element                                                            boolean                    1            In                                                                 1            1            0            10           Nullable    tsid:fffffff9d0a31ef-000009be                       XML tag in the scope of a mapping class                          
 PartsSupplier                                                      SYS                                                                rowlimit                                                           tsid:00000000374bd14-000009bd                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-000009bf                       Number of rows to be limited to                                  
 PartsSupplier                                                      SYS                                                                rowlimit                                                           tsid:00000000374bd14-000009c0                       element                                                            byte                       1            In                                                                 3            1            0            10           Nullable    tsid:fffffff9d0a31ef-000009c1                       XML tag in the scope of a mapping class                          
@@ -488,6 +524,17 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                xmlpi                                                              tsid:000000006f54743-00000c07                       result                                                             xml                        0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000c0a                       XML result                                                       
 PartsSupplier                                                      SYS                                                                st_isring                                                          tsid:0000000081414eb-00000d08                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d09                       LineString Geometry                                              
 PartsSupplier                                                      SYS                                                                st_isring                                                          tsid:0000000081414eb-00000d08                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000d0a                       true if the LineString is a ring                                 
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dbc                       param1                                                             double                     1            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c37-00000dbd                       xmin                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dbc                       param2                                                             double                     2            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c38-00000dbe                       ymin                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dbc                       param3                                                             double                     3            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c39-00000dbf                       xmax                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dbc                       param4                                                             double                     4            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c3a-00000dc0                       ymax                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dbc                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dc1                       Geometry representing the bounding box                           
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dc2                       param1                                                             double                     1            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c37-00000dc3                       xmin                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dc2                       param2                                                             double                     2            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c38-00000dc4                       ymin                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dc2                       param3                                                             double                     3            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c39-00000dc5                       xmax                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dc2                       param4                                                             double                     4            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c3a-00000dc6                       ymax                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dc2                       param5                                                             integer                    5            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c3b-00000dc7                       srid                                                             
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    tsid:000000009b5dbcf-00000dc2                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dc8                       Geometry representing the bounding box                           
 PartsSupplier                                                      SYS                                                                dayofweek                                                          tsid:00000000b455bda-00000145                       date                                                               date                       1            In                                                                 0            4            0            0            Nullable    tsid:0000000005602a1-00000146                       Day of week for date (1 = Sunday)                                
 PartsSupplier                                                      SYS                                                                dayofweek                                                          tsid:00000000b455bda-00000145                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000147                       Day of week for date (1 = Sunday)                                
 PartsSupplier                                                      SYS                                                                dayofweek                                                          tsid:00000000b455bda-00000148                       timestamp                                                          timestamp                  1            In                                                                 0            12           0            0            Nullable    tsid:000000003703c09-00000149                       Day of week for timestamp (1 = Sunday)                           
@@ -510,11 +557,11 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_geomfromwkb                                                     tsid:00000000f315b7d-00000d8d                       param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d8e                       WKB Blob                                                         
 PartsSupplier                                                      SYS                                                                st_geomfromwkb                                                     tsid:00000000f315b7d-00000d8d                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000d8f                       SRID                                                             
 PartsSupplier                                                      SYS                                                                st_geomfromwkb                                                     tsid:00000000f315b7d-00000d8d                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000d90                       Geometry                                                         
-PartsSupplier                                                      SYS                                                                teiid_session_get                                                  tsid:00000000f6b6a14-00000de2                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000de3                       the string key                                                   
-PartsSupplier                                                      SYS                                                                teiid_session_get                                                  tsid:00000000f6b6a14-00000de2                       result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000de4                       the current value                                                
-PartsSupplier                                                      SYS                                                                teiid_session_set                                                  tsid:00000000f6b9720-00000de5                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000de6                       the string key                                                   
-PartsSupplier                                                      SYS                                                                teiid_session_set                                                  tsid:00000000f6b9720-00000de5                       param2                                                             object                     2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000de7                       the value                                                        
-PartsSupplier                                                      SYS                                                                teiid_session_set                                                  tsid:00000000f6b9720-00000de5                       result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000de8                       the previous value if one was set                                
+PartsSupplier                                                      SYS                                                                teiid_session_get                                                  tsid:00000000f6b6a14-00000df7                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000df8                       the string key                                                   
+PartsSupplier                                                      SYS                                                                teiid_session_get                                                  tsid:00000000f6b6a14-00000df7                       result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000df9                       the current value                                                
+PartsSupplier                                                      SYS                                                                teiid_session_set                                                  tsid:00000000f6b9720-00000dfa                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000dfb                       the string key                                                   
+PartsSupplier                                                      SYS                                                                teiid_session_set                                                  tsid:00000000f6b9720-00000dfa                       param2                                                             object                     2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000dfc                       the value                                                        
+PartsSupplier                                                      SYS                                                                teiid_session_set                                                  tsid:00000000f6b9720-00000dfa                       result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dfd                       the previous value if one was set                                
 PartsSupplier                                                      SYS                                                                formatdate                                                         tsid:0000000137b2718-00000b85                       date                                                               date                       1            In                                                                 0            4            0            0            Nullable    tsid:0000000005602a1-00000b86                       Date input                                                       
 PartsSupplier                                                      SYS                                                                formatdate                                                         tsid:0000000137b2718-00000b85                       format                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffb4870aea-00000b87                       Date format                                                      
 PartsSupplier                                                      SYS                                                                formatdate                                                         tsid:0000000137b2718-00000b85                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000b88                       Converted date                                                   
@@ -524,9 +571,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                formattime                                                         tsid:000000013828a37-00000b89                       time                                                               time                       1            In                                                                 0            4            0            0            Nullable    tsid:0000000005d65c0-00000b8a                       Time input                                                       
 PartsSupplier                                                      SYS                                                                formattime                                                         tsid:000000013828a37-00000b89                       format                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffb4870aea-00000b8b                       Time format                                                      
 PartsSupplier                                                      SYS                                                                formattime                                                         tsid:000000013828a37-00000b89                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000b8c                       Converted time                                                   
-PartsSupplier                                                      SYS                                                                st_pointn                                                          tsid:000000013c99f6f-00000dc0                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dc1                       LineString Geometry                                              
-PartsSupplier                                                      SYS                                                                st_pointn                                                          tsid:000000013c99f6f-00000dc0                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000dc2                       index                                                            
-PartsSupplier                                                      SYS                                                                st_pointn                                                          tsid:000000013c99f6f-00000dc0                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dc3                       the Point Geometry if it exists                                  
+PartsSupplier                                                      SYS                                                                st_pointn                                                          tsid:000000013c99f6f-00000dcd                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dce                       LineString Geometry                                              
+PartsSupplier                                                      SYS                                                                st_pointn                                                          tsid:000000013c99f6f-00000dcd                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000dcf                       index                                                            
+PartsSupplier                                                      SYS                                                                st_pointn                                                          tsid:000000013c99f6f-00000dcd                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dd0                       the Point Geometry if it exists                                  
 PartsSupplier                                                      SYS                                                                st_relate                                                          tsid:000000016a791ea-00000d19                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d1a                       Geometry1                                                        
 PartsSupplier                                                      SYS                                                                st_relate                                                          tsid:000000016a791ea-00000d19                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000d1b                       Geometry2                                                        
 PartsSupplier                                                      SYS                                                                st_relate                                                          tsid:000000016a791ea-00000d19                       param3                                                             string                     3            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c39-00000d1c                       Intersection Pattern                                             
@@ -1991,12 +2038,12 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_asgml                                                           tsid:00000004a4a3669-00000d5e                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000d60                       gml clob                                                         
 PartsSupplier                                                      SYS                                                                st_askml                                                           tsid:00000004a4a456d-00000d61                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d62                       Geometry                                                         
 PartsSupplier                                                      SYS                                                                st_askml                                                           tsid:00000004a4a456d-00000d61                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000d63                       kml clob                                                         
-PartsSupplier                                                      SYS                                                                st_point                                                           tsid:00000004b1bcd25-00000dbc                       param1                                                             double                     1            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c37-00000dbd                       X ordinate                                                       
-PartsSupplier                                                      SYS                                                                st_point                                                           tsid:00000004b1bcd25-00000dbc                       param2                                                             double                     2            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c38-00000dbe                       Y ordinate                                                       
-PartsSupplier                                                      SYS                                                                st_point                                                           tsid:00000004b1bcd25-00000dbc                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dbf                       Point Geometry                                                   
-PartsSupplier                                                      SYS                                                                st_union                                                           tsid:00000004b61ce64-00000dde                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000ddf                       Geometry1                                                        
-PartsSupplier                                                      SYS                                                                st_union                                                           tsid:00000004b61ce64-00000dde                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000de0                       Geometry2                                                        
-PartsSupplier                                                      SYS                                                                st_union                                                           tsid:00000004b61ce64-00000dde                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000de1                       the union Geometry                                               
+PartsSupplier                                                      SYS                                                                st_point                                                           tsid:00000004b1bcd25-00000dc9                       param1                                                             double                     1            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c37-00000dca                       X ordinate                                                       
+PartsSupplier                                                      SYS                                                                st_point                                                           tsid:00000004b1bcd25-00000dc9                       param2                                                             double                     2            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c38-00000dcb                       Y ordinate                                                       
+PartsSupplier                                                      SYS                                                                st_point                                                           tsid:00000004b1bcd25-00000dc9                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dcc                       Point Geometry                                                   
+PartsSupplier                                                      SYS                                                                st_union                                                           tsid:00000004b61ce64-00000df3                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000df4                       Geometry1                                                        
+PartsSupplier                                                      SYS                                                                st_union                                                           tsid:00000004b61ce64-00000df3                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000df5                       Geometry2                                                        
+PartsSupplier                                                      SYS                                                                st_union                                                           tsid:00000004b61ce64-00000df3                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000df6                       the union Geometry                                               
 PartsSupplier                                                      SYS                                                                st_numgeometries                                                   tsid:00000004f6cb62b-00000d42                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d43                       Geometry                                                         
 PartsSupplier                                                      SYS                                                                st_numgeometries                                                   tsid:00000004f6cb62b-00000d42                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000d44                       the number of geometries or 1 if the Geometry is not a collection
 PartsSupplier                                                      SYS                                                                ST_GEOMFROMBINARY                                                  tsid:00000005078e8f8-00000d8a                       param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d8b                       WKB Blob                                                         
@@ -2013,8 +2060,8 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                formatfloat                                                        tsid:000000057769fb8-00000b99                       float                                                              float                      1            In                                                                 7            4            3            10           Nullable    tsid:000000005f7354f-00000b9a                       String input                                                     
 PartsSupplier                                                      SYS                                                                formatfloat                                                        tsid:000000057769fb8-00000b99                       format                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffb4870aea-00000b9b                       Number format                                                    
 PartsSupplier                                                      SYS                                                                formatfloat                                                        tsid:000000057769fb8-00000b99                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000b9c                       Float formatted                                                  
-PartsSupplier                                                      SYS                                                                st_pointonsurface                                                  tsid:0000000583306ef-00000dc4                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dc5                       Geometry                                                         
-PartsSupplier                                                      SYS                                                                st_pointonsurface                                                  tsid:0000000583306ef-00000dc4                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dc6                       surface Point Geometry                                           
+PartsSupplier                                                      SYS                                                                st_pointonsurface                                                  tsid:0000000583306ef-00000dd1                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dd2                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_pointonsurface                                                  tsid:0000000583306ef-00000dd1                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dd3                       surface Point Geometry                                           
 PartsSupplier                                                      SYS                                                                dayofmonth                                                         tsid:00000005849aae0-0000013f                       date                                                               date                       1            In                                                                 0            4            0            0            Nullable    tsid:0000000005602a1-00000140                       Day of month for date (1 = 1st)                                  
 PartsSupplier                                                      SYS                                                                dayofmonth                                                         tsid:00000005849aae0-0000013f                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000141                       Day of month for date (1 = 1st)                                  
 PartsSupplier                                                      SYS                                                                dayofmonth                                                         tsid:00000005849aae0-00000142                       timestamp                                                          timestamp                  1            In                                                                 0            12           0            0            Nullable    tsid:000000003703c09-00000143                       Day of month for timestamp (1 = 1st)                             
@@ -2040,9 +2087,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                timestampadd                                                       tsid:00000005eecc2be-0000018b                       count                                                              integer                    2            In                                                                 10           4            0            10           Nullable    tsid:000000005ce6402-0000018d                       Count number                                                     
 PartsSupplier                                                      SYS                                                                timestampadd                                                       tsid:00000005eecc2be-0000018b                       timestamp                                                          timestamp                  3            In                                                                 0            12           0            0            Nullable    tsid:000000003703c09-0000018e                       Timestamp type                                                   
 PartsSupplier                                                      SYS                                                                timestampadd                                                       tsid:00000005eecc2be-0000018b                       result                                                             timestamp                  0            ReturnValue                                                        0            12           0            0            Nullable    tsid:fffffffc874db10-0000018f                       Returned modified timestamp                                      
-PartsSupplier                                                      SYS                                                                st_polygon                                                         tsid:000000061052c4f-00000dc7                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dc8                       LineString Geometry shell                                        
-PartsSupplier                                                      SYS                                                                st_polygon                                                         tsid:000000061052c4f-00000dc7                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000dc9                       SRID                                                             
-PartsSupplier                                                      SYS                                                                st_polygon                                                         tsid:000000061052c4f-00000dc7                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dca                       Polygon Geometry                                                 
+PartsSupplier                                                      SYS                                                                st_polygon                                                         tsid:000000061052c4f-00000dd4                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dd5                       LineString Geometry shell                                        
+PartsSupplier                                                      SYS                                                                st_polygon                                                         tsid:000000061052c4f-00000dd4                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000dd6                       SRID                                                             
+PartsSupplier                                                      SYS                                                                st_polygon                                                         tsid:000000061052c4f-00000dd4                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dd7                       Polygon Geometry                                                 
 PartsSupplier                                                      SYS                                                                session_id                                                         tsid:00000006334f257-00000ad2                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000ad3                       Returns the session id of the currently logged in user           
 PartsSupplier                                                      SYS                                                                formatinteger                                                      tsid:0000000642b085a-00000b8d                       integer                                                            integer                    1            In                                                                 10           4            0            10           Nullable    tsid:000000074dc9431-00000b8e                       String input                                                     
 PartsSupplier                                                      SYS                                                                formatinteger                                                      tsid:0000000642b085a-00000b8d                       format                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffb4870aea-00000b8f                       Number format                                                    
@@ -2053,12 +2100,12 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_centroid                                                        tsid:000000066c6c8d1-00000d6e                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000d70                       centroid Point Geometry value                                    
 PartsSupplier                                                      SYS                                                                st_asgeojson                                                       tsid:00000006734f9dc-00000d5b                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d5c                       Geometry                                                         
 PartsSupplier                                                      SYS                                                                st_asgeojson                                                       tsid:00000006734f9dc-00000d5b                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000d5d                       GeoJSON clob                                                     
-PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000de9                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000dea                       Schema Name                                                      
-PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000de9                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000deb                       View Name                                                        
-PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000de9                       param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000dec                       Current validity of matview table contents                       
-PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000de9                       param4                                                             string                     4            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c3a-00000ded                       Current load status of matview table.                            
-PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000de9                       param5                                                             string                     5            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c3b-00000dee                       Action to be taken by the Teiid when status is not valid         
-PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000de9                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000def                       true if the view is valid to use                                 
+PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000dfe                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000dff                       Schema Name                                                      
+PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000dfe                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e00                       View Name                                                        
+PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000dfe                       param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000e01                       Current validity of matview table contents                       
+PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000dfe                       param4                                                             string                     4            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c3a-00000e02                       Current load status of matview table.                            
+PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000dfe                       param5                                                             string                     5            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c3b-00000e03                       Action to be taken by the Teiid when status is not valid         
+PartsSupplier                                                      SYS                                                                mvstatus                                                           tsid:000000067f44dce-00000dfe                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000e04                       true if the view is valid to use                                 
 PartsSupplier                                                      SYS                                                                endswith                                                           tsid:0000000681c1ab1-00000221                       substring                                                          string                     1            In                                                                 0            4000         0            0            Nullable    tsid:00000001fc68144-00000222                       substring                                                        
 PartsSupplier                                                      SYS                                                                endswith                                                           tsid:0000000681c1ab1-00000221                       string                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffcafc7304-00000223                       string                                                           
 PartsSupplier                                                      SYS                                                                endswith                                                           tsid:0000000681c1ab1-00000221                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000224                       true if string ends with character sequence of substring; false o$ 
@@ -2074,9 +2121,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                xpathvalue                                                         tsid:00000006d4e15e7-00000bd5                       document                                                           xml                        1            In                                                                 0            2147483647   0            0            Nullable    tsid:00000003383e40e-00000bd6                       Source document                                                  
 PartsSupplier                                                      SYS                                                                xpathvalue                                                         tsid:00000006d4e15e7-00000bd5                       xpath                                                              string                     2            In                                                                 0            4000         0            0            Nullable    tsid:000000006f67b90-00000bd7                       XPath expression                                                 
 PartsSupplier                                                      SYS                                                                xpathvalue                                                         tsid:00000006d4e15e7-00000bd5                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000bd8                       Single result                                                    
-PartsSupplier                                                      SYS                                                                st_symdifference                                                   tsid:0000000719f9cd9-00000dd6                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dd7                       Geometry1                                                        
-PartsSupplier                                                      SYS                                                                st_symdifference                                                   tsid:0000000719f9cd9-00000dd6                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000dd8                       Geometry2                                                        
-PartsSupplier                                                      SYS                                                                st_symdifference                                                   tsid:0000000719f9cd9-00000dd6                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dd9                       difference Geometry                                              
+PartsSupplier                                                      SYS                                                                st_symdifference                                                   tsid:0000000719f9cd9-00000deb                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dec                       Geometry1                                                        
+PartsSupplier                                                      SYS                                                                st_symdifference                                                   tsid:0000000719f9cd9-00000deb                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000ded                       Geometry2                                                        
+PartsSupplier                                                      SYS                                                                st_symdifference                                                   tsid:0000000719f9cd9-00000deb                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dee                       difference Geometry                                              
 PartsSupplier                                                      SYS                                                                decodeInteger                                                      tsid:000000073353263-00000a3b                       input                                                              string                     1            In                                                                 0            4000         0            0            Nullable    tsid:000000006226abd-00000a3c                       Input column for decode                                          
 PartsSupplier                                                      SYS                                                                decodeInteger                                                      tsid:000000073353263-00000a3b                       decodeString                                                       string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffff88de4692-00000a3d                       The comma delimited String that represents the mapping between in$ 
 PartsSupplier                                                      SYS                                                                decodeInteger                                                      tsid:000000073353263-00000a3b                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000a3e                       The decoded value from the decode string.                        
@@ -2095,12 +2142,12 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                timestampdiff                                                      tsid:00000007a18cd0e-00000190                       timestamp1                                                         timestamp                  2            In                                                                 0            12           0            0            Nullable    tsid:000000066030cce-00000192                       Start timestamp                                                  
 PartsSupplier                                                      SYS                                                                timestampdiff                                                      tsid:00000007a18cd0e-00000190                       timestamp2                                                         timestamp                  3            In                                                                 0            12           0            0            Nullable    tsid:000000066030ccf-00000193                       End timestamp                                                    
 PartsSupplier                                                      SYS                                                                timestampdiff                                                      tsid:00000007a18cd0e-00000190                       result                                                             long                       0            ReturnValue                                                        19           8            0            10           Nullable    tsid:fffffffc874db10-00000194                       Returns estimated number of intervals between start and end times$ 
-PartsSupplier                                                      SYS                                                                node_id                                                            tsid:00000007e2eff6b-00000df0                       result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000df1                       Returns the node id                                              
+PartsSupplier                                                      SYS                                                                node_id                                                            tsid:00000007e2eff6b-00000e05                       result                                                             object                     0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e06                       Returns the node id                                              
 PartsSupplier                                                      SYS                                                                st_intersects                                                      tsid:fffffff83d182c5-00000cfe                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000cff                       Geometry1                                                        
 PartsSupplier                                                      SYS                                                                st_intersects                                                      tsid:fffffff83d182c5-00000cfe                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000d00                       Geometry2                                                        
 PartsSupplier                                                      SYS                                                                st_intersects                                                      tsid:fffffff83d182c5-00000cfe                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000d01                       true if the values intersect                                     
-PartsSupplier                                                      SYS                                                                st_startpoint                                                      tsid:fffffff858941ff-00000dd3                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dd4                       Geometry                                                         
-PartsSupplier                                                      SYS                                                                st_startpoint                                                      tsid:fffffff858941ff-00000dd3                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dd5                       start Point Geometry                                             
+PartsSupplier                                                      SYS                                                                st_startpoint                                                      tsid:fffffff858941ff-00000de8                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000de9                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_startpoint                                                      tsid:fffffff858941ff-00000de8                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dea                       start Point Geometry                                             
 PartsSupplier                                                      SYS                                                                decodeString                                                       tsid:fffffff88de4692-00000a44                       input                                                              string                     1            In                                                                 0            4000         0            0            Nullable    tsid:000000006226abd-00000a45                       Input column for decode                                          
 PartsSupplier                                                      SYS                                                                decodeString                                                       tsid:fffffff88de4692-00000a44                       decodeString                                                       string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffff88de4692-00000a46                       The comma delimited String that represents the mapping between in$ 
 PartsSupplier                                                      SYS                                                                decodeString                                                       tsid:fffffff88de4692-00000a44                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000a47                       The decoded value from the decode string.                        
@@ -2108,8 +2155,8 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                decodeString                                                       tsid:fffffff88de4692-00000a48                       decodeString                                                       string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffff88de4692-00000a4a                       The comma delimited String that represents the mapping between in$ 
 PartsSupplier                                                      SYS                                                                decodeString                                                       tsid:fffffff88de4692-00000a48                       delimiter                                                          string                     3            In                                                                 0            4000         0            0            Nullable    tsid:ffffffff13878fa-00000a4b                       Decode String delimiter character(s)                             
 PartsSupplier                                                      SYS                                                                decodeString                                                       tsid:fffffff88de4692-00000a48                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000a4c                       The decoded value from the decode string.                        
-PartsSupplier                                                      SYS                                                                xmlText                                                            tsid:fffffff8c2cb8d7-00000e13                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000e14                       The text.                                                        
-PartsSupplier                                                      SYS                                                                xmlText                                                            tsid:fffffff8c2cb8d7-00000e13                       result                                                             xml                        0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e15                       XML text.                                                        
+PartsSupplier                                                      SYS                                                                xmlText                                                            tsid:fffffff8c2cb8d7-00000e28                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000e29                       The text.                                                        
+PartsSupplier                                                      SYS                                                                xmlText                                                            tsid:fffffff8c2cb8d7-00000e28                       result                                                             xml                        0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e2a                       XML text.                                                        
 PartsSupplier                                                      SYS                                                                st_area                                                            tsid:fffffff8eee629e-00000d26                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d27                       Geometry                                                         
 PartsSupplier                                                      SYS                                                                st_area                                                            tsid:fffffff8eee629e-00000d26                       result                                                             double                     0            ReturnValue                                                        17           8            4            10           Nullable    tsid:fffffffc874db10-00000d28                       Area in square SRID units                                        
 PartsSupplier                                                      SYS                                                                st_srid                                                            tsid:fffffff8ef691cb-00000ce6                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000ce7                       Geometry                                                         
@@ -2136,24 +2183,27 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                parseinteger                                                       tsid:fffffff9c859a1e-00000bb1                       integer                                                            string                     1            In                                                                 0            4000         0            0            Nullable    tsid:000000074dc9431-00000bb2                       String input                                                     
 PartsSupplier                                                      SYS                                                                parseinteger                                                       tsid:fffffff9c859a1e-00000bb1                       format                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffb4870aea-00000bb3                       Parse format                                                     
 PartsSupplier                                                      SYS                                                                parseinteger                                                       tsid:fffffff9c859a1e-00000bb1                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000bb4                       Integer parsed                                                   
+PartsSupplier                                                      SYS                                                                st_snaptogrid                                                      tsid:fffffffa210981c-00000de4                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000de5                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_snaptogrid                                                      tsid:fffffffa210981c-00000de4                       param2                                                             float                      2            In                                                                 7            4            3            10           Nullable    tsid:fffffffc4d20c38-00000de6                       size                                                             
+PartsSupplier                                                      SYS                                                                st_snaptogrid                                                      tsid:fffffffa210981c-00000de4                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000de7                       The resulting geometry                                           
 PartsSupplier                                                      SYS                                                                st_isclosed                                                        tsid:fffffffa76dba27-00000d02                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d03                       LineString Geometry                                              
 PartsSupplier                                                      SYS                                                                st_isclosed                                                        tsid:fffffffa76dba27-00000d02                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000d04                       true if the LineString is closed                                 
 PartsSupplier                                                      SYS                                                                array_length                                                       tsid:fffffffa7dd327f-00000ccc                       array                                                              object                     1            In                                                                 0            2147483647   0            0            Nullable    tsid:000000005b3854c-00000ccd                       Array                                                            
 PartsSupplier                                                      SYS                                                                array_length                                                       tsid:fffffffa7dd327f-00000ccc                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000cce                       The array length                                                 
-PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e01                       param1                                                             clob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e02                       Clob                                                             
-PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e01                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e03                       The encoding                                                     
-PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e01                       result                                                             blob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e04                       byte representation Blob                                         
-PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e05                       param1                                                             clob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e06                       Clob                                                             
-PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e05                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e07                       The encoding                                                     
-PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e05                       param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000e08                       well-formed                                                      
-PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e05                       result                                                             blob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e09                       byte representation Blob                                         
-PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e0a                       param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e0b                       Blob                                                             
-PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e0a                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e0c                       The encoding                                                     
-PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e0a                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e0d                       Clob char rep                                                    
-PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e0e                       param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e0f                       Blob                                                             
-PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e0e                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e10                       The encoding                                                     
-PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e0e                       param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000e11                       well-formed                                                      
-PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e0e                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e12                       Clob char rep                                                    
+PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e16                       param1                                                             clob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e17                       Clob                                                             
+PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e16                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e18                       The encoding                                                     
+PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e16                       result                                                             blob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e19                       byte representation Blob                                         
+PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e1a                       param1                                                             clob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e1b                       Clob                                                             
+PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e1a                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e1c                       The encoding                                                     
+PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e1a                       param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000e1d                       well-formed                                                      
+PartsSupplier                                                      SYS                                                                to_bytes                                                           tsid:fffffffa9bd3c9a-00000e1a                       result                                                             blob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e1e                       byte representation Blob                                         
+PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e1f                       param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e20                       Blob                                                             
+PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e1f                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e21                       The encoding                                                     
+PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e1f                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e22                       Clob char rep                                                    
+PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e23                       param1                                                             blob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000e24                       Blob                                                             
+PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e23                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e25                       The encoding                                                     
+PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e23                       param3                                                             boolean                    3            In                                                                 1            1            0            10           Nullable    tsid:fffffffc4d20c39-00000e26                       well-formed                                                      
+PartsSupplier                                                      SYS                                                                to_chars                                                           tsid:fffffffa9c3540c-00000e23                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000e27                       Clob char rep                                                    
 PartsSupplier                                                      SYS                                                                st_disjoint                                                        tsid:fffffffaa3abfcd-00000cf1                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000cf2                       Geometry1                                                        
 PartsSupplier                                                      SYS                                                                st_disjoint                                                        tsid:fffffffaa3abfcd-00000cf1                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000cf3                       Geometry2                                                        
 PartsSupplier                                                      SYS                                                                st_disjoint                                                        tsid:fffffffaa3abfcd-00000cf1                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000cf4                       true if Geometry1 and Geometry2 are disjoint                     
@@ -2180,22 +2230,22 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                monthname                                                          tsid:fffffffb2b96ffe-00000157                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000159                       Month name for date                                              
 PartsSupplier                                                      SYS                                                                monthname                                                          tsid:fffffffb2b96ffe-0000015a                       timestamp                                                          timestamp                  1            In                                                                 0            12           0            0            Nullable    tsid:000000003703c09-0000015b                       Month name for timestamp                                         
 PartsSupplier                                                      SYS                                                                monthname                                                          tsid:fffffffb2b96ffe-0000015a                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-0000015c                       Month name for timestamp                                         
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df2                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000df3                       Original string                                                  
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df2                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000df4                       The regular expression                                           
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df2                       param3                                                             string                     3            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c39-00000df5                       The replacement string                                           
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df2                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000df6                       The string with replacements                                     
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df7                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000df8                       Original string                                                  
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df7                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000df9                       The regular expression                                           
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df7                       param3                                                             string                     3            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c39-00000dfa                       The replacement string                                           
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df7                       param4                                                             string                     4            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c3a-00000dfb                       Flags, such as g, i, or m                                        
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000df7                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000dfc                       The string with replacements                                     
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e07                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000e08                       Original string                                                  
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e07                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e09                       The regular expression                                           
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e07                       param3                                                             string                     3            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c39-00000e0a                       The replacement string                                           
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e07                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000e0b                       The string with replacements                                     
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e0c                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000e0d                       Original string                                                  
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e0c                       param2                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c38-00000e0e                       The regular expression                                           
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e0c                       param3                                                             string                     3            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c39-00000e0f                       The replacement string                                           
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e0c                       param4                                                             string                     4            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c3a-00000e10                       Flags, such as g, i, or m                                        
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     tsid:fffffffb37a6c71-00000e0c                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000e11                       The string with replacements                                     
 PartsSupplier                                                      SYS                                                                st_force_2d                                                        tsid:fffffffb5464757-00000d84                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d85                       Geometry                                                         
 PartsSupplier                                                      SYS                                                                st_force_2d                                                        tsid:fffffffb5464757-00000d84                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000d86                       2d Geometry value                                                
 PartsSupplier                                                      SYS                                                                st_perimeter                                                       tsid:fffffffb58082b2-00000d39                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000d3a                       Geometry                                                         
 PartsSupplier                                                      SYS                                                                st_perimeter                                                       tsid:fffffffb58082b2-00000d39                       result                                                             double                     0            ReturnValue                                                        17           8            4            10           Nullable    tsid:fffffffc874db10-00000d3b                       perimeter                                                        
-PartsSupplier                                                      SYS                                                                st_simplify                                                        tsid:fffffffb6827c1a-00000dcf                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dd0                       Geometry                                                         
-PartsSupplier                                                      SYS                                                                st_simplify                                                        tsid:fffffffb6827c1a-00000dcf                       param2                                                             double                     2            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c38-00000dd1                       tolerance                                                        
-PartsSupplier                                                      SYS                                                                st_simplify                                                        tsid:fffffffb6827c1a-00000dcf                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dd2                       Geometry value simplified according to the Douglas Peucker algori$ 
+PartsSupplier                                                      SYS                                                                st_simplify                                                        tsid:fffffffb6827c1a-00000ddc                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000ddd                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_simplify                                                        tsid:fffffffb6827c1a-00000ddc                       param2                                                             double                     2            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c38-00000dde                       tolerance                                                        
+PartsSupplier                                                      SYS                                                                st_simplify                                                        tsid:fffffffb6827c1a-00000ddc                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000ddf                       Geometry value simplified according to the Douglas Peucker algori$ 
 PartsSupplier                                                      SYS                                                                st_crosses                                                         tsid:fffffffb69a6c03-00000ced                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000cee                       Geometry1                                                        
 PartsSupplier                                                      SYS                                                                st_crosses                                                         tsid:fffffffb69a6c03-00000ced                       param2                                                             geometry                   2            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c38-00000cef                       Geometry2                                                        
 PartsSupplier                                                      SYS                                                                st_crosses                                                         tsid:fffffffb69a6c03-00000ced                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000cf0                       true if Geometry1 crosses Geometry2                              
@@ -2277,9 +2327,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                jsonArray                                                          tsid:fffffffbdf67944-00000cd4                       result                                                             clob                       0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000cd6                       a JSON array of values                                           
 PartsSupplier                                                      SYS                                                                length                                                             tsid:fffffffbe354dd9-000001a5                       string                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffcafc7304-000001a6                       String                                                           
 PartsSupplier                                                      SYS                                                                length                                                             tsid:fffffffbe354dd9-000001a5                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-000001a7                       Length of string                                                 
-PartsSupplier                                                      SYS                                                                tokenize                                                           tsid:fffffffbe5c83ae-00000dfd                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000dfe                       String to Tokenize                                               
-PartsSupplier                                                      SYS                                                                tokenize                                                           tsid:fffffffbe5c83ae-00000dfd                       param2                                                             char                       2            In                                                                 0            1            0            0            Nullable    tsid:fffffffc4d20c38-00000dff                       Delimiter to tokenize the string by                              
-PartsSupplier                                                      SYS                                                                tokenize                                                           tsid:fffffffbe5c83ae-00000dfd                       result                                                             string[]                   0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000e00                       Return of the string array                                       
+PartsSupplier                                                      SYS                                                                tokenize                                                           tsid:fffffffbe5c83ae-00000e12                       param1                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffc4d20c37-00000e13                       String to Tokenize                                               
+PartsSupplier                                                      SYS                                                                tokenize                                                           tsid:fffffffbe5c83ae-00000e12                       param2                                                             char                       2            In                                                                 0            1            0            0            Nullable    tsid:fffffffc4d20c38-00000e14                       Delimiter to tokenize the string by                              
+PartsSupplier                                                      SYS                                                                tokenize                                                           tsid:fffffffbe5c83ae-00000e12                       result                                                             string[]                   0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000e15                       Return of the string array                                       
 PartsSupplier                                                      SYS                                                                locate                                                             tsid:fffffffbebd2245-000001e0                       substring                                                          string                     1            In                                                                 0            4000         0            0            Nullable    tsid:00000001fc68144-000001e1                       Substring to find                                                
 PartsSupplier                                                      SYS                                                                locate                                                             tsid:fffffffbebd2245-000001e0                       string                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffcafc7304-000001e2                       String                                                           
 PartsSupplier                                                      SYS                                                                locate                                                             tsid:fffffffbebd2245-000001e0                       index                                                              integer                    3            In                                                                 10           4            0            10           Nullable    tsid:000000006223bc5-000001e3                       Starting index                                                   
@@ -2408,6 +2458,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                jsontoxml                                                          tsid:fffffffc0c3e2c7-00000c0f                       rootElementName                                                    string                     1            In                                                                 0            4000         0            0            Nullable    tsid:000000065e76858-00000c10                       Root element name                                                
 PartsSupplier                                                      SYS                                                                jsontoxml                                                          tsid:fffffffc0c3e2c7-00000c0f                       json                                                               blob                       2            In                                                                 0            2147483647   0            0            Nullable    tsid:00000000058ffdb-00000c11                       JSON                                                             
 PartsSupplier                                                      SYS                                                                jsontoxml                                                          tsid:fffffffc0c3e2c7-00000c0f                       result                                                             xml                        0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000c12                       XML result                                                       
+PartsSupplier                                                      SYS                                                                st_simplifypreservetopology                                        tsid:fffffffc265b2d5-00000de0                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000de1                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_simplifypreservetopology                                        tsid:fffffffc265b2d5-00000de0                       param2                                                             double                     2            In                                                                 17           8            4            10           Nullable    tsid:fffffffc4d20c38-00000de2                       tolerance                                                        
+PartsSupplier                                                      SYS                                                                st_simplifypreservetopology                                        tsid:fffffffc265b2d5-00000de0                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000de3                       Geometry value simplified according to the Douglas Peucker algori$ 
 PartsSupplier                                                      SYS                                                                nullif                                                             tsid:fffffffc27f9fd7-00000c1a                       op1                                                                boolean                    1            In                                                                 1            1            0            10           Nullable    tsid:00000000028c163-00000c1b                       First parameter                                                  
 PartsSupplier                                                      SYS                                                                nullif                                                             tsid:fffffffc27f9fd7-00000c1a                       op2                                                                boolean                    2            In                                                                 1            1            0            10           Nullable    tsid:00000000028c164-00000c1c                       First parameter                                                  
 PartsSupplier                                                      SYS                                                                nullif                                                             tsid:fffffffc27f9fd7-00000c1a                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000c1d                       null if the parameters are equivalent else param1                
@@ -2601,9 +2654,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_geomfromtext                                                    tsid:fffffffd2646b24-00000dac                       param1                                                             clob                       1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dad                       WKT Clob                                                         
 PartsSupplier                                                      SYS                                                                st_geomfromtext                                                    tsid:fffffffd2646b24-00000dac                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000dae                       SRID                                                             
 PartsSupplier                                                      SYS                                                                st_geomfromtext                                                    tsid:fffffffd2646b24-00000dac                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000daf                       Geometry                                                         
-PartsSupplier                                                      SYS                                                                st_transform                                                       tsid:fffffffd294c201-00000dda                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000ddb                       Geometry                                                         
-PartsSupplier                                                      SYS                                                                st_transform                                                       tsid:fffffffd294c201-00000dda                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000ddc                       SRID                                                             
-PartsSupplier                                                      SYS                                                                st_transform                                                       tsid:fffffffd294c201-00000dda                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000ddd                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_transform                                                       tsid:fffffffd294c201-00000def                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000df0                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_transform                                                       tsid:fffffffd294c201-00000def                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000df1                       SRID                                                             
+PartsSupplier                                                      SYS                                                                st_transform                                                       tsid:fffffffd294c201-00000def                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000df2                       Geometry                                                         
 PartsSupplier                                                      SYS                                                                formatbigdecimal                                                   tsid:fffffffd69bb87b-00000ba1                       bigdecimal                                                         bigdecimal                 1            In                                                                 32767        2147483647   16383        10           Nullable    tsid:00000007bdc0944-00000ba2                       String input                                                     
 PartsSupplier                                                      SYS                                                                formatbigdecimal                                                   tsid:fffffffd69bb87b-00000ba1                       format                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffb4870aea-00000ba3                       Number format                                                    
 PartsSupplier                                                      SYS                                                                formatbigdecimal                                                   tsid:fffffffd69bb87b-00000ba1                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000ba4                       Big decimal formatted                                            
@@ -2625,9 +2678,9 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_orderingequals                                                  tsid:fffffffe70ebb24-00000d11                       result                                                             boolean                    0            ReturnValue                                                        1            1            0            10           Nullable    tsid:fffffffc874db10-00000d14                       true if the geometries have the same structure and verticies in t$ 
 PartsSupplier                                                      SYS                                                                unescape                                                           tsid:fffffffe7da8b4d-00000cc3                       string                                                             string                     1            In                                                                 0            4000         0            0            Nullable    tsid:fffffffcafc7304-00000cc4                       String to be unescaped                                           
 PartsSupplier                                                      SYS                                                                unescape                                                           tsid:fffffffe7da8b4d-00000cc3                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000cc5                       Unescaped string                                                 
-PartsSupplier                                                      SYS                                                                st_setsrid                                                         tsid:fffffffef159231-00000dcb                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dcc                       Geometry                                                         
-PartsSupplier                                                      SYS                                                                st_setsrid                                                         tsid:fffffffef159231-00000dcb                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000dcd                       srid                                                             
-PartsSupplier                                                      SYS                                                                st_setsrid                                                         tsid:fffffffef159231-00000dcb                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000dce                       Geometry with the specified srid                                 
+PartsSupplier                                                      SYS                                                                st_setsrid                                                         tsid:fffffffef159231-00000dd8                       param1                                                             geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffffc4d20c37-00000dd9                       Geometry                                                         
+PartsSupplier                                                      SYS                                                                st_setsrid                                                         tsid:fffffffef159231-00000dd8                       param2                                                             integer                    2            In                                                                 10           4            0            10           Nullable    tsid:fffffffc4d20c38-00000dda                       srid                                                             
+PartsSupplier                                                      SYS                                                                st_setsrid                                                         tsid:fffffffef159231-00000dd8                       result                                                             geometry                   0            ReturnValue                                                        0            2147483647   0            0            Nullable    tsid:fffffffc874db10-00000ddb                       Geometry with the specified srid                                 
 PartsSupplier                                                      SYS                                                                formatbiginteger                                                   tsid:fffffffef642668-00000b9d                       biginteger                                                         biginteger                 1            In                                                                 2147483647   2147483647   0            10           Nullable    tsid:fffffff94a47731-00000b9e                       String input                                                     
 PartsSupplier                                                      SYS                                                                formatbiginteger                                                   tsid:fffffffef642668-00000b9d                       format                                                             string                     2            In                                                                 0            4000         0            0            Nullable    tsid:fffffffb4870aea-00000b9f                       Number format                                                    
 PartsSupplier                                                      SYS                                                                formatbiginteger                                                   tsid:fffffffef642668-00000b9d                       result                                                             string                     0            ReturnValue                                                        0            4000         0            0            Nullable    tsid:fffffffc874db10-00000ba0                       Big integer formatted                                            
@@ -2697,7 +2750,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                rowlimitexception                                                  tsid:ffffffffe600e41-00000a35                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000a37                       Number of rows to be limited to                                  
 PartsSupplier                                                      SYS                                                                rowlimitexception                                                  tsid:ffffffffe600e41-00000a38                       element                                                            geometry                   1            In                                                                 0            2147483647   0            0            Nullable    tsid:fffffff9d0a31ef-00000a39                       XML tag in the scope of a mapping class                          
 PartsSupplier                                                      SYS                                                                rowlimitexception                                                  tsid:ffffffffe600e41-00000a38                       result                                                             integer                    0            ReturnValue                                                        10           4            0            10           Nullable    tsid:fffffffc874db10-00000a3a                       Number of rows to be limited to                                  
-Row Count : 2697
+Row Count : 2750
 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            FunctionParams  255                   255           0         false            true             false       false                 0           true        true          false     false       
 SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            FunctionParams  255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
index aec0fa643b..7f7eacea3f 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
@@ -1,13 +1,30 @@
 string                                                             string                                                             string                                                             string                                                             string                                              string                                                             boolean  
 VDBName                                                            SchemaName                                                         Name                                                               NameInSource                                                       UID                                                 Description                                                        IsVarArgs
-PartsSupplier                                                      pg_catalog                                                         pg_client_encoding                                                 pg_client_encoding                                                 tid:7ff2755e9621-267c14ff-0000007f                  <null>                                                             false    
-PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-0000007a                  <null>                                                             false    
-PartsSupplier                                                      pg_catalog                                                         PostGIS_Lib_Version                                                PostGIS_Lib_Version                                                tid:7ff2755e9621-a35b9c90-00000079                  <null>                                                             false    
-PartsSupplier                                                      pg_catalog                                                         encode                                                             encode                                                             tid:7ff2755e9621-b2963e16-00000078                  <null>                                                             false    
-PartsSupplier                                                      pg_catalog                                                         getOid                                                             getOid                                                             tid:7ff2755e9621-b5885e94-0000007e                  <null>                                                             false    
-PartsSupplier                                                      pg_catalog                                                         asPGVector                                                         asPGVector                                                         tid:7ff2755e9621-e548fc4c-0000007d                  <null>                                                             false    
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007b                  <null>                                                             false    
-PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        pg_get_expr                                                        tid:7ff2755e9621-e8caf286-0000007c                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         ST_asBinary                                                        ST_asBinary                                                        tid:7ff2755e9621-09fddaf1-000000a7                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         version                                                            version                                                            tid:7ff2755e9621-14f51cd8-000000b4                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_table_is_visible                                                pg_table_is_visible                                                tid:7ff2755e9621-17e348b6-000000af                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_client_encoding                                                 pg_client_encoding                                                 tid:7ff2755e9621-267c14ff-000000b5                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         has_schema_privilege                                               has_schema_privilege                                               tid:7ff2755e9621-2e936898-000000a0                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_get_userbyid                                                    pg_get_userbyid                                                    tid:7ff2755e9621-305ef60e-000000a4                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         postgis_version                                                    postgis_version                                                    tid:7ff2755e9621-36e9b5ca-000000ab                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         format_type                                                        format_type                                                        tid:7ff2755e9621-56f0b282-000000a2                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         has_function_privilege                                             has_function_privilege                                             tid:7ff2755e9621-6e44e0cf-000000ac                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_has_role                                                        pg_has_role                                                        tid:7ff2755e9621-7b642043-000000a6                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_get_constraintdef                                               pg_get_constraintdef                                               tid:7ff2755e9621-84079f97-000000b0                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         postgis_proj_version                                               postgis_proj_version                                               tid:7ff2755e9621-9161e844-000000aa                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         PostGIS_Lib_Version                                                PostGIS_Lib_Version                                                tid:7ff2755e9621-a35b9c90-000000a8                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         obj_description                                                    obj_description                                                    tid:7ff2755e9621-a36cd4b4-0000009f                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         current_schema                                                     current_schema                                                     tid:7ff2755e9621-a9550b27-000000a3                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         encode                                                             encode                                                             tid:7ff2755e9621-b2963e16-0000009e                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         getOid                                                             getOid                                                             tid:7ff2755e9621-b5885e94-000000b3                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_type_is_visible                                                 pg_type_is_visible                                                 tid:7ff2755e9621-bb134e3a-000000b1                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         col_description                                                    col_description                                                    tid:7ff2755e9621-c26d23bd-000000a5                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         regclass                                                           regclass                                                           tid:7ff2755e9621-d6842d64-0000009d                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         has_table_privilege                                                has_table_privilege                                                tid:7ff2755e9621-daf4b7db-000000a1                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         asPGVector                                                         asPGVector                                                         tid:7ff2755e9621-e548fc4c-000000b2                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ad                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         pg_get_expr                                                        pg_get_expr                                                        tid:7ff2755e9621-e8caf286-000000ae                  <null>                                                             false    
+PartsSupplier                                                      pg_catalog                                                         postgis_geos_version                                               postgis_geos_version                                               tid:7ff2755e9621-f2edeb29-000000a9                  <null>                                                             false    
 PartsSupplier                                                      SYS                                                                *                                                                  <null>                                                             tsid:00000000027131d-00000030                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                *                                                                  <null>                                                             tsid:00000000027131d-00000034                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                *                                                                  <null>                                                             tsid:00000000027131d-00000038                       <null>                                                             false    
@@ -141,7 +158,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                year                                                               <null>                                                             tsid:0000000005f9b30-00000166                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_equals                                                          st_equals                                                          tsid:00000000125c250-00000cfa                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_endpoint                                                        st_endpoint                                                        tsid:00000000156f0a6-00000d7b                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_extent                                                          st_extent                                                          tsid:0000000018801bb-00000e16                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_extent                                                          st_extent                                                          tsid:0000000018801bb-00000e2b                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                rowlimit                                                           <null>                                                             tsid:00000000374bd14-000009bd                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                rowlimit                                                           <null>                                                             tsid:00000000374bd14-000009c0                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                rowlimit                                                           <null>                                                             tsid:00000000374bd14-000009c3                       <null>                                                             false    
@@ -197,6 +214,8 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                xmlpi                                                              <null>                                                             tsid:000000006f54743-00000c04                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                xmlpi                                                              <null>                                                             tsid:000000006f54743-00000c07                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_isring                                                          st_isring                                                          tsid:0000000081414eb-00000d08                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    st_makeenvelope                                                    tsid:000000009b5dbcf-00000dbc                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_makeenvelope                                                    st_makeenvelope                                                    tsid:000000009b5dbcf-00000dc2                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                dayofweek                                                          <null>                                                             tsid:00000000b455bda-00000145                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                dayofweek                                                          <null>                                                             tsid:00000000b455bda-00000148                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                dayofyear                                                          <null>                                                             tsid:00000000b464423-0000014b                       <null>                                                             false    
@@ -207,12 +226,12 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_geomfromgml                                                     st_geomfromgml                                                     tsid:00000000f311fb5-00000da5                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_geomfromwkb                                                     st_geomfromwkb                                                     tsid:00000000f315b7d-00000d87                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_geomfromwkb                                                     st_geomfromwkb                                                     tsid:00000000f315b7d-00000d8d                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                teiid_session_get                                                  teiid_session_get                                                  tsid:00000000f6b6a14-00000de2                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                teiid_session_set                                                  teiid_session_set                                                  tsid:00000000f6b9720-00000de5                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                teiid_session_get                                                  teiid_session_get                                                  tsid:00000000f6b6a14-00000df7                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                teiid_session_set                                                  teiid_session_set                                                  tsid:00000000f6b9720-00000dfa                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formatdate                                                         <null>                                                             tsid:0000000137b2718-00000b85                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formatlong                                                         <null>                                                             tsid:0000000137efde6-00000b91                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formattime                                                         <null>                                                             tsid:000000013828a37-00000b89                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_pointn                                                          st_pointn                                                          tsid:000000013c99f6f-00000dc0                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_pointn                                                          st_pointn                                                          tsid:000000013c99f6f-00000dcd                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_relate                                                          st_relate                                                          tsid:000000016a791ea-00000d19                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_relate                                                          st_relate                                                          tsid:000000016a791ea-00000d4e                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                commandpayload                                                     <null>                                                             tsid:00000001a0c5ad6-00000ad4                       <null>                                                             false    
@@ -707,8 +726,8 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_difference                                                      st_difference                                                      tsid:00000004964f8ce-00000d77                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_asgml                                                           st_asgml                                                           tsid:00000004a4a3669-00000d5e                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_askml                                                           st_askml                                                           tsid:00000004a4a456d-00000d61                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_point                                                           st_point                                                           tsid:00000004b1bcd25-00000dbc                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_union                                                           st_union                                                           tsid:00000004b61ce64-00000dde                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_point                                                           st_point                                                           tsid:00000004b1bcd25-00000dc9                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_union                                                           st_union                                                           tsid:00000004b61ce64-00000df3                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_numgeometries                                                   st_numgeometries                                                   tsid:00000004f6cb62b-00000d42                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                ST_GEOMFROMBINARY                                                  ST_GEOMFROMBINARY                                                  tsid:00000005078e8f8-00000d8a                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                ST_GEOMFROMBINARY                                                  ST_GEOMFROMBINARY                                                  tsid:00000005078e8f8-00000d91                       <null>                                                             false    
@@ -716,7 +735,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                dayname                                                            <null>                                                             tsid:00000005678e31a-00000139                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                dayname                                                            <null>                                                             tsid:00000005678e31a-0000013c                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formatfloat                                                        <null>                                                             tsid:000000057769fb8-00000b99                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_pointonsurface                                                  st_pointonsurface                                                  tsid:0000000583306ef-00000dc4                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_pointonsurface                                                  st_pointonsurface                                                  tsid:0000000583306ef-00000dd1                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                dayofmonth                                                         <null>                                                             tsid:00000005849aae0-0000013f                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                dayofmonth                                                         <null>                                                             tsid:00000005849aae0-00000142                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formattimestamp                                                    <null>                                                             tsid:000000058f249f2-00000b81                       <null>                                                             false    
@@ -726,31 +745,31 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                timestampadd                                                       <null>                                                             tsid:00000005eecc2be-00000181                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                timestampadd                                                       <null>                                                             tsid:00000005eecc2be-00000186                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                timestampadd                                                       <null>                                                             tsid:00000005eecc2be-0000018b                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_polygon                                                         st_polygon                                                         tsid:000000061052c4f-00000dc7                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_polygon                                                         st_polygon                                                         tsid:000000061052c4f-00000dd4                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                session_id                                                         <null>                                                             tsid:00000006334f257-00000ad2                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formatinteger                                                      <null>                                                             tsid:0000000642b085a-00000b8d                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_asbinary                                                        st_asbinary                                                        tsid:000000066847dc4-00000d52                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_centroid                                                        st_centroid                                                        tsid:000000066c6c8d1-00000d6e                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_asgeojson                                                       st_asgeojson                                                       tsid:00000006734f9dc-00000d5b                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                mvstatus                                                           mvstatus                                                           tsid:000000067f44dce-00000de9                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                mvstatus                                                           mvstatus                                                           tsid:000000067f44dce-00000dfe                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                endswith                                                           <null>                                                             tsid:0000000681c1ab1-00000221                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                xpathvalue                                                         <null>                                                             tsid:00000006d4e15e7-00000bc9                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                xpathvalue                                                         <null>                                                             tsid:00000006d4e15e7-00000bcd                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                xpathvalue                                                         <null>                                                             tsid:00000006d4e15e7-00000bd1                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                xpathvalue                                                         <null>                                                             tsid:00000006d4e15e7-00000bd5                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_symdifference                                                   st_symdifference                                                   tsid:0000000719f9cd9-00000dd6                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_symdifference                                                   st_symdifference                                                   tsid:0000000719f9cd9-00000deb                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                decodeInteger                                                      <null>                                                             tsid:000000073353263-00000a3b                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                decodeInteger                                                      <null>                                                             tsid:000000073353263-00000a3f                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                initcap                                                            <null>                                                             tsid:0000000744853b5-000001fa                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_contains                                                        st_contains                                                        tsid:000000077bd4930-00000ce9                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_coorddim                                                        st_coorddim                                                        tsid:000000079573c84-00000d3c                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                timestampdiff                                                      <null>                                                             tsid:00000007a18cd0e-00000190                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                node_id                                                            node_id                                                            tsid:00000007e2eff6b-00000df0                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                node_id                                                            node_id                                                            tsid:00000007e2eff6b-00000e05                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_intersects                                                      st_intersects                                                      tsid:fffffff83d182c5-00000cfe                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_startpoint                                                      st_startpoint                                                      tsid:fffffff858941ff-00000dd3                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_startpoint                                                      st_startpoint                                                      tsid:fffffff858941ff-00000de8                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                decodeString                                                       <null>                                                             tsid:fffffff88de4692-00000a44                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                decodeString                                                       <null>                                                             tsid:fffffff88de4692-00000a48                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                xmlText                                                            xmlText                                                            tsid:fffffff8c2cb8d7-00000e13                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                xmlText                                                            xmlText                                                            tsid:fffffff8c2cb8d7-00000e28                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_area                                                            st_area                                                            tsid:fffffff8eee629e-00000d26                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_srid                                                            st_srid                                                            tsid:fffffff8ef691cb-00000ce6                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formatdouble                                                       <null>                                                             tsid:fffffff8f8c717b-00000b95                       <null>                                                             false    
@@ -760,12 +779,13 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                modifytimezone                                                     <null>                                                             tsid:fffffff977279a6-00000195                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                modifytimezone                                                     <null>                                                             tsid:fffffff977279a6-0000019a                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                parseinteger                                                       <null>                                                             tsid:fffffff9c859a1e-00000bb1                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_snaptogrid                                                      st_snaptogrid                                                      tsid:fffffffa210981c-00000de4                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_isclosed                                                        st_isclosed                                                        tsid:fffffffa76dba27-00000d02                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                array_length                                                       <null>                                                             tsid:fffffffa7dd327f-00000ccc                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                to_bytes                                                           to_bytes                                                           tsid:fffffffa9bd3c9a-00000e01                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                to_bytes                                                           to_bytes                                                           tsid:fffffffa9bd3c9a-00000e05                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                to_chars                                                           to_chars                                                           tsid:fffffffa9c3540c-00000e0a                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                to_chars                                                           to_chars                                                           tsid:fffffffa9c3540c-00000e0e                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                to_bytes                                                           to_bytes                                                           tsid:fffffffa9bd3c9a-00000e16                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                to_bytes                                                           to_bytes                                                           tsid:fffffffa9bd3c9a-00000e1a                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                to_chars                                                           to_chars                                                           tsid:fffffffa9c3540c-00000e1f                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                to_chars                                                           to_chars                                                           tsid:fffffffa9c3540c-00000e23                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_disjoint                                                        st_disjoint                                                        tsid:fffffffaa3abfcd-00000cf1                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_distance                                                        st_distance                                                        tsid:fffffffaac15f06-00000d29                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                array_get                                                          <null>                                                             tsid:fffffffab3d6f63-00000cc8                       <null>                                                             false    
@@ -776,11 +796,11 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                concat                                                             <null>                                                             tsid:fffffffaf668a07-000001ba                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                monthname                                                          <null>                                                             tsid:fffffffb2b96ffe-00000157                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                monthname                                                          <null>                                                             tsid:fffffffb2b96ffe-0000015a                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     regexp_replace                                                     tsid:fffffffb37a6c71-00000df2                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                regexp_replace                                                     regexp_replace                                                     tsid:fffffffb37a6c71-00000df7                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     regexp_replace                                                     tsid:fffffffb37a6c71-00000e07                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                regexp_replace                                                     regexp_replace                                                     tsid:fffffffb37a6c71-00000e0c                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_force_2d                                                        st_force_2d                                                        tsid:fffffffb5464757-00000d84                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_perimeter                                                       st_perimeter                                                       tsid:fffffffb58082b2-00000d39                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_simplify                                                        st_simplify                                                        tsid:fffffffb6827c1a-00000dcf                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_simplify                                                        st_simplify                                                        tsid:fffffffb6827c1a-00000ddc                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_crosses                                                         st_crosses                                                         tsid:fffffffb69a6c03-00000ced                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_overlaps                                                        st_overlaps                                                        tsid:fffffffb924181d-00000d15                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                ifnull                                                             <null>                                                             tsid:fffffffb9250f17-00000add                       <null>                                                             false    
@@ -808,7 +828,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                xmlconcat                                                          <null>                                                             tsid:fffffffbb7bacde-00000bfd                       <null>                                                             true     
 PartsSupplier                                                      SYS                                                                jsonArray                                                          jsonArray                                                          tsid:fffffffbdf67944-00000cd4                       <null>                                                             true     
 PartsSupplier                                                      SYS                                                                length                                                             <null>                                                             tsid:fffffffbe354dd9-000001a5                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                tokenize                                                           tokenize                                                           tsid:fffffffbe5c83ae-00000dfd                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                tokenize                                                           tokenize                                                           tsid:fffffffbe5c83ae-00000e12                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                locate                                                             <null>                                                             tsid:fffffffbebd2245-000001e0                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                locate                                                             <null>                                                             tsid:fffffffbebd2245-000001e5                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                jsonParse                                                          jsonParse                                                          tsid:fffffffbec2219e-00000cd7                       <null>                                                             false    
@@ -838,6 +858,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                minute                                                             <null>                                                             tsid:fffffffc022b907-00000172                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                jsontoxml                                                          <null>                                                             tsid:fffffffc0c3e2c7-00000c0b                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                jsontoxml                                                          <null>                                                             tsid:fffffffc0c3e2c7-00000c0f                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_simplifypreservetopology                                        st_simplifypreservetopology                                        tsid:fffffffc265b2d5-00000de0                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                nullif                                                             <null>                                                             tsid:fffffffc27f9fd7-00000c1a                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                nullif                                                             <null>                                                             tsid:fffffffc27f9fd7-00000c23                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                nullif                                                             <null>                                                             tsid:fffffffc27f9fd7-00000c2c                       <null>                                                             false    
@@ -897,7 +918,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_geomfromewkt                                                    st_geomfromewkt                                                    tsid:fffffffd25ddb92-00000d98                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_geomfromtext                                                    st_geomfromtext                                                    tsid:fffffffd2646b24-00000da9                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_geomfromtext                                                    st_geomfromtext                                                    tsid:fffffffd2646b24-00000dac                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_transform                                                       st_transform                                                       tsid:fffffffd294c201-00000dda                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_transform                                                       st_transform                                                       tsid:fffffffd294c201-00000def                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formatbigdecimal                                                   <null>                                                             tsid:fffffffd69bb87b-00000ba1                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_geometrytype                                                    st_geometrytype                                                    tsid:fffffffda17a2bd-00000d4b                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                parsebiginteger                                                    <null>                                                             tsid:fffffffe30d0e24-00000bc1                       <null>                                                             false    
@@ -906,7 +927,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                st_geometryn                                                       st_geometryn                                                       tsid:fffffffe6cf5cd1-00000db0                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_orderingequals                                                  st_orderingequals                                                  tsid:fffffffe70ebb24-00000d11                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                unescape                                                           <null>                                                             tsid:fffffffe7da8b4d-00000cc3                       <null>                                                             false    
-PartsSupplier                                                      SYS                                                                st_setsrid                                                         st_setsrid                                                         tsid:fffffffef159231-00000dcb                       <null>                                                             false    
+PartsSupplier                                                      SYS                                                                st_setsrid                                                         st_setsrid                                                         tsid:fffffffef159231-00000dd8                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                formatbiginteger                                                   <null>                                                             tsid:fffffffef642668-00000b9d                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                st_dwithin                                                         st_dwithin                                                         tsid:ffffffff3b4a0e4-00000cf5                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                parsedouble                                                        <null>                                                             tsid:ffffffff4769737-00000bb9                       <null>                                                             false    
@@ -939,7 +960,7 @@ PartsSupplier                                                      SYS
 PartsSupplier                                                      SYS                                                                rowlimitexception                                                  <null>                                                             tsid:ffffffffe600e41-00000a32                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                rowlimitexception                                                  <null>                                                             tsid:ffffffffe600e41-00000a35                       <null>                                                             false    
 PartsSupplier                                                      SYS                                                                rowlimitexception                                                  <null>                                                             tsid:ffffffffe600e41-00000a38                       <null>                                                             false    
-Row Count : 939
+Row Count : 960
 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            Functions     255                   255           0         false            true             false       false                 0           true        true          false     false       
 SchemaName     12             PartsSupplier   java.lang.String    SchemaName      string             SYS            Functions     255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
index 4e790754ef..6692c84e21 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
@@ -1,113 +1,113 @@
 string                                                             string                                                             string                                                             string                                                             string                                                             string                string                                              string                                              integer      integer    
 VDBName                                                            SchemaName                                                         TableName                                                          Name                                                               KeyName                                                            KeyType               RefKeyUID                                           UID                                                 Position     OID        
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       FK0                                                                Foreign               tid:2cb59cfd55db-b26c425d-00000092                  tid:2cb59cfd55db-a4593dfd-00000089                  3            <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a45837ed-00000088                  3            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       FK0                                                                Foreign               tid:2cb59cfd55db-b26c429b-00000094                  tid:2cb59cfd55db-a4593e3b-0000008b                  3            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a458382b-0000008a                  3            <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-f9ca1d34-00000021                  4            <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-8366f98d-00000038                  1            <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a45837ed-00000088                  4            <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b26c425d-00000092                  3            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a458382b-0000008a                  4            <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b26c429b-00000094                  3            <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-47758608-00000045                  4            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000054                  4            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903182d-00000068                  4            <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-3ee6c4df-00000074                  3            <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-bd148597-000000b3                  2            <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b8dc6399-000000c3                  3            <null>     
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-afd1d40f-000000c9                  1            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000056                  4            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903186b-0000006a                  4            <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-3ee6c51d-00000076                  3            <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-bd1485f4-000000b6                  2            <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b8dc63f6-000000c6                  3            <null>     
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Name                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-afd1d46c-000000cc                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Name                                                               PK                                                                 Primary               <null>                                              tid:60b87e792634-d67a9241-00000018                  3            <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   Name                                                               PK                                                                 Primary               <null>                                              tid:60b87e792634-efb4c499-00000036                  3            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           Name                                                               PK                                                                 Primary               <null>                                              tid:60b87e792634-e9ce2e51-00000027                  4            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              Name                                                               PK                                                                 Primary               <null>                                              tid:60b87e792634-7277c828-0000002e                  3            <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-248610af-0000009b                  2            <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         Name                                                               UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-248610ed-0000009d                  2            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PART_ID                                                            FK_SPLIER_PRTS_PRTS                                                Foreign               mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590         mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590         1            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_ID                                                            PK_PARTS                                                           Primary               <null>                                              mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590         1            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PART_ID                                                            PK_SUPPLIER_PARTS                                                  Primary               <null>                                              mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590         2            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      FK0                                                                Foreign               tid:2cb59cfd55db-3ee6c4df-00000074                  tid:2cb59cfd55db-b9041e3d-00000069                  3            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903182d-00000068                  3            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      FK0                                                                Foreign               tid:2cb59cfd55db-3ee6c51d-00000076                  tid:2cb59cfd55db-b9041e7b-0000006b                  3            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903186b-0000006a                  3            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             SHIPPER_ID                                                         PK_SHIP_VIA                                                        Primary               <null>                                              mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590         1            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               STATUS_ID                                                          PK_STATUS                                                          Primary               <null>                                              mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590         1            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       SUPPLIER_ID                                                        FK_SPLY_PRTS_SPLY                                                  Foreign               mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590         mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590         1            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_ID                                                        PK_SUPPLIER                                                        Primary               <null>                                              mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590         1            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       SUPPLIER_ID                                                        PK_SUPPLIER_PARTS                                                  Primary               <null>                                              mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590         1            <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_STATUS                                                    FK_SPLIER_STATS                                                    Foreign               mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590         mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590         1            <null>     
-PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-f9cb2344-00000022                  2            <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b26c425d-00000092                  tid:2cb59cfd55db-a4593dfd-00000089                  2            <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-b26d486d-00000093                  2            <null>     
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-47768c18-00000046                  2            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-885caaa7-00000055                  2            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-3ee6c4df-00000074                  tid:2cb59cfd55db-b9041e3d-00000069                  2            <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-3ee7caef-00000075                  2            <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-b8dd69a9-000000c4                  2            <null>     
+PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-f9cb2344-00000022                  2            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b26c429b-00000094                  tid:2cb59cfd55db-a4593e3b-0000008b                  2            <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-b26d48ab-00000095                  2            <null>     
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-47768c18-00000046                  2            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-885caaa7-00000057                  2            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-3ee6c51d-00000076                  tid:2cb59cfd55db-b9041e7b-0000006b                  2            <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-3ee7cb2d-00000077                  2            <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         FK0                                                                Foreign               tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-b8dd6a06-000000c7                  2            <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-f9ca1d34-00000021                  2            <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a45837ed-00000088                  2            <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b26c425d-00000092                  2            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a458382b-0000008a                  2            <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b26c429b-00000094                  2            <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-47758608-00000045                  2            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000054                  2            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903182d-00000068                  2            <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-3ee6c4df-00000074                  2            <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b8dc6399-000000c3                  2            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000056                  2            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903186b-0000006a                  2            <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-3ee6c51d-00000076                  2            <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b8dc63f6-000000c6                  2            <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           SchemaName                                                         PK                                                                 Primary               <null>                                              tid:60b87e792634-d67a9241-00000018                  2            <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   SchemaName                                                         PK                                                                 Primary               <null>                                              tid:60b87e792634-efb4c499-00000036                  2            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           SchemaName                                                         PK                                                                 Primary               <null>                                              tid:60b87e792634-e9ce2e51-00000027                  2            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              SchemaName                                                         PK                                                                 Primary               <null>                                              tid:60b87e792634-7277c828-0000002e                  2            <null>     
-PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-f9cb2344-00000022                  3            <null>     
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-47768c18-00000046                  3            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-885caaa7-00000055                  3            <null>     
+PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-f9cb2344-00000022                  3            <null>     
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-47768c18-00000046                  3            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-885caaa7-00000057                  3            <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-f9ca1d34-00000021                  3            <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-47758608-00000045                  3            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000054                  3            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000056                  3            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           TableName                                                          PK                                                                 Primary               <null>                                              tid:60b87e792634-e9ce2e51-00000027                  3            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              UID                                                                PK                                                                 Primary               <null>                                              tid:60b87e792634-36867ce1-0000000d                  1            <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-13808db8-00000023                  1            <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-9d1d6a11-00000039                  1            <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-be0ea871-00000087                  1            <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-cc22b2e1-00000094                  1            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-be0ea8af-00000089                  1            <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-cc22b31f-00000096                  1            <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-612bf68c-00000047                  1            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-a212151b-00000056                  1            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-d2b988b1-0000006a                  1            <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-589d3563-00000076                  1            <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-248610af-0000009b                  1            <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-d6caf61b-000000b4                  1            <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-d292d41d-000000c5                  1            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-a212151b-00000058                  1            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-d2b988ef-0000006c                  1            <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-589d35a1-00000078                  1            <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-248610ed-0000009d                  1            <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-d6caf678-000000b7                  1            <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:2cb59cfd55db-d292d47a-000000c8                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:60b87e792634-096b351d-00000037                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              UID                                                                UNIQUE0                                                            Unique                <null>                                              tid:60b87e792634-8c2e38ac-0000002f                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              Uses_UID                                                           PK                                                                 Primary               <null>                                              tid:60b87e792634-36867ce1-0000000d                  2            <null>     
-PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-f9cb2344-00000022                  1            <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b26c425d-00000092                  tid:2cb59cfd55db-a4593dfd-00000089                  1            <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-b26d486d-00000093                  1            <null>     
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-47768c18-00000046                  1            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-885caaa7-00000055                  1            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-3ee6c4df-00000074                  tid:2cb59cfd55db-b9041e3d-00000069                  1            <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-3ee7caef-00000075                  1            <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-b8dd69a9-000000c4                  1            <null>     
+PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-f9cb2344-00000022                  1            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b26c429b-00000094                  tid:2cb59cfd55db-a4593e3b-0000008b                  1            <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-b26d48ab-00000095                  1            <null>     
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-47768c18-00000046                  1            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-885caaa7-00000057                  1            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-3ee6c51d-00000076                  tid:2cb59cfd55db-b9041e7b-0000006b                  1            <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-3ee7cb2d-00000077                  1            <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            FK0                                                                Foreign               tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-b8dd6a06-000000c7                  1            <null>     
 PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-f9ca1d34-00000021                  1            <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a45837ed-00000088                  1            <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b26c425d-00000092                  1            <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-a458382b-0000008a                  1            <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b26c429b-00000094                  1            <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-47758608-00000045                  1            <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000054                  1            <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903182d-00000068                  1            <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-3ee6c4df-00000074                  1            <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-bd148597-000000b3                  1            <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b8dc6399-000000c3                  1            <null>     
+PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-885ba497-00000056                  1            <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b903186b-0000006a                  1            <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-3ee6c51d-00000076                  1            <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-bd1485f4-000000b6                  1            <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-b8dc63f6-000000c6                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           VDBName                                                            PK                                                                 Primary               <null>                                              tid:60b87e792634-d67a9241-00000018                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   VDBName                                                            PK                                                                 Primary               <null>                                              tid:60b87e792634-efb4c499-00000036                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           VDBName                                                            PK                                                                 Primary               <null>                                              tid:60b87e792634-e9ce2e51-00000027                  1            <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              VDBName                                                            PK                                                                 Primary               <null>                                              tid:60b87e792634-7277c828-0000002e                  1            <null>     
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-afd1d40f-000000c9                  2            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attname                                                            pk_matpg_relatt_names                                              Primary               <null>                                              tid:7ff2755e9621-965abc59-00000069                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attnum                                                             idx_matpg_relatt_ids                                               Index                 <null>                                              tid:7ff2755e9621-2a649087-0000006a                  2            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attrelid                                                           idx_matpg_relatt_ids                                               Index                 <null>                                              tid:7ff2755e9621-2a649087-0000006a                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     name                                                               matpg_datatype_names                                               Primary               <null>                                              tid:7ff2755e9621-e36b5e57-00000071                  2            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       nspname                                                            pk_matpg_relatt_names                                              Primary               <null>                                              tid:7ff2755e9621-965abc59-00000069                  3            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                matpg_datatype_ids                                                 Index                 <null>                                              tid:7ff2755e9621-ed0fad07-00000072                  2            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                matpg_datatype_names                                               Primary               <null>                                              tid:7ff2755e9621-e36b5e57-00000071                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       oid                                                                pk_pg_attr                                                         Primary               <null>                                              tid:7ff2755e9621-db38c73a-0000001a                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           oid                                                                pk_pg_class                                                        Primary               <null>                                              tid:7ff2755e9621-265d38e8-0000000e                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           oid                                                                pk_pg_index                                                        Primary               <null>                                              tid:7ff2755e9621-dd3e1473-00000033                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            oid                                                                pk_pg_proc                                                         Primary               <null>                                              tid:7ff2755e9621-2e2ffabe-00000042                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       relname                                                            pk_matpg_relatt_names                                              Primary               <null>                                              tid:7ff2755e9621-965abc59-00000069                  2            <null>     
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Version                                                            PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-afd1d46c-000000cc                  2            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attname                                                            pk_matpg_relatt_names                                              Primary               <null>                                              tid:7ff2755e9621-965abd13-0000006f                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attnum                                                             idx_matpg_relatt_ids                                               Index                 <null>                                              tid:7ff2755e9621-2a649141-00000070                  2            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       attrelid                                                           idx_matpg_relatt_ids                                               Index                 <null>                                              tid:7ff2755e9621-2a649141-00000070                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     name                                                               matpg_datatype_names                                               Primary               <null>                                              tid:7ff2755e9621-e36b5c29-00000079                  2            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       nspname                                                            pk_matpg_relatt_names                                              Primary               <null>                                              tid:7ff2755e9621-965abd13-0000006f                  3            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                matpg_datatype_ids                                                 Index                 <null>                                              tid:7ff2755e9621-ed0faad9-0000007a                  2            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     oid                                                                matpg_datatype_names                                               Primary               <null>                                              tid:7ff2755e9621-e36b5c29-00000079                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       oid                                                                pk_pg_attr                                                         Primary               <null>                                              tid:7ff2755e9621-db38c4ce-0000001e                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           oid                                                                pk_pg_class                                                        Primary               <null>                                              tid:7ff2755e9621-265d3907-00000012                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           oid                                                                pk_pg_index                                                        Primary               <null>                                              tid:7ff2755e9621-dd3e19e6-00000039                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            oid                                                                pk_pg_proc                                                         Primary               <null>                                              tid:7ff2755e9621-2e300031-00000048                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       relname                                                            pk_matpg_relatt_names                                              Primary               <null>                                              tid:7ff2755e9621-965abd13-0000006f                  2            <null>     
 PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       resourcePath                                                       PK                                                                 Primary               <null>                                              tid:60b87e792634-4e2f379e-0000001c                  1            <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    srid                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-5acb927d-000000d0                  1            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typname                                                            matpg_datatype_ids                                                 Index                 <null>                                              tid:7ff2755e9621-ed0fad07-00000072                  1            <null>     
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    srid                                                               PK                                                                 Primary               <null>                                              tid:2cb59cfd55db-5acb8ff2-000000d3                  1            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     typname                                                            matpg_datatype_ids                                                 Index                 <null>                                              tid:7ff2755e9621-ed0faad9-0000007a                  1            <null>     
 Row Count : 108
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            KeyColumns    255                   255           0         false            true             false       false                 0           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
index 0f01355fdc..a5d577c5b2 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
@@ -1,60 +1,60 @@
-string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             string                boolean    string                                              string                                              integer    
-VDBName                                                            SchemaName                                                         TableName                                                          Name                                                               Description                                                        NameInSource                                                       Type                  IsIndexed  RefKeyUID                                           UID                                                 OID        
-PartsSupplier                                                      SYS                                                                Columns                                                            FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-f9cb2344-00000022                  <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b26c425d-00000092                  tid:2cb59cfd55db-a4593dfd-00000089                  <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-b26d486d-00000093                  <null>     
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-47768c18-00000046                  <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b8dc6399-000000c3                  tid:2cb59cfd55db-885caaa7-00000055                  <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-3ee6c4df-00000074                  tid:2cb59cfd55db-b9041e3d-00000069                  <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-3ee7caef-00000075                  <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-bd148597-000000b3                  tid:2cb59cfd55db-b8dd69a9-000000c4                  <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       FK_SPLIER_PRTS_PRTS                                                <null>                                                             FK_SPLIER_PRTS_PRTS                                                Foreign               false      mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590         mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             FK_SPLIER_STATS                                                    <null>                                                             FK_SPLIER_STATS                                                    Foreign               false      mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590         mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       FK_SPLY_PRTS_SPLY                                                  <null>                                                             FK_SPLY_PRTS_SPLY                                                  Foreign               false      mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590         mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      SYS                                                                Columns                                                            PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-f9ca1d34-00000021                  <null>     
-PartsSupplier                                                      SYS                                                                DataTypes                                                          PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-8366f98d-00000038                  <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-a45837ed-00000088                  <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-b26c425d-00000092                  <null>     
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-47758608-00000045                  <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-885ba497-00000054                  <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-b903182d-00000068                  <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-3ee6c4df-00000074                  <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-bd148597-000000b3                  <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-5acb927d-000000d0                  <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-b8dc6399-000000c3                  <null>     
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-afd1d40f-000000c9                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-d67a9241-00000018                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-efb4c499-00000036                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-e9ce2e51-00000027                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           Usage                                                              PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-36867ce1-0000000d                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-4e2f379e-0000001c                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           Views                                                              PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-7277c828-0000002e                  <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PK_PARTS                                                           <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             PK_SHIP_VIA                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               PK_STATUS                                                          <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             PK_SUPPLIER                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PK_SUPPLIER_PARTS                                                  <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590         <null>     
-PartsSupplier                                                      SYS                                                                Columns                                                            UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-13808db8-00000023                  <null>     
-PartsSupplier                                                      SYS                                                                DataTypes                                                          UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-9d1d6a11-00000039                  <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-be0ea871-00000087                  <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-cc22b2e1-00000094                  <null>     
-PartsSupplier                                                      SYS                                                                KeyColumns                                                         UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-612bf68c-00000047                  <null>     
-PartsSupplier                                                      SYS                                                                Keys                                                               UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-a212151b-00000056                  <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-d2b988b1-0000006a                  <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-589d3563-00000076                  <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-248610af-0000009b                  <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-d6caf61b-000000b4                  <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-d292d41d-000000c5                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:60b87e792634-096b351d-00000037                  <null>     
-PartsSupplier                                                      SYSADMIN                                                           Views                                                              UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:60b87e792634-8c2e38ac-0000002f                  <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       idx_matpg_relatt_ids                                               <null>                                                             <null>                                                             Index                 false      <null>                                              tid:7ff2755e9621-2a649087-0000006a                  <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     matpg_datatype_ids                                                 <null>                                                             <null>                                                             Index                 false      <null>                                              tid:7ff2755e9621-ed0fad07-00000072                  <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     matpg_datatype_names                                               <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-e36b5e57-00000071                  <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       pk_matpg_relatt_names                                              <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-965abc59-00000069                  <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       pk_pg_attr                                                         <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-db38c73a-0000001a                  <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           pk_pg_class                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-265d38e8-0000000e                  <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           pk_pg_index                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-dd3e1473-00000033                  <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pk_pg_proc                                                         <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-2e2ffabe-00000042                  <null>     
+string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             string                boolean    string                                              string                                              string                                              string                                              short[]                                                          
+VDBName                                                            SchemaName                                                         TableName                                                          Name                                                               Description                                                        NameInSource                                                       Type                  IsIndexed  RefKeyUID                                           UID                                                 TableUID                                            RefTableUID                                         ColPositions                                                     
+PartsSupplier                                                      SYS                                                                Columns                                                            FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-f9cb2344-00000022                  tid:2cb59cfd55db-9bd42fbd-00000001                  tid:2cb59cfd55db-94dc2a85-000000b8                  [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b26c429b-00000094                  tid:2cb59cfd55db-a4593e3b-0000008b                  tid:2cb59cfd55db-7c45e39e-00000079                  tid:2cb59cfd55db-6f11277b-0000008c                  [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                Functions                                                          FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-b26d48ab-00000095                  tid:2cb59cfd55db-6f11277b-0000008c                  tid:2cb59cfd55db-d57e16d2-000000ae                  [1, 2]                                                           
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-47768c18-00000046                  tid:2cb59cfd55db-c5c6549e-0000003a                  tid:2cb59cfd55db-94dc2a85-000000b8                  [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                Keys                                                               FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-885caaa7-00000057                  tid:2cb59cfd55db-0023a214-00000048                  tid:2cb59cfd55db-94dc2a85-000000b8                  [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-3ee6c51d-00000076                  tid:2cb59cfd55db-b9041e7b-0000006b                  tid:2cb59cfd55db-ab347619-00000059                  tid:2cb59cfd55db-8f29b420-0000006d                  [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                Procedures                                                         FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-3ee7cb2d-00000077                  tid:2cb59cfd55db-8f29b420-0000006d                  tid:2cb59cfd55db-d57e16d2-000000ae                  [1, 2]                                                           
+PartsSupplier                                                      SYS                                                                Tables                                                             FK0                                                                <null>                                                             <null>                                                             Foreign               false      tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-b8dd6a06-000000c7                  tid:2cb59cfd55db-94dc2a85-000000b8                  tid:2cb59cfd55db-d57e16d2-000000ae                  [1, 2]                                                           
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       FK_SPLIER_PRTS_PRTS                                                <null>                                                             FK_SPLIER_PRTS_PRTS                                                Foreign               false      mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590         mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590         mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590         [2]                                                              
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             FK_SPLIER_STATS                                                    <null>                                                             FK_SPLIER_STATS                                                    Foreign               false      mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590         mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590         mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         [3]                                                              
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       FK_SPLY_PRTS_SPLY                                                  <null>                                                             FK_SPLY_PRTS_SPLY                                                  Foreign               false      mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590         mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590         mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         [1]                                                              
+PartsSupplier                                                      SYS                                                                Columns                                                            PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-f9ca1d34-00000021                  tid:2cb59cfd55db-9bd42fbd-00000001                  <null>                                              [1, 2, 3, 4]                                                     
+PartsSupplier                                                      SYS                                                                DataTypes                                                          PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-8366f98d-00000038                  tid:2cb59cfd55db-6130d2cf-00000024                  <null>                                              [1]                                                              
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-a458382b-0000008a                  tid:2cb59cfd55db-7c45e39e-00000079                  <null>                                              [1, 2, 3, 5]                                                     
+PartsSupplier                                                      SYS                                                                Functions                                                          PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-b26c429b-00000094                  tid:2cb59cfd55db-6f11277b-0000008c                  <null>                                              [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-47758608-00000045                  tid:2cb59cfd55db-c5c6549e-0000003a                  <null>                                              [1, 2, 3, 4]                                                     
+PartsSupplier                                                      SYS                                                                Keys                                                               PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-885ba497-00000056                  tid:2cb59cfd55db-0023a214-00000048                  <null>                                              [1, 2, 3, 4]                                                     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-b903186b-0000006a                  tid:2cb59cfd55db-ab347619-00000059                  <null>                                              [1, 2, 3, 4]                                                     
+PartsSupplier                                                      SYS                                                                Procedures                                                         PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-3ee6c51d-00000076                  tid:2cb59cfd55db-8f29b420-0000006d                  <null>                                              [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                Schemas                                                            PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-bd1485f4-000000b6                  tid:2cb59cfd55db-d57e16d2-000000ae                  <null>                                              [1, 2]                                                           
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-5acb8ff2-000000d3                  tid:2cb59cfd55db-067724e6-000000d1                  <null>                                              [1]                                                              
+PartsSupplier                                                      SYS                                                                Tables                                                             PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-b8dc63f6-000000c6                  tid:2cb59cfd55db-94dc2a85-000000b8                  <null>                                              [1, 2, 3]                                                        
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:2cb59cfd55db-afd1d46c-000000cc                  tid:2cb59cfd55db-a9e11fad-000000c9                  <null>                                              [1, 2]                                                           
+PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-d67a9241-00000018                  tid:60b87e792634-14d6450e-0000000e                  <null>                                              [1, 2, 3]                                                        
+PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-efb4c499-00000036                  tid:60b87e792634-c0d02c23-00000030                  <null>                                              [1, 2, 3]                                                        
+PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-e9ce2e51-00000027                  tid:60b87e792634-5d71c5db-0000001d                  <null>                                              [1, 2, 3, 4]                                                     
+PartsSupplier                                                      SYSADMIN                                                           Usage                                                              PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-36867ce1-0000000d                  tid:60b87e792634-04e38d81-00000001                  <null>                                              [2, 7]                                                           
+PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-4e2f379e-0000001c                  tid:60b87e792634-1e9b1131-00000019                  <null>                                              [1]                                                              
+PartsSupplier                                                      SYSADMIN                                                           Views                                                              PK                                                                 <null>                                                             <null>                                                             Primary               false      <null>                                              tid:60b87e792634-7277c828-0000002e                  tid:60b87e792634-04ed2a4e-00000028                  <null>                                              [1, 2, 3]                                                        
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PK_PARTS                                                           <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590         mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590         <null>                                              [1]                                                              
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SHIP_VIA                                             PK_SHIP_VIA                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590         mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590         <null>                                              [1]                                                              
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               PK_STATUS                                                          <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590         mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         <null>                                              [1]                                                              
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             PK_SUPPLIER                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590         mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         <null>                                              [1]                                                              
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PK_SUPPLIER_PARTS                                                  <null>                                                             <null>                                                             Primary               false      <null>                                              mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590         mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         <null>                                              [1, 2]                                                           
+PartsSupplier                                                      SYS                                                                Columns                                                            UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-13808db8-00000023                  tid:2cb59cfd55db-9bd42fbd-00000001                  <null>                                              [29]                                                             
+PartsSupplier                                                      SYS                                                                DataTypes                                                          UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-9d1d6a11-00000039                  tid:2cb59cfd55db-6130d2cf-00000024                  <null>                                              [15]                                                             
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-be0ea8af-00000089                  tid:2cb59cfd55db-7c45e39e-00000079                  <null>                                              [14]                                                             
+PartsSupplier                                                      SYS                                                                Functions                                                          UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-cc22b31f-00000096                  tid:2cb59cfd55db-6f11277b-0000008c                  <null>                                              [5]                                                              
+PartsSupplier                                                      SYS                                                                KeyColumns                                                         UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-612bf68c-00000047                  tid:2cb59cfd55db-c5c6549e-0000003a                  <null>                                              [8]                                                              
+PartsSupplier                                                      SYS                                                                Keys                                                               UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-a212151b-00000058                  tid:2cb59cfd55db-0023a214-00000048                  <null>                                              [10]                                                             
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-d2b988ef-0000006c                  tid:2cb59cfd55db-ab347619-00000059                  <null>                                              [14]                                                             
+PartsSupplier                                                      SYS                                                                Procedures                                                         UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-589d35a1-00000078                  tid:2cb59cfd55db-8f29b420-0000006d                  <null>                                              [6]                                                              
+PartsSupplier                                                      SYS                                                                Properties                                                         UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-248610ed-0000009d                  tid:2cb59cfd55db-3f9f6953-00000097                  <null>                                              [3, 1]                                                           
+PartsSupplier                                                      SYS                                                                Schemas                                                            UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-d6caf678-000000b7                  tid:2cb59cfd55db-d57e16d2-000000ae                  <null>                                              [4]                                                              
+PartsSupplier                                                      SYS                                                                Tables                                                             UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:2cb59cfd55db-d292d47a-000000c8                  tid:2cb59cfd55db-94dc2a85-000000b8                  <null>                                              [8]                                                              
+PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:60b87e792634-096b351d-00000037                  tid:60b87e792634-c0d02c23-00000030                  <null>                                              [5]                                                              
+PartsSupplier                                                      SYSADMIN                                                           Views                                                              UNIQUE0                                                            <null>                                                             <null>                                                             Unique                false      <null>                                              tid:60b87e792634-8c2e38ac-0000002f                  tid:60b87e792634-04ed2a4e-00000028                  <null>                                              [5]                                                              
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       idx_matpg_relatt_ids                                               <null>                                                             <null>                                                             Index                 false      <null>                                              tid:7ff2755e9621-2a649141-00000070                  tid:7ff2755e9621-75d65150-00000067                  <null>                                              [1, 2]                                                           
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     matpg_datatype_ids                                                 <null>                                                             <null>                                                             Index                 false      <null>                                              tid:7ff2755e9621-ed0faad9-0000007a                  tid:7ff2755e9621-e544c1cc-00000071                  <null>                                              [2, 1]                                                           
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     matpg_datatype_names                                               <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-e36b5c29-00000079                  tid:7ff2755e9621-e544c1cc-00000071                  <null>                                              [1, 3]                                                           
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       pk_matpg_relatt_names                                              <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-965abd13-0000006f                  tid:7ff2755e9621-75d65150-00000067                  <null>                                              [3, 4, 5]                                                        
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       pk_pg_attr                                                         <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-db38c4ce-0000001e                  tid:7ff2755e9621-edc4ea54-00000013                  <null>                                              [1]                                                              
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           pk_pg_class                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-265d3907-00000012                  tid:7ff2755e9621-62e78530-00000005                  <null>                                              [1]                                                              
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           pk_pg_index                                                        <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-dd3e19e6-00000039                  tid:7ff2755e9621-633d048a-0000002e                  <null>                                              [1]                                                              
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            pk_pg_proc                                                         <null>                                                             <null>                                                             Primary               false      <null>                                              tid:7ff2755e9621-2e300031-00000048                  tid:7ff2755e9621-d9ec709e-0000003d                  <null>                                              [1]                                                              
 Row Count : 55
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName        12             PartsSupplier   java.lang.String    VDBName         string             SYS            Keys          255                   255           0         false            true             false       false                 0           true        true          false     false       
@@ -67,4 +67,6 @@ Type           12             PartsSupplier   java.lang.String    Type
 IsIndexed      -7             PartsSupplier   java.lang.Boolean   IsIndexed       boolean            SYS            Keys          5                     1             0         false            false            false       false                 0           true        true          false     false       
 RefKeyUID      12             PartsSupplier   java.lang.String    RefKeyUID       string             SYS            Keys          50                    50            0         false            true             false       false                 1           true        true          false     false       
 UID            12             PartsSupplier   java.lang.String    UID             string             SYS            Keys          50                    50            0         false            true             false       false                 0           true        true          false     false       
-OID            4              PartsSupplier   java.lang.Integer   OID             integer            SYS            Keys          11                    10            0         false            false            false       false                 1           true        true          true      false       
+TableUID       12             PartsSupplier   java.lang.String    TableUID        string             SYS            Keys          50                    50            0         false            true             false       false                 0           true        true          false     false       
+RefTableUID    12             PartsSupplier   java.lang.String    RefTableUID     string             SYS            Keys          50                    50            0         false            true             false       false                 0           true        true          false     false       
+ColPositions   2003           PartsSupplier   java.sql.Array      ColPositions    short[]            SYS            Keys          2147483647            2             0         false            false            false       false                 0           true        true          true      false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
index 2938b3fcc0..b7bf46846a 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
@@ -23,12 +23,12 @@ PartsSupplier                                                      SYSADMIN
 PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRow                                                  ViewName                                                           string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-4b1eb2f0-00000047                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           refreshMatViewRows                                                 ViewName                                                           string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-4b1eb2f0-0000004c                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      cardinality                                                        long                       2            In                                                                 false     19           8            0            10           No Nulls    tid:60b87e792634-3260ed8e-0000005c                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ARRAYITERATE                                                       col                                                                object                     1            ResultSet                                                          false     0            2147483647   0            0            Nullable    tid:2cb59cfd55db-516c8946-000000e0                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ARRAYITERATE                                                       col                                                                object                     1            ResultSet                                                          false     0            2147483647   0            0            Nullable    tid:2cb59cfd55db-4e4078ef-000000e3                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     columnName                                                         string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-827e2701-00000050                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         context                                                            string                     3            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-38b735af-0000003b                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             context                                                            string                     3            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-38b735af-0000003f                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     distinctCount                                                      long                       3            In                                                                 false     19           8            0            10           Nullable    tid:60b87e792634-98c12f73-00000051                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      document                                                           string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:2cb59cfd55db-335cd11b-000000cb                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      document                                                           string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:2cb59cfd55db-335cd11b-000000ce                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           loadMatView                                                        invalidate                                                         boolean                    4            In                                                                 false     1            1            0            10           No Nulls    tid:60b87e792634-92d0313b-0000006c                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         level                                                              string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-06219b84-0000003a                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             level                                                              string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-06219b84-0000003e                  <null>                                                             <null>     
@@ -41,13 +41,13 @@ PartsSupplier                                                      SYSADMIN
 PartsSupplier                                                      SYSADMIN                                                           updateMatView                                                      refreshCriteria                                                    string                     4            In                                                                 false     0            4000         0            0            Nullable    tid:60b87e792634-c4bfcb5a-00000071                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           loadMatView                                                        return                                                             integer                    1            ReturnValue                                                        false     10           4            0            10           Nullable    tid:60b87e792634-c84e3d30-0000006d                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           updateMatView                                                      return                                                             integer                    1            ReturnValue                                                        false     10           4            0            10           Nullable    tid:60b87e792634-c84e3d30-00000072                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      schema                                                             xml                        1            ResultSet                                                          false     0            2147483647   0            0            Nullable    tid:2cb59cfd55db-c3a8507b-000000cd                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      schema                                                             xml                        1            ResultSet                                                          false     0            2147483647   0            0            Nullable    tid:2cb59cfd55db-b05d0ee1-000000d0                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           loadMatView                                                        schemaName                                                         string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-e5406bcc-0000006a                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           matViewStatus                                                      schemaName                                                         string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-e5406bcc-0000005e                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           updateMatView                                                      schemaName                                                         string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-e5406bcc-0000006f                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           setColumnStats                                                     tableName                                                          string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-89769379-0000004f                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           setTableStats                                                      tableName                                                          string                     1            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-89769379-0000005b                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                ARRAYITERATE                                                       val                                                                object[]                   1            In                                                                 false     0            2147483647   0            0            Nullable    tid:2cb59cfd55db-0001c721-000000de                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ARRAYITERATE                                                       val                                                                object[]                   1            In                                                                 false     0            2147483647   0            0            Nullable    tid:2cb59cfd55db-0001c721-000000e1                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           loadMatView                                                        viewName                                                           string                     3            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-47444ed0-0000006b                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           matViewStatus                                                      viewName                                                           string                     2            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-47444ed0-0000005f                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           updateMatView                                                      viewName                                                           string                     3            In                                                                 false     0            4000         0            0            No Nulls    tid:60b87e792634-47444ed0-00000070                  <null>                                                             <null>     
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
index 2931814743..cdf34ae33a 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
@@ -1,7 +1,7 @@
 string                                                             string                                                             string                                                             string                                                             boolean         string                                              string                                                             integer    
 VDBName                                                            SchemaName                                                         Name                                                               NameInSource                                                       ReturnsResults  UID                                                 Description                                                        OID        
-PartsSupplier                                                      SYS                                                                ARRAYITERATE                                                       <null>                                                             true            tid:2cb59cfd55db-507bd801-000000dd                  <null>                                                             <null>     
-PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      <null>                                                             true            tid:2cb59cfd55db-b59a8ad1-000000ca                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                ARRAYITERATE                                                       <null>                                                             true            tid:2cb59cfd55db-507bd801-000000e0                  <null>                                                             <null>     
+PartsSupplier                                                      SYS                                                                getXMLSchemas                                                      <null>                                                             true            tid:2cb59cfd55db-b59a8ad1-000000cd                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           isLoggable                                                         <null>                                                             false           tid:60b87e792634-492678c7-00000038                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           loadMatView                                                        <null>                                                             false           tid:60b87e792634-1388485f-00000069                  <null>                                                             <null>     
 PartsSupplier                                                      SYSADMIN                                                           logMsg                                                             <null>                                                             false           tid:60b87e792634-be97959d-0000003c                  <null>                                                             <null>     
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
index 80c3462a00..66fce4f57a 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
@@ -1,11 +1,11 @@
 string                                                             string                                                             string                                              integer      clob                                                             
 Name                                                               Value                                                              UID                                                 OID          ClobValue                                                        
-pg_type:oid                                                        1002                                                               tid:7ff2755e9621-c6363cab-0000003f                  <null>       Clob[4]                                                          
-pg_type:oid                                                        1009                                                               tid:7ff2755e9621-c63e18c3-0000003e                  <null>       Clob[4]                                                          
-pg_type:oid                                                        30                                                                 tid:7ff2755e9621-c69d99f4-0000003d                  <null>       Clob[2]                                                          
-teiid:pass-through-type                                            true                                                               tid:7ff2755e9621-e548fc4c-0000007d                  <null>       Clob[4]                                                          
-pg_type:oid                                                        22                                                                 tid:7ff2755e9621-ef456845-00000030                  <null>       Clob[2]                                                          
-pg_type:oid                                                        1028                                                               tid:7ff2755e9621-f418fc1b-00000040                  <null>       Clob[4]                                                          
+pg_type:oid                                                        1002                                                               tid:7ff2755e9621-c636421e-00000045                  <null>       Clob[4]                                                          
+pg_type:oid                                                        1009                                                               tid:7ff2755e9621-c63e1e36-00000044                  <null>       Clob[4]                                                          
+pg_type:oid                                                        30                                                                 tid:7ff2755e9621-c69d9f67-00000043                  <null>       Clob[2]                                                          
+teiid:pass-through-type                                            true                                                               tid:7ff2755e9621-e548fc4c-000000b2                  <null>       Clob[4]                                                          
+pg_type:oid                                                        22                                                                 tid:7ff2755e9621-ef456db8-00000036                  <null>       Clob[2]                                                          
+pg_type:oid                                                        1028                                                               tid:7ff2755e9621-f419018e-00000046                  <null>       Clob[4]                                                          
 Row Count : 6
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 Name           12             PartsSupplier   java.lang.String    Name            string             SYS            Properties    4000                  4000          0         false            true             false       false                 0           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
index 59db35aa22..ba3e75354c 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
@@ -1,29 +1,29 @@
-string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             short    integer      integer      string                                                             string                                                             integer      
-PKTABLE_CAT                                                        PKTABLE_SCHEM                                                      PKTABLE_NAME                                                       PKCOLUMN_NAME                                                      FKTABLE_CAT                                                        FKTABLE_SCHEM                                                      FKTABLE_NAME                                                       FKCOLUMN_NAME                                                      KEY_SEQ  UPDATE_RULE  DELETE_RULE  FK_NAME                                                            PK_NAME                                                            DEFERRABILITY
-PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Functions                                                          Name                                                               PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       3        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_ID                                                            PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PART_ID                                                            1        3            3            FK_SPLIER_PRTS_PRTS                                                PK_PARTS                                                           5            
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               STATUS_ID                                                          PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_STATUS                                                    1        3            3            FK_SPLIER_STATS                                                    PK_STATUS                                                          5            
-PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_ID                                                        PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       SUPPLIER_ID                                                        1        3            3            FK_SPLY_PRTS_SPLY                                                  PK_SUPPLIER                                                        5            
-PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      3        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          3        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          3        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            1        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5            
-PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          3        3            3            FK0                                                                PK                                                                 5            
+string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             string                                                             short    integer      integer      string                                                             string                                                             integer        string                                            
+PKTABLE_CAT                                                        PKTABLE_SCHEM                                                      PKTABLE_NAME                                                       PKCOLUMN_NAME                                                      FKTABLE_CAT                                                        FKTABLE_SCHEM                                                      FKTABLE_NAME                                                       FKCOLUMN_NAME                                                      KEY_SEQ  UPDATE_RULE  DELETE_RULE  FK_NAME                                                            PK_NAME                                                            DEFERRABILITY  FK_UID                                            
+PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            PartsSupplier                                                      SYS                                                                FunctionParams                                                     VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-a4593e3b-0000008b                
+PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         PartsSupplier                                                      SYS                                                                FunctionParams                                                     SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-a4593e3b-0000008b                
+PartsSupplier                                                      SYS                                                                Functions                                                          Name                                                               PartsSupplier                                                      SYS                                                                FunctionParams                                                     FunctionName                                                       3        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-a4593e3b-0000008b                
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.PARTS                                                PART_ID                                                            PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       PART_ID                                                            1        3            3            FK_SPLIER_PRTS_PRTS                                                PK_PARTS                                                           5              mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590       
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               STATUS_ID                                                          PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_STATUS                                                    1        3            3            FK_SPLIER_STATS                                                    PK_STATUS                                                          5              mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590       
+PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             SUPPLIER_ID                                                        PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       SUPPLIER_ID                                                        1        3            3            FK_SPLY_PRTS_SPLY                                                  PK_SUPPLIER                                                        5              mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590       
+PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            PartsSupplier                                                      SYS                                                                ProcedureParams                                                    VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-b9041e7b-0000006b                
+PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         PartsSupplier                                                      SYS                                                                ProcedureParams                                                    SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-b9041e7b-0000006b                
+PartsSupplier                                                      SYS                                                                Procedures                                                         Name                                                               PartsSupplier                                                      SYS                                                                ProcedureParams                                                    ProcedureName                                                      3        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-b9041e7b-0000006b                
+PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PartsSupplier                                                      SYS                                                                Functions                                                          VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-b26d48ab-00000095                
+PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PartsSupplier                                                      SYS                                                                Functions                                                          SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-b26d48ab-00000095                
+PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PartsSupplier                                                      SYS                                                                Procedures                                                         VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-3ee7cb2d-00000077                
+PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PartsSupplier                                                      SYS                                                                Procedures                                                         SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-3ee7cb2d-00000077                
+PartsSupplier                                                      SYS                                                                Schemas                                                            VDBName                                                            PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-b8dd6a06-000000c7                
+PartsSupplier                                                      SYS                                                                Schemas                                                            Name                                                               PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-b8dd6a06-000000c7                
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PartsSupplier                                                      SYS                                                                Columns                                                            VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-f9cb2344-00000022                
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PartsSupplier                                                      SYS                                                                Columns                                                            SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-f9cb2344-00000022                
+PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PartsSupplier                                                      SYS                                                                Columns                                                            TableName                                                          3        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-f9cb2344-00000022                
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PartsSupplier                                                      SYS                                                                KeyColumns                                                         VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-47768c18-00000046                
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PartsSupplier                                                      SYS                                                                KeyColumns                                                         SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-47768c18-00000046                
+PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PartsSupplier                                                      SYS                                                                KeyColumns                                                         TableName                                                          3        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-47768c18-00000046                
+PartsSupplier                                                      SYS                                                                Tables                                                             VDBName                                                            PartsSupplier                                                      SYS                                                                Keys                                                               VDBName                                                            1        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-885caaa7-00000057                
+PartsSupplier                                                      SYS                                                                Tables                                                             SchemaName                                                         PartsSupplier                                                      SYS                                                                Keys                                                               SchemaName                                                         2        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-885caaa7-00000057                
+PartsSupplier                                                      SYS                                                                Tables                                                             Name                                                               PartsSupplier                                                      SYS                                                                Keys                                                               TableName                                                          3        3            3            FK0                                                                PK                                                                 5              tid:2cb59cfd55db-885caaa7-00000057                
 Row Count : 24
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName         getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 PKTABLE_CAT    12             PartsSupplier   java.lang.String    PKTABLE_CAT     string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
@@ -40,3 +40,4 @@ DELETE_RULE    4              PartsSupplier   java.lang.Integer   DELETE_RULE
 FK_NAME        12             PartsSupplier   java.lang.String    FK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
 PK_NAME        12             PartsSupplier   java.lang.String    PK_NAME         string             SYS            ReferenceKeyColumns  255                   255           0         false            true             false       false                 1           true        true          false     false       
 DEFERRABILITY  4              PartsSupplier   java.lang.Integer   DEFERRABILITY   integer            SYS            ReferenceKeyColumns  11                    10            0         false            false            false       false                 1           true        true          true      false       
+FK_UID         12             PartsSupplier   java.lang.String    FK_UID          string             SYS            ReferenceKeyColumns  50                    50            0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
index eb1a931768..5de67125bb 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
@@ -2,9 +2,9 @@ string                                                             string
 VDBName                                                            SchemaName                                                         Name                                                               Type                  NameInSource                                                       IsPhysical  SupportsUpdates  UID                                                 Cardinality  Description                                                        IsSystem  IsMaterialized  OID        
 PartsSupplier                                                      SYS                                                                Columns                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-9bd42fbd-00000001                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYS                                                                DataTypes                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6130d2cf-00000024                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                FunctionParams                                                     Table                 <null>                                                             true        false            tid:2cb59cfd55db-7c45e39e-00000077                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                Functions                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6f11277b-0000008a                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   Table                 <null>                                                             false       false            tid:2cb59cfd55db-e1a630f0-000000d5                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                FunctionParams                                                     Table                 <null>                                                             true        false            tid:2cb59cfd55db-7c45e39e-00000079                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                Functions                                                          Table                 <null>                                                             true        false            tid:2cb59cfd55db-6f11277b-0000008c                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                GEOMETRY_COLUMNS                                                   Table                 <null>                                                             false       false            tid:2cb59cfd55db-e1a630f0-000000d8                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYS                                                                KeyColumns                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-c5c6549e-0000003a                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYS                                                                Keys                                                               Table                 <null>                                                             true        false            tid:2cb59cfd55db-0023a214-00000048                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYSADMIN                                                           MatViews                                                           Table                 <null>                                                             true        false            tid:60b87e792634-14d6450e-0000000e                  -1           <null>                                                             true      false           <null>     
@@ -13,34 +13,39 @@ PartsSupplier                                                      PartsSupplier
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.STATUS                                               Table                 STATUS                                                             true        true             mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590         3            <null>                                                             false     false           <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER                                             Table                 SUPPLIER                                                           true        true             mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590         16           <null>                                                             false     false           <null>     
 PartsSupplier                                                      PartsSupplier                                                      PARTSSUPPLIER.SUPPLIER_PARTS                                       Table                 SUPPLIER_PARTS                                                     true        true             mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590         227          <null>                                                             false     false           <null>     
-PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-00000057                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000006b                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000095                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000009c                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-000000ab                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                ProcedureParams                                                    Table                 <null>                                                             true        false            tid:2cb59cfd55db-ab347619-00000059                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                Procedures                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-8f29b420-0000006d                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                Properties                                                         Table                 <null>                                                             true        false            tid:2cb59cfd55db-3f9f6953-00000097                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                ReferenceKeyColumns                                                Table                 <null>                                                             true        false            tid:2cb59cfd55db-aa92fa09-0000009e                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                Schemas                                                            Table                 <null>                                                             true        false            tid:2cb59cfd55db-d57e16d2-000000ae                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYSADMIN                                                           StoredProcedures                                                   Table                 <null>                                                             true        false            tid:60b87e792634-c0d02c23-00000030                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-000000b5                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                Tables                                                             Table                 <null>                                                             true        false            tid:2cb59cfd55db-94dc2a85-000000b8                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYSADMIN                                                           Triggers                                                           Table                 <null>                                                             true        false            tid:60b87e792634-5d71c5db-0000001d                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYSADMIN                                                           Usage                                                              Table                 <null>                                                             true        false            tid:60b87e792634-04e38d81-00000001                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYSADMIN                                                           VDBResources                                                       Table                 <null>                                                             true        false            tid:60b87e792634-1e9b1131-00000019                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      SYSADMIN                                                           Views                                                              Table                 <null>                                                             true        false            tid:60b87e792634-04ed2a4e-00000028                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-000000c6                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-0000006b                  -1           <null>                                                             true      true            <null>     
-PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-00000061                  -1           <null>                                                             true      true            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-00000034                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-ec00662c-0000004d                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-edc4ea54-0000000f                  -1           <null>                                                             true      true            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_class                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-62e78530-00000004                  -1           <null>                                                             true      true            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_database                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-dda8fac3-00000052                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_description                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-3be1b5b4-00000073                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_index                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-633d048a-00000028                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      SYS                                                                VirtualDatabases                                                   Table                 <null>                                                             true        false            tid:2cb59cfd55db-a9e11fad-000000c9                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         geography_columns                                                  Table                 <null>                                                             false       false            tid:7ff2755e9621-a5547a1a-0000008d                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_datatype                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-e544c1cc-00000071                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      pg_catalog                                                         matpg_relatt                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-75d65150-00000067                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_am                                                              Table                 <null>                                                             false       false            tid:7ff2755e9621-065a8b74-0000003a                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attrdef                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-ec00662c-00000053                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_attribute                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-edc4ea54-00000013                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_class                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-62e78530-00000005                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_constraint                                                      Table                 <null>                                                             false       false            tid:7ff2755e9621-a751cd25-00000095                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_database                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-dda8fac3-00000058                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_description                                                     Table                 <null>                                                             false       false            tid:7ff2755e9621-3be1b5b4-0000007b                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_index                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-633d048a-0000002e                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_inherits                                                        Table                 <null>                                                             false       false            tid:7ff2755e9621-80857820-00000085                  -1           <null>                                                             true      false           <null>     
 PartsSupplier                                                      pg_catalog                                                         pg_namespace                                                       Table                 <null>                                                             false       false            tid:7ff2755e9621-37a09513-00000001                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ec709e-00000037                  -1           <null>                                                             true      true            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-d50d2370-00000043                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_type                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ee5c82-0000001b                  -1           <null>                                                             true      true            <null>     
-PartsSupplier                                                      pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-0000005c                  -1           <null>                                                             true      false           <null>     
-PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    Table                 <null>                                                             false       false            tid:2cb59cfd55db-067724e6-000000ce                  -1           <null>                                                             true      true            <null>     
-Row Count : 40
+PartsSupplier                                                      pg_catalog                                                         pg_prepared_xacts                                                  Table                 <null>                                                             false       false            tid:7ff2755e9621-7deb875f-00000080                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_proc                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ec709e-0000003d                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_stats                                                           Table                 <null>                                                             false       false            tid:7ff2755e9621-63cca057-00000089                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_trigger                                                         Table                 <null>                                                             false       false            tid:7ff2755e9621-d50d2370-00000049                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_type                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9ee5c82-0000001f                  -1           <null>                                                             true      true            <null>     
+PartsSupplier                                                      pg_catalog                                                         pg_user                                                            Table                 <null>                                                             false       false            tid:7ff2755e9621-d9eeb913-00000062                  -1           <null>                                                             true      false           <null>     
+PartsSupplier                                                      SYS                                                                spatial_ref_sys                                                    Table                 <null>                                                             false       false            tid:2cb59cfd55db-067724e6-000000d1                  -1           <null>                                                             true      true            <null>     
+Row Count : 45
 getColumnName    getColumnType  getCatalogName  getColumnClassName  getColumnLabel   getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 VDBName          12             PartsSupplier   java.lang.String    VDBName          string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
 SchemaName       12             PartsSupplier   java.lang.String    SchemaName       string             SYS            Tables        255                   255           0         false            true             false       false                 1           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected
index 98caa0b35d..f44ddfaeea 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected
@@ -1,31 +1,31 @@
 string                                                             string                                              string                                              string                                                             string                                                             string                                                             string                                              string                                              string                                                             string                                                             string                                                           
 VDBName                                                            UID                                                 object_type                                         SchemaName                                                         Name                                                               ElementName                                                        Uses_UID                                            Uses_object_type                                    Uses_SchemaName                                                    Uses_Name                                                          Uses_ElementName                                                 
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-3f9f6953-00000095                  Table                                               SYS                                                                Properties                                                         <null>                                                           
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-9bd42fbd-00000001                  Table                                               SYS                                                                Columns                                                            <null>                                                           
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-36f28338-00000002                  Column                                              SYS                                                                Columns                                                            VDBName                                                          
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-55dc5b25-00000003                  Column                                              SYS                                                                Columns                                                            SchemaName                                                       
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-fab2c692-00000004                  Column                                              SYS                                                                Columns                                                            TableName                                                        
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-f9ef01e4-00000005                  Column                                              SYS                                                                Columns                                                            Name                                                             
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-0fb93781-00000097                  Column                                              SYS                                                                Properties                                                         Value                                                            
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-0ad0de60-00000098                  Column                                              SYS                                                                Properties                                                         UID                                                              
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-f9cb5b69-0000001e                  Column                                              SYS                                                                Columns                                                            UID                                                              
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-0af484db-00000096                  Column                                              SYS                                                                Properties                                                         Name                                                             
-PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d5                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-6847855d-00000008                  Column                                              SYS                                                                Columns                                                            DataType                                                         
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-a9e11fad-000000c6                  Table                                               SYS                                                                VirtualDatabases                                                   <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-94dc2a85-000000b5                  Table                                               SYS                                                                Tables                                                             <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-3f9f6953-00000095                  Table                                               SYS                                                                Properties                                                         <null>                                                           
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-3f9f6953-00000097                  Table                                               SYS                                                                Properties                                                         <null>                                                           
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-9bd42fbd-00000001                  Table                                               SYS                                                                Columns                                                            <null>                                                           
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-36f28338-00000002                  Column                                              SYS                                                                Columns                                                            VDBName                                                          
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-55dc5b25-00000003                  Column                                              SYS                                                                Columns                                                            SchemaName                                                       
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-fab2c692-00000004                  Column                                              SYS                                                                Columns                                                            TableName                                                        
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-f9ef01e4-00000005                  Column                                              SYS                                                                Columns                                                            Name                                                             
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-0fb937bf-00000099                  Column                                              SYS                                                                Properties                                                         Value                                                            
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-0ad0de9e-0000009a                  Column                                              SYS                                                                Properties                                                         UID                                                              
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-f9cb5b69-0000001e                  Column                                              SYS                                                                Columns                                                            UID                                                              
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-0af48519-00000098                  Column                                              SYS                                                                Properties                                                         Name                                                             
+PartsSupplier                                                      tid:2cb59cfd55db-e1a630f0-000000d8                  View                                                SYS                                                                GEOMETRY_COLUMNS                                                   <null>                                                             tid:2cb59cfd55db-6847855d-00000008                  Column                                              SYS                                                                Columns                                                            DataType                                                         
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-a9e11fad-000000c9                  Table                                               SYS                                                                VirtualDatabases                                                   <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-94dc2a85-000000b8                  Table                                               SYS                                                                Tables                                                             <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-3f9f6953-00000097                  Table                                               SYS                                                                Properties                                                         <null>                                                           
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:60b87e792634-14d6450e-0000000e                  Table                                               SYSADMIN                                                           MatViews                                                           <null>                                                           
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-9bd42fbd-00000001                  Table                                               SYS                                                                Columns                                                            <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-aff6b8bf-000000c7                  Column                                              SYS                                                                VirtualDatabases                                                   Name                                                             
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-27ff7ecc-000000c8                  Column                                              SYS                                                                VirtualDatabases                                                   Version                                                          
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-b8dda1ce-000000bd                  Column                                              SYS                                                                Tables                                                             UID                                                              
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-f604c99d-000000b6                  Column                                              SYS                                                                Tables                                                             VDBName                                                          
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-14eea18a-000000b7                  Column                                              SYS                                                                Tables                                                             SchemaName                                                       
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-b9014849-000000b8                  Column                                              SYS                                                                Tables                                                             Name                                                             
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-d1b2233f-000000c1                  Column                                              SYS                                                                Tables                                                             IsMaterialized                                                   
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-0fb93781-00000097                  Column                                              SYS                                                                Properties                                                         Value                                                            
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-0ad0de60-00000098                  Column                                              SYS                                                                Properties                                                         UID                                                              
-PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-0af484db-00000096                  Column                                              SYS                                                                Properties                                                         Name                                                             
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-aff6b91c-000000ca                  Column                                              SYS                                                                VirtualDatabases                                                   Name                                                             
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-27ff7f29-000000cb                  Column                                              SYS                                                                VirtualDatabases                                                   Version                                                          
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-b8dda22b-000000c0                  Column                                              SYS                                                                Tables                                                             UID                                                              
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-f604c9fa-000000b9                  Column                                              SYS                                                                Tables                                                             VDBName                                                          
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-14eea1e7-000000ba                  Column                                              SYS                                                                Tables                                                             SchemaName                                                       
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-b90148a6-000000bb                  Column                                              SYS                                                                Tables                                                             Name                                                             
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-d1b2239c-000000c4                  Column                                              SYS                                                                Tables                                                             IsMaterialized                                                   
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-0fb937bf-00000099                  Column                                              SYS                                                                Properties                                                         Value                                                            
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-0ad0de9e-0000009a                  Column                                              SYS                                                                Properties                                                         UID                                                              
+PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-0af48519-00000098                  Column                                              SYS                                                                Properties                                                         Name                                                             
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:60b87e792634-6a4a9422-00000013                  Column                                              SYSADMIN                                                           MatViews                                                           TargetName                                                       
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:60b87e792634-4ebf84a3-00000012                  Column                                              SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                 
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:60b87e792634-13a2f845-0000000f                  Column                                              SYSADMIN                                                           MatViews                                                           VDBName                                                          
@@ -34,21 +34,21 @@ PartsSupplier                                                      tid:60b87e792
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-f9ef01e4-00000005                  Column                                              SYS                                                                Columns                                                            Name                                                             
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-55dc5b25-00000003                  Column                                              SYS                                                                Columns                                                            SchemaName                                                       
 PartsSupplier                                                      tid:60b87e792634-1388485f-00000069                  StoredProcedure                                     SYSADMIN                                                           loadMatView                                                        <null>                                                             tid:2cb59cfd55db-fab2c692-00000004                  Column                                              SYS                                                                Columns                                                            TableName                                                        
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-a9e11fad-000000c6                  Table                                               SYS                                                                VirtualDatabases                                                   <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-94dc2a85-000000b5                  Table                                               SYS                                                                Tables                                                             <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-3f9f6953-00000095                  Table                                               SYS                                                                Properties                                                         <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-a9e11fad-000000c9                  Table                                               SYS                                                                VirtualDatabases                                                   <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-94dc2a85-000000b8                  Table                                               SYS                                                                Tables                                                             <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-3f9f6953-00000097                  Table                                               SYS                                                                Properties                                                         <null>                                                           
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:60b87e792634-14d6450e-0000000e                  Table                                               SYSADMIN                                                           MatViews                                                           <null>                                                           
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-9bd42fbd-00000001                  Table                                               SYS                                                                Columns                                                            <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-aff6b8bf-000000c7                  Column                                              SYS                                                                VirtualDatabases                                                   Name                                                             
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-27ff7ecc-000000c8                  Column                                              SYS                                                                VirtualDatabases                                                   Version                                                          
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-b8dda1ce-000000bd                  Column                                              SYS                                                                Tables                                                             UID                                                              
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-f604c99d-000000b6                  Column                                              SYS                                                                Tables                                                             VDBName                                                          
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-14eea18a-000000b7                  Column                                              SYS                                                                Tables                                                             SchemaName                                                       
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-b9014849-000000b8                  Column                                              SYS                                                                Tables                                                             Name                                                             
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-d1b2233f-000000c1                  Column                                              SYS                                                                Tables                                                             IsMaterialized                                                   
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-0fb93781-00000097                  Column                                              SYS                                                                Properties                                                         Value                                                            
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-0ad0de60-00000098                  Column                                              SYS                                                                Properties                                                         UID                                                              
-PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-0af484db-00000096                  Column                                              SYS                                                                Properties                                                         Name                                                             
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-aff6b91c-000000ca                  Column                                              SYS                                                                VirtualDatabases                                                   Name                                                             
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-27ff7f29-000000cb                  Column                                              SYS                                                                VirtualDatabases                                                   Version                                                          
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-b8dda22b-000000c0                  Column                                              SYS                                                                Tables                                                             UID                                                              
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-f604c9fa-000000b9                  Column                                              SYS                                                                Tables                                                             VDBName                                                          
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-14eea1e7-000000ba                  Column                                              SYS                                                                Tables                                                             SchemaName                                                       
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-b90148a6-000000bb                  Column                                              SYS                                                                Tables                                                             Name                                                             
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-d1b2239c-000000c4                  Column                                              SYS                                                                Tables                                                             IsMaterialized                                                   
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-0fb937bf-00000099                  Column                                              SYS                                                                Properties                                                         Value                                                            
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-0ad0de9e-0000009a                  Column                                              SYS                                                                Properties                                                         UID                                                              
+PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-0af48519-00000098                  Column                                              SYS                                                                Properties                                                         Name                                                             
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:60b87e792634-6a4a9422-00000013                  Column                                              SYSADMIN                                                           MatViews                                                           TargetName                                                       
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:60b87e792634-4ebf84a3-00000012                  Column                                              SYSADMIN                                                           MatViews                                                           TargetSchemaName                                                 
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:60b87e792634-13a2f845-0000000f                  Column                                              SYSADMIN                                                           MatViews                                                           VDBName                                                          
@@ -57,19 +57,19 @@ PartsSupplier                                                      tid:60b87e792
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-f9ef01e4-00000005                  Column                                              SYS                                                                Columns                                                            Name                                                             
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-55dc5b25-00000003                  Column                                              SYS                                                                Columns                                                            SchemaName                                                       
 PartsSupplier                                                      tid:60b87e792634-d8ee3f1c-0000006e                  StoredProcedure                                     SYSADMIN                                                           updateMatView                                                      <null>                                                             tid:2cb59cfd55db-fab2c692-00000004                  Column                                              SYS                                                                Columns                                                            TableName                                                        
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-a9e11fad-000000c6                  Table                                               SYS                                                                VirtualDatabases                                                   <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-94dc2a85-000000b5                  Table                                               SYS                                                                Tables                                                             <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-3f9f6953-00000095                  Table                                               SYS                                                                Properties                                                         <null>                                                           
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-aff6b8bf-000000c7                  Column                                              SYS                                                                VirtualDatabases                                                   Name                                                             
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-27ff7ecc-000000c8                  Column                                              SYS                                                                VirtualDatabases                                                   Version                                                          
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-b8dda1ce-000000bd                  Column                                              SYS                                                                Tables                                                             UID                                                              
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-f604c99d-000000b6                  Column                                              SYS                                                                Tables                                                             VDBName                                                          
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-14eea18a-000000b7                  Column                                              SYS                                                                Tables                                                             SchemaName                                                       
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-b9014849-000000b8                  Column                                              SYS                                                                Tables                                                             Name                                                             
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-d1b2233f-000000c1                  Column                                              SYS                                                                Tables                                                             IsMaterialized                                                   
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-0fb93781-00000097                  Column                                              SYS                                                                Properties                                                         Value                                                            
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-0ad0de60-00000098                  Column                                              SYS                                                                Properties                                                         UID                                                              
-PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-0af484db-00000096                  Column                                              SYS                                                                Properties                                                         Name                                                             
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-a9e11fad-000000c9                  Table                                               SYS                                                                VirtualDatabases                                                   <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-94dc2a85-000000b8                  Table                                               SYS                                                                Tables                                                             <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-3f9f6953-00000097                  Table                                               SYS                                                                Properties                                                         <null>                                                           
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-aff6b91c-000000ca                  Column                                              SYS                                                                VirtualDatabases                                                   Name                                                             
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-27ff7f29-000000cb                  Column                                              SYS                                                                VirtualDatabases                                                   Version                                                          
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-b8dda22b-000000c0                  Column                                              SYS                                                                Tables                                                             UID                                                              
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-f604c9fa-000000b9                  Column                                              SYS                                                                Tables                                                             VDBName                                                          
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-14eea1e7-000000ba                  Column                                              SYS                                                                Tables                                                             SchemaName                                                       
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-b90148a6-000000bb                  Column                                              SYS                                                                Tables                                                             Name                                                             
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-d1b2239c-000000c4                  Column                                              SYS                                                                Tables                                                             IsMaterialized                                                   
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-0fb937bf-00000099                  Column                                              SYS                                                                Properties                                                         Value                                                            
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-0ad0de9e-0000009a                  Column                                              SYS                                                                Properties                                                         UID                                                              
+PartsSupplier                                                      tid:60b87e792634-f786f077-0000005d                  StoredProcedure                                     SYSADMIN                                                           matViewStatus                                                      <null>                                                             tid:2cb59cfd55db-0af48519-00000098                  Column                                              SYS                                                                Properties                                                         Name                                                             
 Row Count : 70
 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             SYSADMIN       Usage         255                   255           0         false            true             false       false                 0           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
index 0da3670141..03cef48646 100644
--- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
+++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
@@ -1,22 +1,27 @@
 string                                                             clob                                                             
 Name                                                               Body                                                             
 GEOMETRY_COLUMNS                                                   Clob[551]                                                        
-matpg_datatype                                                     Clob[454]                                                        
+geography_columns                                                  Clob[73]                                                         
+matpg_datatype                                                     Clob[1562]                                                       
 matpg_relatt                                                       Clob[490]                                                        
 pg_am                                                              Clob[34]                                                         
 pg_attrdef                                                         Clob[360]                                                        
-pg_attribute                                                       Clob[1897]                                                       
-pg_class                                                           Clob[712]                                                        
+pg_attribute                                                       Clob[1899]                                                       
+pg_class                                                           Clob[840]                                                        
+pg_constraint                                                      Clob[273]                                                        
 pg_database                                                        Clob[156]                                                        
 pg_description                                                     Clob[26]                                                         
 pg_index                                                           Clob[815]                                                        
-pg_namespace                                                       Clob[79]                                                         
+pg_inherits                                                        Clob[49]                                                         
+pg_namespace                                                       Clob[94]                                                         
+pg_prepared_xacts                                                  Clob[55]                                                         
 pg_proc                                                            Clob[3051]                                                       
+pg_stats                                                           Clob[49]                                                         
 pg_trigger                                                         Clob[188]                                                        
-pg_type                                                            Clob[1472]                                                       
+pg_type                                                            Clob[1817]                                                       
 pg_user                                                            Clob[74]                                                         
 spatial_ref_sys                                                    Clob[209]                                                        
-Row Count : 16
+Row Count : 21
 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             SYSADMIN       Views         255                   255           0         false            true             false       false                 0           true        true          false     false       
 Body           2005           PartsSupplier   java.sql.Clob       Body            clob               SYSADMIN       Views         2097152               2097152       0         false            true             false       false                 0           true        true          false     false       
diff --git a/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected b/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
index 6a81dff4db..1484b5c92a 100644
--- a/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
+++ b/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected
@@ -2,12 +2,12 @@ string                                                             string
 Name                                                               Value                                                              UID                                               
 NugentXAttribute                                                   Nuuuuuge22222                                                      mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1       
 NugentYAttribute                                                   Nuuuuuge44444                                                      mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1       
-pg_type:oid                                                        1002                                                               tid:7ff2755e9621-c6363cab-0000003f                
-pg_type:oid                                                        1009                                                               tid:7ff2755e9621-c63e18c3-0000003e                
-pg_type:oid                                                        30                                                                 tid:7ff2755e9621-c69d99f4-0000003d                
-pg_type:oid                                                        22                                                                 tid:7ff2755e9621-ef456845-00000030                
-pg_type:oid                                                        1028                                                               tid:7ff2755e9621-f418fc1b-00000040                
-teiid:pass-through-type                                            true                                                               tid:7ff2755e9621-e548fc4c-0000007d                
+pg_type:oid                                                        1002                                                               tid:7ff2755e9621-c636421e-00000045                
+pg_type:oid                                                        1009                                                               tid:7ff2755e9621-c63e1e36-00000044                
+pg_type:oid                                                        30                                                                 tid:7ff2755e9621-c69d9f67-00000043                
+pg_type:oid                                                        22                                                                 tid:7ff2755e9621-ef456db8-00000036                
+pg_type:oid                                                        1028                                                               tid:7ff2755e9621-f419018e-00000046                
+teiid:pass-through-type                                            true                                                               tid:7ff2755e9621-e548fc4c-000000b2                
 Row Count : 8
 getColumnName  getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName  getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
 Name           12             xmlvp           java.lang.String    Name            string             SYS            Properties    4000                  4000          0         false            true             false       false                 0           true        true          false     false