[teiid-commits] teiid SVN: r613 - in trunk: client-jdbc/src/main/java/com/metamatrix/jdbc and 14 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Sun Mar 22 23:25:56 EDT 2009


Author: shawkins
Date: 2009-03-22 23:25:55 -0400 (Sun, 22 Mar 2009)
New Revision: 613

Added:
   trunk/common-core/src/test/java/com/metamatrix/query/
   trunk/common-core/src/test/java/com/metamatrix/query/unittest/
   trunk/common-core/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java
Removed:
   trunk/engine/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java
Modified:
   trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement.java
   trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java
   trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java
   trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java
   trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResultsImpl.java
   trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMCallableStatement.java
   trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.java
   trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java
   trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMessage.java
   trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMessage.java
   trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java
   trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
   trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
   trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
   trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java
   trunk/test-integration/src/test/java/com/metamatrix/cdk/TestLoopbackConnector.java
   trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java
   trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestPartsDatabaseMetadata.java
   trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestResultSetMetadata.java
   trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java
   trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestVirtualDocWithVirtualProc.java
Log:
TEIID-435 updating the detection of update statements and upgrading tests based upon running the integration suite

Modified: trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMessage.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMessage.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMessage.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -54,6 +54,7 @@
     private String txnAutoWrapMode;
     private String XMLFormat;
     private String styleSheet;
+    private Boolean requireResultSet;
 
     /**The time when the command was created by the client.*/
     private Date submittedTimestamp;
@@ -396,5 +397,13 @@
 	public boolean isBatchedUpdate() {
 		return isBatchedUpdate;
 	}
+	
+	public Boolean getRequireResultSet() {
+		return requireResultSet;
+	}
+	
+	public void setRequireResultSet(Boolean requireResultSet) {
+		this.requireResultSet = requireResultSet;
+	}
 
 }

Modified: trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMessage.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMessage.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMessage.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -96,6 +96,7 @@
      */
     private Collection annotations;
     
+    private boolean isUpdateResult;
 
     public ResultsMessage(){
     }
@@ -360,6 +361,7 @@
         cursorType = in.readInt();
         debugLog = (String)in.readObject();
         annotations = (Collection)in.readObject();
+        isUpdateResult = in.readBoolean();
     }
 
     public void writeExternal(ObjectOutput out) throws IOException {
@@ -393,6 +395,7 @@
         out.writeInt(cursorType);
         out.writeObject(debugLog);
         out.writeObject(annotations);
+        out.writeBoolean(isUpdateResult);
     }
 
     /**
@@ -434,5 +437,13 @@
             .append(finalRow)
             .toString();
     }
+
+	public void setUpdateResult(boolean isUpdateResult) {
+		this.isUpdateResult = isUpdateResult;
+	}
+
+	public boolean isUpdateResult() {
+		return isUpdateResult;
+	}
 }
 

Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -43,7 +43,7 @@
 import java.util.Map;
 
 import com.metamatrix.common.util.TimestampWithTimezone;
-import com.metamatrix.dqp.message.ResultsMessage;
+import com.metamatrix.dqp.message.RequestMessage;
 
 /**
  * <p> This class inherits Statement methods, which deal with SQL statements in
@@ -81,7 +81,17 @@
         super(connection, procedureCall, resultSetType, resultSetConcurrency);
         this.prepareSql = procedureCall;
     }
-
+    
+    @Override
+    protected RequestMessage createRequestMessage(String[] commands,
+    		boolean isBatchedCommand, Boolean requiresResultSet)
+    		throws MMSQLException {
+    	RequestMessage message = super.createRequestMessage(commands, isBatchedCommand, requiresResultSet);
+    	message.setCallableStatement(true);
+    	message.setPreparedStatement(false);
+    	return message;
+    }
+    
     /**
      * In many cases, it is desirable to immediately release a Statements's database
      * and JDBC resources instead of waiting for this to happen when it is automatically
@@ -381,20 +391,6 @@
         return parameterValue == null;
     }
 
-    /**
-     * Internal Execution method.
-     * @param sql Request Message's sql.
-     * @param listener Message Listener
-     * @throws SQLException thrown when fail to create the {@link AllResultsImpl}
-     */
-    protected ResultsMessage internalExecute(String[] commands, boolean isBatchedCommand) throws SQLException  {
-        try {
-            return sendRequestMessageAndWait(commands, false, true, getParameterValues(), false, isBatchedCommand);
-        } catch ( Throwable ex ) {
-            throw MMSQLException.create(ex, JDBCPlugin.Util.getString("MMStatement.Error_executing_stmt", commands[0])); //$NON-NLS-1$
-        }
-    }
-    
 	public SQLXML getSQLXML(int parameterIndex) throws SQLException {
 		return DataTypeTransformer.getSQLXML(getObject(parameterIndex));
 	}

Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -48,19 +48,16 @@
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.TreeMap;
-import java.util.logging.Logger;
 
 import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixException;
 import com.metamatrix.api.exception.MetaMatrixProcessingException;
 import com.metamatrix.common.types.BlobImpl;
 import com.metamatrix.common.types.ClobImpl;
 import com.metamatrix.common.types.MMJDBCSQLTypeInfo;
-import com.metamatrix.common.util.SqlUtil;
 import com.metamatrix.common.util.TimestampWithTimezone;
 import com.metamatrix.core.util.ArgCheck;
 import com.metamatrix.dqp.client.MetadataResult;
-import com.metamatrix.dqp.message.ResultsMessage;
+import com.metamatrix.dqp.message.RequestMessage;
 import com.metamatrix.jdbc.api.ExecutionProperties;
 
 /**
@@ -75,8 +72,6 @@
  */
 
 public class MMPreparedStatement extends MMStatement implements PreparedStatement {
-	private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
-	
     // sql, which this prepared statement is operating on
     protected String prepareSql;
 
@@ -148,36 +143,6 @@
             parameterMap.clear();
         }
     }
-
-    /**
-     * In many cases, it is desirable to immediately release a Statements's database
-     * and JDBC resources instead of waiting for this to happen when it is automatically
-     * closed; the close method provides this immediate release.
-     * @throws SQLException should never occur.
-     */
-    public void close() throws SQLException {
-        prepareSql = null;
-        super.close();
-    }
-
-    /**
-     * <p>Executes the SQL statement contained in the PreparedStatement object and
-     * indicates whether the first result is a result set, an update count, or
-     * there are no results.
-     * @return true is has result set
-     */
-    public boolean execute() throws SQLException {
-
-        // check if the statement is open
-        checkStatement();
-
-        if(isUpdateSql(prepareSql)) {
-            executeUpdate();
-            return false;
-        }
-        internalExecuteQuery();
-        return hasResultSet();
-    }
     
     @Override
     public boolean execute(String sql) throws SQLException {
@@ -196,140 +161,53 @@
     	String msg = JDBCPlugin.Util.getString("JDBC.Method_not_supported"); //$NON-NLS-1$
         throw new MMSQLException(msg);
     }
+    
+    @Override
+    public void addBatch(String sql) throws SQLException {
+    	String msg = JDBCPlugin.Util.getString("JDBC.Method_not_supported"); //$NON-NLS-1$
+        throw new MMSQLException(msg);
+    }
 
-    /**
-     * <p>
-     * Executes a prepared SQL query and returns the result set in a ResultSet object. This method should be used only for SQL
-     * statements that return a result set; any other result will cause an exception.
-     * 
-     * @return ResultSet object that results in the execution of this statement
-     * @throws SQLException
-     *             if there is an error executing
-     */
-    public ResultSet executeQuery() throws SQLException {
-    	if (isUpdateSql(prepareSql)) {
-    		throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.no_result_set")); //$NON-NLS-1$
+    @Override
+    public boolean execute() throws SQLException {
+        executeSql(new String[] {this.prepareSql}, false, null);
+        return hasResultSet();
+    }
+    
+    @Override
+    public int[] executeBatch() throws SQLException {
+    	if (batchParameterList == null || batchParameterList.isEmpty()) {
+   	     	return new int[0];
     	}
-    	
-        internalExecuteQuery();
-        
-        if (!hasResultSet()) {
-        	throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.no_result_set")); //$NON-NLS-1$
-        }
+	   	try{
+	   		executeSql(new String[] {this.prepareSql}, true, false);
+	   	}finally{
+	   		batchParameterList.clear();
+	   	}
+	   	return this.updateCounts;
+    }
 
+    @Override
+    public ResultSet executeQuery() throws SQLException {
+        executeSql(new String[] {this.prepareSql}, false, true);
         return resultSet;
     }
 
-	private void internalExecuteQuery() throws SQLException, MMSQLException {
-		checkStatement();
-
-        // See NOTE1
-        resetExecutionState();
-
-        processQueryMessage(internalExecute(new String[] {prepareSql}, false));
-
-        // handle exception
-        MMSQLException ex = getException();
-        if ( ex == null && resultSet == null ) {
-            if ( commandStatus == TIMED_OUT ) {
-                String msg = JDBCPlugin.Util.getString("MMStatement.Timeout_before_execute"); //$NON-NLS-1$
-                setException(new MMSQLException(msg));
-            } else if ( commandStatus == CANCELLED ) {
-                String msg = JDBCPlugin.Util.getString("MMStatement.Cancel_before_execute"); //$NON-NLS-1$
-                setException(new MMSQLException(msg));
-            }
-        }
-
-        ex = getException();
-        if(ex != null) {
-            clearParameters();
-            throw ex;
-        }
-
-        logger.info(JDBCPlugin.Util.getString("MMStatement.Success_query", prepareSql)); //$NON-NLS-1$
-	}
-    
-    private void processUpdateMessage(ResultsMessage resultsMsg) throws SQLException {
-        // get results from ResultsMessage
-        MetaMatrixException resultsExp = resultsMsg.getException();
-        // warnings thrown
-        List resultsWarning = resultsMsg.getWarnings();
-
-        MMPreparedStatement.this.setAnalysisInfo(resultsMsg);
-
-        if (resultsExp != null) {
-            setException(resultsExp);
-        } else {
-            // save warnings if have any
-            if (resultsWarning != null) {
-                accumulateWarnings(resultsWarning);
-            }
-            // wrap results into ResultSet, only one update count
-            resultSet = new MMResultSet(resultsMsg, this);
-        }
-    }
-
-    /**
-     * <p>Executes an SQL INSERT, UPDATE or DELETE statement and returns the number
-     * of rows that were affected.
-     * @return int value that results in the execution of this statement
-     */
+    @Override
     public int executeUpdate() throws SQLException {
-    	executeUpdate(false);
-    	return super.getUpdateCount();
+        executeSql(new String[] {this.prepareSql}, false, false);
+        return this.updateCounts[0];
     }
     
-    private void executeUpdate(boolean isBatchedUpdate) throws SQLException {
-        //Check to see the statement is closed and throw an exception
-        checkStatement();
-        if (getMMConnection().isReadOnly()) {
-            throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Operation_Not_Supported", prepareSql)); //$NON-NLS-1$
-        }
-        
-        // See NOTE1
-        resetExecutionState();
-
-        processUpdateMessage(internalExecute(new String[] {prepareSql}, isBatchedUpdate));
-
-        // handle exception
-        MMSQLException ex = getException();
-        if ( ex == null ) {
-            if ( commandStatus == TIMED_OUT ) {
-            	String msg = JDBCPlugin.Util.getString("MMStatement.Timeout_before_execute"); //$NON-NLS-1$
-            	setException(new MMSQLException(msg));
-        	} else if ( commandStatus == CANCELLED ) {
-            	String msg = JDBCPlugin.Util.getString("MMStatement.Cancel_before_execute"); //$NON-NLS-1$
-            	setException(new MMSQLException(msg));
-        	} else if (resultSet.next()) {
-            	try {
-                	if (isBatchedUpdate) {
-                		Object result = resultSet.getObject(1);
-                		if(result instanceof int[]){
-                			updateCounts = (int[])resultSet.getObject(1);
-                		}else{
-                            int commandIndex = 0;
-                            updateCounts = new int[batchParameterList.size()];
-                            do {
-                                updateCounts[commandIndex++] = resultSet.getInt(1);
-                            } while (resultSet.next());
-                		}            		
-                	}else{
-                		rowsAffected = resultSet.getInt(1);
-                	}
-                	logger.info(JDBCPlugin.Util.getString("MMStatement.Success_update", prepareSql)); //$NON-NLS-1$
-	            } catch (SQLException se) {
-        	        setException(MMSQLException.create(se, JDBCPlugin.Util.getString("MMStatement.Err_getting_update_row"))); //$NON-NLS-1$
-            	} finally {
-                	resultSet.close();
-                	resultSet = null;
-            	}
-        	}
-        }
-
-        ex = getException();
-        if(ex != null) {
-            throw MMSQLException.create(ex, JDBCPlugin.Util.getString("MMStatement.Err_update", prepareSql, ex.getMessage())); //$NON-NLS-1$
-        }
+    @Override
+    protected RequestMessage createRequestMessage(String[] commands,
+    		boolean isBatchedCommand, Boolean requiresResultSet)
+    		throws MMSQLException {
+    	RequestMessage message = super.createRequestMessage(commands, false, requiresResultSet);
+    	message.setPreparedStatement(true);
+    	message.setParameterValues(isBatchedCommand?getParameterValuesList(): getParameterValues());
+    	message.setPreparedBatchUpdate(isBatchedCommand);
+    	return message;
     }
 
     /**
@@ -345,13 +223,10 @@
         // check if the statement is open
         checkStatement();
 
-        //if update return null
-        if(SqlUtil.isUpdateSql(this.prepareSql)){
-        	return null;
-        }
-        
         if(metadata == null) {
-            if(resultSet != null) {
+        	if (updateCounts != null) {
+        		return null;
+        	} else if(resultSet != null) {
                 metadata = resultSet.getMetaData();
             } else {
     			MetadataResult results;
@@ -362,6 +237,9 @@
 				} catch (MetaMatrixProcessingException e) {
 					throw MMSQLException.create(e);
 				}
+				if (results.getColumnMetadata() == null) {
+					return null;
+				}
                 StaticMetadataProvider provider = StaticMetadataProvider.createWithData(results.getColumnMetadata(), results.getParameterCount());
                 metadata = ResultsMetadataWithProvider.newInstance(provider);
             }
@@ -754,20 +632,6 @@
         setObject(parameterIndex, x);
     }
 
-    /**
-     * Internal Execution method.
-     * @param sql Request Message's sql.
-     * @param listener Message Listener
-     * @throws SQLException thrown when fail to create the {@link AllResultsImpl}
-     */
-    protected ResultsMessage internalExecute(String[] commands, boolean isPreparedBatchUpdate) throws SQLException  {
-        try {
-        	return sendRequestMessageAndWait(commands, true, false, isPreparedBatchUpdate? getParameterValuesList(): getParameterValues(), false, isPreparedBatchUpdate);
-        } catch ( Throwable ex ) {
-            throw MMSQLException.create(ex, JDBCPlugin.Util.getString("MMStatement.Error_executing_stmt", commands[0])); //$NON-NLS-1$
-        }
-    }
-
     List getParameterValuesList() {
     	if(batchParameterList == null || batchParameterList.isEmpty()){
     		return Collections.EMPTY_LIST;
@@ -797,18 +661,6 @@
         this.serverCalendar = serverCalendar;
     }
 
-    public int[] executeBatch() throws SQLException {
-    	if (batchParameterList == null || batchParameterList.isEmpty()) {
-    	     return new int[0];
-    	}
-    	try{
-    	 	executeUpdate(true);
-    	}finally{
-    		batchParameterList.clear();
-    	}
-    	return updateCounts;
-    }
-    
 	public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
 		setObject(parameterIndex, xmlObject);
 	}

Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -768,7 +768,6 @@
 	 * @return fetch direction for this ResultSet. This cannot be set and is
 	 * 	alwayd FETCH_FORWARD.
 	 * @throws SQLException
-	 * 		, should never occur
 	 */
 	public int getFetchDirection() throws SQLException {
 		checkClosed(); // check to see if the ResultSet is closed
@@ -1072,10 +1071,9 @@
 	 * 
 	 * @return A boolean value showing if the lastvalue read in was null or not.
 	 * @throws SQLException
-	 * 		, should never occur
 	 */
 	public boolean wasNull() throws SQLException {
-
+		
 		checkClosed(); // check to see if the ResultSet is closed
 
 		return currentValue == null;
@@ -1106,7 +1104,6 @@
 	 * 
 	 * @return The requestID for the query that created these results
 	 * @throws SQLException
-	 * 		This should never occur.
 	 */
 	public String getCursorName() throws SQLException {
 		return null;

Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -53,7 +53,6 @@
 import com.metamatrix.api.exception.MetaMatrixProcessingException;
 import com.metamatrix.common.comm.exception.CommunicationException;
 import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.common.util.SqlUtil;
 import com.metamatrix.dqp.client.ClientSideDQP;
 import com.metamatrix.dqp.message.ParameterInfo;
 import com.metamatrix.dqp.message.RequestMessage;
@@ -127,15 +126,9 @@
     // the last query annotations
     private List annotations;
 
-    // updateCount generated by execute methods on the statement
-    protected int rowsAffected;
-
     // resultSet object produced by execute methods on the statement.
     protected MMResultSet resultSet;
 
-    // exception by metamatrix server, may also thrown by partial mode
-    private MMSQLException serverException;
-
     private List<Exception> serverWarnings;
 
     // the per-execution security payload
@@ -216,18 +209,16 @@
         this.currentPlanDescription = null;
         this.debugLog = null;
         this.annotations = null;
-        this.rowsAffected = -1;
 
         if ( this.resultSet != null ) {
             this.resultSet.close();
             this.resultSet = null;
         }
 
-        this.serverException = null;
         this.serverWarnings = null;
         
         this.batchedUpdates = null;
-        updateCounts = null;
+        this.updateCounts = null;
         this.outParamIndexMap.clear();
     }
 
@@ -330,209 +321,141 @@
         }
     }
 
-    /**
-     * This method can be used by the PreparedStatement and CallableStatement classes
-     * to set the exception obtained by the server.
-     * @param exception The exception from the server
-     */
-    protected void setException(Throwable exception) {
-        if(exception == null) {
-            return;
-        }
-        serverException = MMSQLException.create(exception);
-        logger.log(Level.SEVERE, serverException.getMessage(), exception);
-    }
-
-    protected MMSQLException getException() {
-        return this.serverException;
-    }
-
-    /**
-     * <p>Execute a sql statement that may return one or more result sets, one or more
-     * update counts or any combination of those. This method returns a single result
-     * or update count for now.</p>
-     * @param sql statement to execute
-     * @return true if execution results in a ResultSet else false
-     * @throws SQLException as there is an error while executing the sql
-     */
+    @Override
     public boolean execute(String sql) throws SQLException {
-        //Check to see the statement is closed and throw an exception
-        checkStatement();
-
-        if(isUpdateSql(sql)) {
-            executeUpdate(sql);
-        } else {
-        	executeSql(new String[] {sql}, false);
-        }
-
+        executeSql(new String[] {sql}, false, null);
         return hasResultSet();
     }
     
-    protected boolean hasResultSet() throws SQLException {
-        return resultSet != null && resultSet.getMetaData().getColumnCount() > 0;
-    }
-
-    /**
-     * Submits the Statement object's list of commands to metamatrix for execution
-     * as a unit.
-     * @return array of int values indicating update counts
-     * @throws SQLException as this method is not currently supported.
-     */
+    @Override
     public int[] executeBatch() throws SQLException {
         if (batchedUpdates == null || batchedUpdates.isEmpty()) {
             return new int[0];
         }
         String[] commands = (String[])batchedUpdates.toArray(new String[batchedUpdates.size()]);
-        executeSql(commands, true);
-        handleUpdateResults(commands, true);
+        executeSql(commands, true, false);
         return updateCounts;
     }
-    
-    public void handleUpdateResults(String[] commands, boolean isBatched) throws SQLException {
-    	if (resultSet.next()) {
-            try {
-                if (isBatched) {
-                    int commandIndex = 0;
-                    updateCounts = new int[commands.length];
-                    do {
-                        updateCounts[commandIndex++] = resultSet.getInt(1);
-                    } while (resultSet.next());
-                } else {
-                    rowsAffected = resultSet.getInt(1);
-                }
-                String logMsg = JDBCPlugin.Util.getString("MMStatement.Success_update", commands[0]); //$NON-NLS-1$
-                logger.info(logMsg);
-            } catch (SQLException se) {
-                setException(MMSQLException.create(se, JDBCPlugin.Util.getString("MMStatement.Err_getting_update_row"))); //$NON-NLS-1$
-            }
-        }
+
+    @Override
+    public ResultSet executeQuery(String sql) throws SQLException {
+        executeSql(new String[] {sql}, false, true);
+        return resultSet;
     }
 
-    protected void processQueryMessage(ResultsMessage resultsMsg) throws SQLException {
+    @Override
+    public int executeUpdate(String sql) throws SQLException {
+        String[] commands = new String[] {sql};
+        executeSql(commands, false, false);
+        return this.updateCounts[0];
+    }
+
+    protected boolean hasResultSet() throws SQLException {
+        return resultSet != null && resultSet.getMetaData().getColumnCount() > 0;
+    }
+    
+	protected void createResultSet(ResultsMessage resultsMsg) throws SQLException {
+		//create out/return parameter index map if there is any
+		List listOfParameters = resultsMsg.getParameters();
+		if(listOfParameters != null){
+		    //get the size of result set
+		    int resultSetSize = 0;
+		    Iterator iteratorOfParameters = listOfParameters.iterator();
+		    while(iteratorOfParameters.hasNext()){
+		        ParameterInfo parameter = (ParameterInfo)iteratorOfParameters.next();
+		        if(parameter.getType() == ParameterInfo.RESULT_SET){
+		            resultSetSize = parameter.getNumColumns();
+		            //one ResultSet only
+		            break;
+		        }
+		    }
+
+		    //return needs to be the first
+		    int index = 0; //index in user call - {?=call sp(?)}
+		    int count = 0;
+		    iteratorOfParameters = listOfParameters.iterator();
+		    while(iteratorOfParameters.hasNext()){
+		        ParameterInfo parameter = (ParameterInfo)iteratorOfParameters.next();
+		        if(parameter.getType() == ParameterInfo.RETURN_VALUE){
+		            count++;
+		            index++;
+		            outParamIndexMap.put(new Integer(index), new Integer(resultSetSize + count));
+		            break;
+		        }
+		    }
+
+		    iteratorOfParameters = listOfParameters.iterator();
+		    while(iteratorOfParameters.hasNext()){
+		        ParameterInfo parameter = (ParameterInfo)iteratorOfParameters.next();
+		        if(parameter.getType() != ParameterInfo.RETURN_VALUE && parameter.getType() != ParameterInfo.RESULT_SET){
+		            index++;
+		            if(parameter.getType() == ParameterInfo.OUT || parameter.getType() == ParameterInfo.INOUT){
+		                count++;
+		                outParamIndexMap.put(new Integer(index), new Integer(resultSetSize + count));
+		            }
+		        }
+		    }
+		}
+
+		resultSet = new MMResultSet(resultsMsg, this, null, outParamIndexMap.size());
+	}
+    
+    protected void executeSql(String[] commands, boolean isBatchedCommand, Boolean requiresResultSet)
+        throws SQLException, MMSQLException {
+        checkStatement();
+        resetExecutionState();
+        RequestMessage reqMessage = createRequestMessage(commands,
+				isBatchedCommand, requiresResultSet);
+    	ResultsMessage resultsMsg = null;
+        try {
+        	resultsMsg = sendRequestMessageAndWait(reqMessage);
+        } catch ( Throwable ex ) {
+            String msg = JDBCPlugin.Util.getString("MMStatement.Error_executing_stmt", reqMessage.getCommandString()); //$NON-NLS-1$ 
+            logger.log(Level.SEVERE, msg, ex);
+            throw MMSQLException.create(ex, msg);
+        }
+        
         // warnings thrown
         List resultsWarning = resultsMsg.getWarnings();
 
         setAnalysisInfo(resultsMsg);
 
         if (resultsMsg.getException() != null) {
-            setException(resultsMsg.getException());
-            return;
+            throw MMSQLException.create(resultsMsg.getException());
         }
 
         // save warnings if have any
         if (resultsWarning != null) {
             accumulateWarnings(resultsWarning);
         }
-
-      //create out/return parameter index map if there is any
-        List listOfParameters = resultsMsg.getParameters();
-        if(listOfParameters != null){
-            //get the size of result set
-            int resultSetSize = 0;
-            Iterator iteratorOfParameters = listOfParameters.iterator();
-            while(iteratorOfParameters.hasNext()){
-                ParameterInfo parameter = (ParameterInfo)iteratorOfParameters.next();
-                if(parameter.getType() == ParameterInfo.RESULT_SET){
-                    resultSetSize = parameter.getNumColumns();
-                    //one ResultSet only
-                    break;
-                }
+        
+        if (resultsMsg.isUpdateResult()) {
+        	List[] results = resultsMsg.getResults();
+        	this.updateCounts = new int[results.length];
+            for (int i = 0; i < results.length; i++) {
+            	updateCounts[i] = (Integer)results[i].get(0);
             }
-
-            //return needs to be the first
-            int index = 0; //index in user call - {?=call sp(?)}
-            int count = 0;
-            iteratorOfParameters = listOfParameters.iterator();
-            while(iteratorOfParameters.hasNext()){
-                ParameterInfo parameter = (ParameterInfo)iteratorOfParameters.next();
-                if(parameter.getType() == ParameterInfo.RETURN_VALUE){
-                    count++;
-                    index++;
-                    outParamIndexMap.put(new Integer(index), new Integer(resultSetSize + count));
-                    break;
-                }
-            }
-
-            iteratorOfParameters = listOfParameters.iterator();
-            while(iteratorOfParameters.hasNext()){
-                ParameterInfo parameter = (ParameterInfo)iteratorOfParameters.next();
-                if(parameter.getType() != ParameterInfo.RETURN_VALUE && parameter.getType() != ParameterInfo.RESULT_SET){
-                    index++;
-                    if(parameter.getType() == ParameterInfo.OUT || parameter.getType() == ParameterInfo.INOUT){
-                        count++;
-                        outParamIndexMap.put(new Integer(index), new Integer(resultSetSize + count));
-                    }
-                }
-            }
-
+        } else {
+            createResultSet(resultsMsg);
         }
-
-        resultSet = new MMResultSet(resultsMsg, this, null, outParamIndexMap.size());
+        
+        logger.info(JDBCPlugin.Util.getString("MMStatement.Success_query", reqMessage.getCommandString())); //$NON-NLS-1$
     }
 
-	/**
-     * Execute a SQL statement that returns a single ResultSet. This method closes this statement object's current result set if
-     * an open one exists.
-     * 
-     * @param sql
-     *            The SQL query to be executed.
-     * @return ResultSet object.
-     * @throws SQLException
-     *             if there is an error executing the query
-     */
-    public ResultSet executeQuery(String sql) throws SQLException {
-    	if (isUpdateSql(sql)) {
-    		throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.no_result_set")); //$NON-NLS-1$
-    	}
-        executeSql(new String[] {sql}, false);
-        if (!hasResultSet()) {
-    		throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.no_result_set")); //$NON-NLS-1$
-		}
-        return resultSet;
-    }
-
-    public int executeUpdate(String sql) throws SQLException {
-        if (driverConnection.isReadOnly()) {
-            throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Operation_Not_Supported", sql)); //$NON-NLS-1$
+	protected RequestMessage createRequestMessage(String[] commands,
+			boolean isBatchedCommand, Boolean requiresResultSet)
+			throws MMSQLException {
+		if (isBatchedCommand || requiresResultSet == Boolean.FALSE) {
+            throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Operation_Not_Supported", Arrays.asList(commands))); //$NON-NLS-1$
         }
-        String[] commands = new String[] {sql};
-        executeSql(commands, false);
-        handleUpdateResults(commands, false);
-        return rowsAffected;
-    }
+        RequestMessage reqMessage = new RequestMessage();
+    	reqMessage.setCommands(commands);
+    	reqMessage.setBatchedUpdate(isBatchedCommand);
+    	reqMessage.setRequireResultSet(requiresResultSet);
+		return reqMessage;
+	}
 
     /**
-     * Executes one or more SQL commands. 
-     * @param commands an array of commands
-     * @param executionStrategy the execution strategy used to handle the response message
-     * @param isBatchedCommand flag indicating whether the statements are being executed as a batch
-     * @throws SQLException
-     * @throws MMSQLException
-     * @since 4.2
-     */
-    private void executeSql(String[] commands, boolean isBatchedCommand)
-        throws SQLException, MMSQLException {
-        checkStatement();
-        resetExecutionState();
-        
-        processQueryMessage(internalExecute(commands, isBatchedCommand));
-
-        if (serverException == null) {
-        	if (commandStatus == TIMED_OUT) {
-                String msg = JDBCPlugin.Util.getString("MMStatement.Timeout_before_execute"); //$NON-NLS-1$
-                setException(new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Time_out_happened__n_1") + msg));   //$NON-NLS-1$
-            } else if (commandStatus == CANCELLED) {
-                String msg = JDBCPlugin.Util.getString("MMStatement.Cancel_before_execute"); //$NON-NLS-1$
-                setException(new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Statement_is_cancelled__n_2") + msg));  //$NON-NLS-1$
-            } 
-        } else {
-            throw this.serverException;
-        }
-
-        logger.info(JDBCPlugin.Util.getString("MMStatement.Success_query", Arrays.asList(commands))); //$NON-NLS-1$
-    }
-
-    /**
      * Retreives the fetch direction this Statement object set as a performance hint
      * to the driver. The int returned will be one of the following constants from
      * the ResultSet interface: FETCH_FORWARD, FETCH_REVERSE, or FETCH_UNKNOWN.
@@ -588,10 +511,11 @@
         // close any current ResultSet
         if ( resultSet != null ) {
             resultSet.close();
+            resultSet = null;
         }
         // set the existing update count to -1
         // indicating that there are no more results
-        rowsAffected = -1;
+        this.updateCounts = null;
         return false;
     }
 
@@ -681,7 +605,10 @@
      */
     public int getUpdateCount() throws SQLException {
         checkStatement();
-        return rowsAffected;
+        if (this.updateCounts == null) {
+        	return -1;
+        }
+        return this.updateCounts[0];
     }
 
     protected void accumulateWarnings(List<Exception> serverWarnings) {
@@ -783,75 +710,6 @@
         }
     }
 
-    /**
-     * Internal ASynchronous processing by sending request message to Server.
-     * Can be interrupted by a close, cancel, or timeout.
-     * @param reqMsg Request Message
-     * @param newInstance True to find new server instance, false to use existing
-     * @return Message RequestID Message
-     * @throws InterruptedException 
-     * @throws TimeoutException 
-     * @throws CommunicationException 
-     */
-    private ResultsMessage executeAsynchAndWait(RequestMessage reqMsg, long timeout) throws SQLException, InterruptedException, TimeoutException, CommunicationException {
-        reqMsg.setExecutionId(this.currentRequestID);
-    	
-        Future<ResultsMessage> pendingResult = null;
-		try {
-			pendingResult = this.getDQP().executeRequest(this.currentRequestID, reqMsg);
-		} catch (MetaMatrixException e) {
-			throw MMSQLException.create(e);
-		}
-		
-        long endTime = System.currentTimeMillis() + timeout;
-        ResultsMessage result = null;        
-        while (result == null) {
-
-        	if (timeout > 0 && endTime <= System.currentTimeMillis() && commandStatus != TIMED_OUT && commandStatus != CANCELLED) {
-	            timeoutOccurred();
-        	}
-        	
-            checkStatement();
-			try {
-				result = pendingResult.get(SPIN_TIMEOUT, TimeUnit.MILLISECONDS);
-			} catch (ExecutionException e) {
-				throw MMSQLException.create(e);
-			} catch (TimeoutException e) {
-				continue;
-			}
-        }
-        
-    	if (commandStatus == CANCELLED) {
-            throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Cancel_before_execute")); //$NON-NLS-1$
-        }
-    	 
-    	if (commandStatus == TIMED_OUT) {
-            throw new TimeoutException(JDBCPlugin.Util.getString("MMStatement.Timeout_before_complete")); //$NON-NLS-1$
-        }    	
-    	return result;
-    }
-    
-    /**
-     * Internal Execution method.
-     * @param sql Request Message's sql.
-     * @param listener Message Listener
-     * @param isBatchedCommand flag indicating whether the statements are being executed as a batch
-     * @throws SQLException thrown when fail to create the {@link AllResultsImpl}
-     */
-    protected ResultsMessage internalExecute(String[] commands, boolean isBatchedCommand) throws SQLException  {
-
-        try {
-            return sendRequestMessageAndWait(commands, false, false, null, isBatchedCommand, false);
-        } catch ( Throwable ex ) {
-            // logging
-            String msg = JDBCPlugin.Util.getString("MMStatement.Error_executing_stmt", isBatchedCommand ? "" : commands[0]); //$NON-NLS-1$ //$NON-NLS-2$
-            if(driverConnection != null) {
-                logger.log(Level.SEVERE, msg, ex);
-            }
-            throw MMSQLException.create(ex);
-        }
-    }
-
     protected Properties getConnectionProperties() {
         return driverConnection.propInfo;
     }
@@ -971,15 +829,11 @@
      * @throws InterruptedException 
      * @throws CommunicationException 
      */
-    protected ResultsMessage sendRequestMessageAndWait(String[] commands, 
-    		boolean isPreparedStatement, boolean isCallableStatement, List paramValues, boolean isBatchedCommand, boolean isPreparedBatchUpdate)
+    protected ResultsMessage sendRequestMessageAndWait(RequestMessage reqMsg)
         throws SQLException, InterruptedException, TimeoutException, CommunicationException {
         
         this.currentRequestID = this.driverConnection.nextRequestID();
-        RequestMessage reqMsg = new RequestMessage();        
         // Create a request message
-    	reqMsg.setCommands(commands);
-    	reqMsg.setBatchedUpdate(isBatchedCommand);
         reqMsg.markSubmissionStart();        
         reqMsg.setExecutionPayload(this.payload);        
         reqMsg.setDoubleQuotedVariableAllowed(Boolean.valueOf(
@@ -991,15 +845,6 @@
             reqMsg.setShowPlan(true);
         }
 
-        if (isPreparedStatement) {
-            reqMsg.setPreparedStatement(true);
-            reqMsg.setParameterValues(paramValues);
-        } else if (isCallableStatement) {
-            reqMsg.setCallableStatement(true);
-            reqMsg.setParameterValues(paramValues);
-        }
-
-        reqMsg.setPreparedBatchUpdate(isPreparedBatchUpdate);
         reqMsg.setFetchSize(getFetchSize());
         reqMsg.setStyleSheet(this.styleSheet);
         reqMsg.setRowLimit(this.maxRows);
@@ -1007,7 +852,41 @@
         // Get connection properties and set them onto request message
         copyPropertiesToRequest(reqMsg, getConnectionProperties());
 
-        return executeAsynchAndWait(reqMsg, this.queryTimeout*1000);
+        reqMsg.setExecutionId(this.currentRequestID);
+    	
+        Future<ResultsMessage> pendingResult = null;
+		try {
+			pendingResult = this.getDQP().executeRequest(this.currentRequestID, reqMsg);
+		} catch (MetaMatrixException e) {
+			throw MMSQLException.create(e);
+		}
+		long timeoutMillis = queryTimeout * 1000;
+        long endTime = System.currentTimeMillis() + timeoutMillis;
+        ResultsMessage result = null;        
+        while (result == null) {
+
+        	if (timeoutMillis > 0 && endTime <= System.currentTimeMillis() && commandStatus != TIMED_OUT && commandStatus != CANCELLED) {
+	            timeoutOccurred();
+        	}
+        	
+            checkStatement();
+			try {
+				result = pendingResult.get(SPIN_TIMEOUT, TimeUnit.MILLISECONDS);
+			} catch (ExecutionException e) {
+				throw MMSQLException.create(e);
+			} catch (TimeoutException e) {
+				continue;
+			}
+        }
+        
+    	if (commandStatus == CANCELLED) {
+            throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Cancel_before_execute")); //$NON-NLS-1$
+        }
+    	 
+    	if (commandStatus == TIMED_OUT) {
+            throw new TimeoutException(JDBCPlugin.Util.getString("MMStatement.Timeout_before_complete")); //$NON-NLS-1$
+        }    	
+    	return result;
     }
 
     long getCurrentRequestID() {
@@ -1122,18 +1001,6 @@
         return this.isClosed;
     }
 
-    /**
-     * Determines whether a sql statement is an update (INSERT, UPDATE, or DELETE).
-     * Throws exception if SQL statement appears to be invalid (because it's null, has
-     * 0 length, etc.
-     */
-    protected boolean isUpdateSql(String sql) throws SQLException {
-    	if (sql == null || sql.length() == 0) {
-            throw new MMSQLException(JDBCPlugin.Util.getString("MMStatement.Invalid_query_type", sql)); //$NON-NLS-1$
-        }
-    	return SqlUtil.isUpdateSql(sql);
-    }
-
 	protected void setAnalysisInfo(ResultsMessage resultsMsg) {
         this.debugLog = resultsMsg.getDebugLog();
         this.currentPlanDescription = resultsMsg.getPlanDescription();

Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResultsImpl.java
===================================================================
--- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResultsImpl.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResultsImpl.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -22,10 +22,7 @@
 
 package com.metamatrix.jdbc;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.stub;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -43,10 +40,12 @@
 
 import com.metamatrix.api.exception.MetaMatrixProcessingException;
 import com.metamatrix.common.types.MMJDBCSQLTypeInfo;
+import com.metamatrix.common.util.TimestampWithTimezone;
 import com.metamatrix.dqp.client.ClientSideDQP;
 import com.metamatrix.dqp.client.ResultsFuture;
 import com.metamatrix.dqp.message.RequestMessage;
 import com.metamatrix.dqp.message.ResultsMessage;
+import com.metamatrix.query.unittest.TimestampUtil;
 
 public class TestAllResultsImpl extends TestCase {
 
@@ -800,15 +799,15 @@
 	}
 
 	// /////////////////////Helper Method///////////////////
-	static List[] exampleResults1(int length) {
+	static List<Object>[] exampleResults1(int length) {
 		return exampleResults1(length, 1);
 	}
 	
-	static List[] exampleResults1(int length, int begin) {
-		List[] results = new List[length];
+	static List<Object>[] exampleResults1(int length, int begin) {
+		List<Object>[] results = new List[length];
 
 		for (int i = 0; i < results.length; i++) {
-			results[i] = new ArrayList();
+			results[i] = new ArrayList<Object>();
 			results[i].add(new Integer(begin + i));
 		}
 
@@ -858,14 +857,16 @@
 
 	/** without metadata info. */
 	private ResultsMessage exampleResultsMsg1() {
+		return exampleMessage(exampleResults1(5), new String[] { "IntNum" }, new String[] { MMJDBCSQLTypeInfo.INTEGER }); //$NON-NLS-1$
+	}
+	
+	private ResultsMessage exampleMessage(List<Object>[] results, String[] columnNames, String[] datatypes) {
 		RequestMessage request = new RequestMessage();
 		request.setExecutionId(REQUEST_ID);
 		ResultsMessage resultsMsg = new ResultsMessage(request);
-		List[] results = exampleResults1(5);
 		resultsMsg.setResults(results);
-		resultsMsg.setColumnNames(new String[] { "IntNum" }); //$NON-NLS-1$
-		resultsMsg.setDataTypes(new String[] { MMJDBCSQLTypeInfo.INTEGER }); 
-		resultsMsg.setPartialResults(false);
+		resultsMsg.setColumnNames(columnNames);
+		resultsMsg.setDataTypes(datatypes); 
 		resultsMsg.setFinalRow(results.length);
 		resultsMsg.setLastRow(results.length);
 		resultsMsg.setFirstRow(1);
@@ -876,22 +877,7 @@
 
 	/** without metadata info. */
 	private ResultsMessage exampleResultsMsg2() {
-		RequestMessage request = new RequestMessage();
-		request.setExecutionId(REQUEST_ID);
-		ResultsMessage resultsMsg = new ResultsMessage(request);
-		List[] results = exampleResults2();
-		resultsMsg.setResults(results);
-		resultsMsg.setColumnNames(new String[] { "IntNum", "StringNum" }); //$NON-NLS-1$ //$NON-NLS-2$
-		resultsMsg.setDataTypes(new String[] { MMJDBCSQLTypeInfo.INTEGER,
-				MMJDBCSQLTypeInfo.STRING });
-		resultsMsg.setPartialResults(false);
-		resultsMsg.setFinalRow(results.length);
-		resultsMsg.setLastRow(results.length);
-		resultsMsg.setFirstRow(1);
-		resultsMsg.setFetchSize(500);
-		resultsMsg.setCursorType(TYPE_SCROLL_INSENSITIVE);
-
-		return resultsMsg;
+		return exampleMessage(exampleResults2(), new String[] { "IntNum", "StringNum" }, new String[] { MMJDBCSQLTypeInfo.INTEGER, MMJDBCSQLTypeInfo.STRING }); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/** with limited metadata info. */
@@ -902,7 +888,6 @@
 		resultsMsg.setColumnNames(columnNames());
 
 		resultsMsg.setResults(results);
-		resultsMsg.setPartialResults(false);
 		resultsMsg.setFinalRow(results.length);
 		resultsMsg.setLastRow(results.length);
 		resultsMsg.setFirstRow(1);
@@ -914,22 +899,7 @@
 
 	/** no rows. */
 	private ResultsMessage exampleResultsMsg3() {
-		List[] results = new List[0];
-		RequestMessage request = new RequestMessage();
-		request.setExecutionId(REQUEST_ID);
-		ResultsMessage resultsMsg = new ResultsMessage(request);
-		resultsMsg.setResults(results);
-		resultsMsg.setColumnNames(new String[] { "IntNum", "StringNum" }); //$NON-NLS-1$ //$NON-NLS-2$
-		resultsMsg.setDataTypes(new String[] { MMJDBCSQLTypeInfo.INTEGER,
-				MMJDBCSQLTypeInfo.STRING });
-		resultsMsg.setPartialResults(false);
-		resultsMsg.setFinalRow(0);
-		resultsMsg.setLastRow(0);
-		resultsMsg.setFirstRow(1);
-		resultsMsg.setFetchSize(500);
-		resultsMsg.setCursorType(TYPE_SCROLL_INSENSITIVE);
-
-		return resultsMsg;
+		return exampleMessage(new List[0], new String[] { "IntNum", "StringNum" }, new String[] { MMJDBCSQLTypeInfo.INTEGER, MMJDBCSQLTypeInfo.STRING }); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 	private static ResultsMessage exampleResultsMsg4(int begin, int length, int fetchSize, boolean lastBatch) {
@@ -988,5 +958,60 @@
 		//will be the same as the original
 		assertEquals(new Timestamp(0), rs.getTimestamp(1, Calendar.getInstance(TimeZone.getTimeZone("GMT-05:00")))); //$NON-NLS-1$
 	}
+	
+	public void testWasNull() throws SQLException{
+		ResultsMessage message = exampleMessage(new List[] { Arrays.asList((String)null), Arrays.asList("1") }, new String[] { "string" }, //$NON-NLS-1$ //$NON-NLS-1$
+				new String[] { MMJDBCSQLTypeInfo.STRING });
+		MMResultSet rs = new MMResultSet(message, statement);
+		assertTrue(rs.next());
+		assertEquals(Boolean.FALSE.booleanValue(), rs.getBoolean(1));
+		assertTrue(rs.wasNull());
+		assertEquals(0, rs.getShort(1));
+		assertTrue(rs.wasNull());
+		assertEquals(0, rs.getInt(1));
+		assertTrue(rs.wasNull());
+		assertEquals(0l, rs.getLong(1));
+		assertTrue(rs.wasNull());
+		assertEquals(0f, rs.getFloat(1));
+		assertTrue(rs.wasNull());		
+		assertEquals(0d, rs.getDouble(1));
+		assertTrue(rs.wasNull());
+		assertNull(rs.getString(1));
+		assertTrue(rs.wasNull());
+		assertTrue(rs.next());
+		assertEquals(1, rs.getShort(1));
+		assertFalse(rs.wasNull());
+		assertFalse(rs.next());
+	}
+	
+	public void testGetters() throws SQLException{
+		TimeZone.setDefault(TimeZone.getTimeZone("GMT-05:00")); //$NON-NLS-1$
+		ResultsMessage message = exampleMessage(new List[] { Arrays.asList(1, TimestampUtil.createTime(0, 0, 0), TimestampUtil.createDate(1, 1, 1), TimestampUtil.createTimestamp(1, 1, 1, 1, 1, 1, 1), "<root/>") }, //$NON-NLS-1$ 
+				new String[] { "int", "time", "date", "timestamp", "sqlxml" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ 
+				new String[] { MMJDBCSQLTypeInfo.INTEGER, MMJDBCSQLTypeInfo.TIME, MMJDBCSQLTypeInfo.DATE, MMJDBCSQLTypeInfo.TIMESTAMP, MMJDBCSQLTypeInfo.STRING });
+		TimestampWithTimezone.resetCalendar(TimeZone.getTimeZone("GMT-06:00")); //$NON-NLS-1$
+		MMResultSet rs = new MMResultSet(message, statement);
+		assertTrue(rs.next());
+		assertEquals(Boolean.TRUE.booleanValue(), rs.getBoolean(1));
+		assertEquals(1, rs.getShort(1));
+		assertEquals(1, rs.getInt(1));
+		assertEquals(1l, rs.getLong(1));
+		assertEquals(1f, rs.getFloat(1));
+		assertEquals(1d, rs.getDouble(1));
+		assertEquals("1", rs.getString(1)); //$NON-NLS-1$
+		assertEquals(Integer.valueOf(1), rs.getObject(1)); 
+		//the mock statement is in GMT-6 the server results are from GMT-5, so we expect them to display the same
+		assertEquals(TimestampUtil.createTime(0, 0, 0), rs.getTime(2)); 
+		assertEquals(TimestampUtil.createDate(1, 1, 1), rs.getDate(3));
+		assertEquals(TimestampUtil.createTimestamp(1, 1, 1, 1, 1, 1, 1), rs.getTimestamp(4));
+		assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><root/>", rs.getSQLXML(5).getString()); //$NON-NLS-1$
+		try {
+			rs.getSQLXML(1);
+		} catch (SQLException e) {
+			assertEquals("Unable to transform the column value 1 to a SQLXML.", e.getMessage()); //$NON-NLS-1$
+		}
+		assertFalse(rs.next());
+		TimestampWithTimezone.resetCalendar(null);
+	}
 
 }

Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMCallableStatement.java
===================================================================
--- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMCallableStatement.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMCallableStatement.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -74,7 +74,7 @@
 		resultsMsg.setLastRow(results.length);
 		resultsMsg.setFirstRow(1);
 		resultsMsg.setParameters(Arrays.asList(new ParameterInfo(ParameterInfo.RESULT_SET, 1), new ParameterInfo(ParameterInfo.OUT, 1), new ParameterInfo(ParameterInfo.OUT, 1)));
-		mmcs.processQueryMessage(resultsMsg);
+		mmcs.createResultSet(resultsMsg);
 		assertEquals(1, mmcs.getInt(1));
 		assertEquals(2, mmcs.getInt(2));
 	}

Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.java
===================================================================
--- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -22,8 +22,7 @@
 
 package com.metamatrix.jdbc;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.stub;
+import static org.mockito.Mockito.*;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -38,7 +37,6 @@
 import junit.framework.TestCase;
 
 import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.core.log.Logger;
 import com.metamatrix.dqp.client.ClientSideDQP;
 
 public class TestMMResultSet extends TestCase {

Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java
===================================================================
--- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -23,13 +23,14 @@
 package com.metamatrix.jdbc.api;
 
 
+import static org.junit.Assert.*;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import java.sql.CallableStatement;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -37,11 +38,10 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import junit.extensions.TestSetup;
 import junit.framework.Assert;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
+import org.junit.After;
+
 import com.metamatrix.admin.api.core.Admin;
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.EmbeddedDriver;
@@ -55,52 +55,22 @@
  * integration testing. Just like the scripted one this one should provide all
  * those required flexibility in testing.
  */
-public class AbstractMMQueryTestCase extends TestCase {
+public class AbstractMMQueryTestCase {
 	
 	static {
 		new EmbeddedDriver();
 	}
 	
-	public interface ConnectionFactory {
-		
-		com.metamatrix.jdbc.api.Connection createSingleConnection() throws Exception;
-	}
-    
     protected com.metamatrix.jdbc.api.Connection internalConnection = null;
-    protected static com.metamatrix.jdbc.api.Connection SINGLE_CONNECTION;
     protected ResultSet internalResultSet = null;
     protected Statement internalStatement = null;
+    protected int updateCount = -1;
     protected String DELIMITER = "    "; //$NON-NLS-1$ 
     
-    public AbstractMMQueryTestCase() {
+    @After public void tearDown() throws Exception {
+    	closeConnection();
     }
     
-    public AbstractMMQueryTestCase(String name) {
-    	super(name);
-    }
-    
-    @Override
-    protected void setUp() throws Exception {
-    	if (SINGLE_CONNECTION != null) {
-    		this.internalConnection = SINGLE_CONNECTION;
-    	}
-    }
-    
-    public static TestSetup createOnceRunSuite(TestSuite suite, final ConnectionFactory factory) {
-		TestSetup wrapper = new TestSetup(suite) {
-			@Override
-			protected void setUp() throws Exception {
-				SINGLE_CONNECTION = factory.createSingleConnection();
-			}
-			@Override
-			protected void tearDown() throws Exception {
-				SINGLE_CONNECTION.close();
-				SINGLE_CONNECTION = null;
-			}
-		};
-		return wrapper;
-	}
-          
     public com.metamatrix.jdbc.api.Connection getConnection(String vdb){
         String propsFile = UnitTestUtil.getTestDataPath()+"/mmquery/mm.properties"; //$NON-NLS-1$
         return getConnection(vdb, propsFile);
@@ -120,6 +90,9 @@
     }
     
     public com.metamatrix.jdbc.api.Connection getConnection(String vdb, String propsFile, String addtionalStuff){
+    	closeResultSet();
+    	closeStatement();
+    	closeConnection();
         try {
 			this.internalConnection = createConnection(vdb, propsFile, addtionalStuff);
 		} catch (SQLException e) {
@@ -132,64 +105,43 @@
         String url = "jdbc:metamatrix:"+vdb+"@" + propsFile+addtionalStuff; //$NON-NLS-1$ //$NON-NLS-2$
         return (com.metamatrix.jdbc.api.Connection)DriverManager.getConnection(url); 
     }    
-    
-    
-    public ResultSet execute(String sql) {
+        
+    public boolean execute(String sql) {
         return execute(sql, new Object[] {});
     }
     
-    public ResultSet execute(String sql, Object[] params) {
+    public boolean execute(String sql, Object[] params) {
+    	closeResultSet();
+    	closeStatement();
+    	this.updateCount = -1;
         try {
             assertNotNull(this.internalConnection);
             assertTrue(!this.internalConnection.isClosed());
-            
-            if (sql.indexOf("?") != -1) { //$NON-NLS-1$
-                executePreparedStatement(sql, params);
+            boolean result = false;
+            if (params != null) {
+            	if (sql.startsWith("exec ")) { //$NON-NLS-1$
+                    sql = sql.substring(5);
+	                this.internalStatement = this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$
+                } else {
+                	this.internalStatement = this.internalConnection.prepareStatement(sql);
+                }
+                setParameters((PreparedStatement)this.internalStatement, params);
+                result = ((PreparedStatement)this.internalStatement).execute();
+            } else {
+	            this.internalStatement = this.internalConnection.createStatement();
+	            result = this.internalStatement.execute(sql);
             }
-            
-            this.internalStatement = this.internalConnection.createStatement();
-            this.internalResultSet = this.internalStatement.executeQuery(sql);
-            return this.internalResultSet;
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }        
-    }
-    
-    public ResultSet executePreparedStatement(String sql, Object[] params) {
-        try {
-            assertNotNull(this.internalConnection);
-            assertTrue(!this.internalConnection.isClosed());
-            
-            if (sql.startsWith("exec ")) { //$NON-NLS-1$
-                executeStoredProcedure(sql, params);
+            if (result) {
+            	this.internalResultSet = this.internalStatement.getResultSet();
+            } else {
+            	this.updateCount = this.internalStatement.getUpdateCount();
             }
-            
-            this.internalStatement = this.internalConnection.prepareStatement(sql);
-            setParameters((PreparedStatement)this.internalStatement, params);
-            this.internalResultSet = ((PreparedStatement)this.internalStatement).executeQuery();
-            return this.internalResultSet;
+            return result;
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }        
-    }    
-    
-    public ResultSet executeStoredProcedure(String sql, Object[] params) {
-        try {
-            assertNotNull(this.internalConnection);
-            assertTrue(!this.internalConnection.isClosed());
-
-            if (sql.startsWith("exec ")) { //$NON-NLS-1$
-                sql = sql.substring(5);
-            }
-            this.internalStatement = this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$
-            setParameters((CallableStatement)this.internalStatement, params);
-            this.internalResultSet = ((CallableStatement)this.internalStatement).executeQuery();
-            return this.internalResultSet;                        
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }        
     }
-    
+            
     private void setParameters(PreparedStatement stmt, Object[] params) throws SQLException{
         for (int i = 0; i < params.length; i++) {
             stmt.setObject(i+1, params[i]);
@@ -275,7 +227,7 @@
         }
     }
     
-    public void assertEquals(Reader expected, Reader reader) {
+    public void assertReaderEquals(Reader expected, Reader reader) {
         
         BufferedReader  resultReader = null;
         BufferedReader  expectedReader = null;        
@@ -424,8 +376,11 @@
             throw new RuntimeException(e);
         }        
     }
+    
+    public void assertUpdateCount(int expected) {
+    	assertEquals(expected, updateCount);
+    }
 
-
     public void assertRowCount(int expected) {
         int count = getRowCount();
         assertEquals(expected, count);
@@ -471,13 +426,16 @@
 
     public void closeConnection() {
         closeStatement();
-        if (this.internalConnection != null) {
-            try {
-                this.internalConnection.close();
-                this.internalConnection = null;
-            } catch(SQLException e) {
-            	throw new RuntimeException(e);
-            }
+        try {
+	        if (this.internalConnection != null) {
+	            try {
+	                this.internalConnection.close();
+	            } catch(SQLException e) {
+	            	throw new RuntimeException(e);
+	            }
+	        }
+        } finally {
+            this.internalConnection = null;
         }
     }
     

Copied: trunk/common-core/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java (from rev 611, trunk/engine/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java)
===================================================================
--- trunk/common-core/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java	                        (rev 0)
+++ trunk/common-core/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+/*
+ * Date: Jun 16, 2004
+ * Time: 1:47:51 PM
+ */
+package com.metamatrix.query.unittest;
+
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.TimeZone;
+
+/**
+ * TimestampUtil
+ *
+ * <p>Allows creation of <code>java.sql.Timestamp</code>, <code>java.sql.Date</code>, <code>java.sql.Time</code>
+ * by specifying year, month, day, etc. without deprecation errors.</p>
+ */
+public class TimestampUtil {
+
+    private static ThreadLocal<Calendar> CAL = new ThreadLocal<Calendar>() {
+    	@Override
+    	protected Calendar initialValue() {
+    		return Calendar.getInstance();
+    	}
+    };
+
+    /**
+     * Replaces deprecated <code>java.sql.Timestamp</code> constructor.
+     *
+     * @param year   year-1900
+     * @param month  0 to 11
+     * @param date   1 to 31
+     * @param hour   0 to 23
+     * @param minute 0 to 59
+     * @param second 0 to 59
+     * @param nano   0 to 999,999,999
+     * @see java.sql.Timestamp
+     * @return A <code>Timestamp</code>
+     */
+    public static Timestamp createTimestamp(int year, int month, int date, int hour, int minute, int second, int nano) {
+        primeCalendar();
+        CAL.get().set(year + 1900, month, date, hour, minute, second);
+        long millis = CAL.get().getTime().getTime();
+        Timestamp ts = new Timestamp(millis);
+        ts.setNanos(nano);
+        return ts;
+    }
+
+    /**
+     * Replaces deprecated <code>java.sql.Date</code> constructor.
+     *
+     * @param   year    the year minus 1900.
+     * @param   month   the month between 0-11.
+     * @param   date    the day of the month between 1-31.
+     * @see java.sql.Date
+     * @return A <code>Date</code>
+     */
+   public static Date createDate(int year, int month, int date) {
+        primeCalendar();
+        CAL.get().set(year + 1900, month, date);
+        return new Date(CAL.get().getTime().getTime());
+   }
+
+    /**
+     * Replaces deprecated <code>java.sql.Time</code> constructor.
+     *
+     * @param hour 0 to 23
+     * @param minute 0 to 59
+     * @param second 0 to 59
+     * @see java.sql.Time
+     * @return A <code>Time</code>
+     */
+    public static Time createTime(int hour, int minute, int second) {
+        primeCalendar();
+        CAL.get().set(Calendar.HOUR_OF_DAY, hour);
+        CAL.get().set(Calendar.MINUTE, minute);
+        CAL.get().set(Calendar.SECOND, second);
+        return new Time(CAL.get().getTime().getTime());
+    }
+
+    private static void primeCalendar() {
+        CAL.get().setTimeZone(TimeZone.getDefault());
+        CAL.get().clear();
+    }
+
+}


Property changes on: trunk/common-core/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -208,7 +208,7 @@
             IFunction function = (IFunction) expression;
             String key = function.getName().toLowerCase();        
             if(functionModifiers.containsKey(key)) {
-                FunctionModifier modifier = (FunctionModifier) functionModifiers.get(key);
+                FunctionModifier modifier = functionModifiers.get(key);
                 
                 // Modify function and return it
                 return modifier.modify(function);                                        

Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -84,6 +84,7 @@
     private static final int TIMESTAMP_CODE = 8;
     private static final int BLOB_CODE = 9;
     private static final int CLOB_CODE = 10;
+    private static final int BOOLEAN_CODE = 11;
     
     static {
         TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.INTEGER, new Integer(INTEGER_CODE));
@@ -97,6 +98,8 @@
         TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.TIMESTAMP, new Integer(TIMESTAMP_CODE));
         TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.BLOB, new Integer(BLOB_CODE));
         TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.CLOB, new Integer(CLOB_CODE));
+        TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.BOOLEAN, new Integer(BOOLEAN_CODE));
+        TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.BYTE, new Integer(SHORT_CODE));
     }
 	
     private static final ThreadLocal<MessageFormat> COMMENT = new ThreadLocal<MessageFormat>() {
@@ -562,7 +565,7 @@
 	 * @return
 	 * @throws SQLException
 	 */
-    public Object retrieveValue(ResultSet results, int columnIndex, Class expectedType) throws SQLException {
+    public Object retrieveValue(ResultSet results, int columnIndex, Class<?> expectedType) throws SQLException {
         Integer code = TYPE_CODE_MAP.get(expectedType);
         if(code != null) {
             // Calling the specific methods here is more likely to get uniform (and fast) results from different
@@ -633,7 +636,10 @@
     					// ignore
     				}
     				break;
-    			}    
+    			}  
+    			case BOOLEAN_CODE: {
+    				return results.getBoolean(columnIndex);
+    			}
             }
         }
 
@@ -713,6 +719,9 @@
     					// ignore
     				}
     			}
+    			case BOOLEAN_CODE: {
+    				return results.getBoolean(parameterIndex);
+    			}
             }
         }
 

Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java
===================================================================
--- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -30,7 +30,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
@@ -69,7 +68,7 @@
         
     // Execution state
     private Random randomNumber = new Random(System.currentTimeMillis());
-    private List row;
+    private List<Object> row;
     private boolean waited = false;
     private int rowsReturned = 0;
     private boolean asynch = false;
@@ -83,7 +82,7 @@
     }
     
     @Override
-    public List next() throws ConnectorException, DataNotAvailableException {
+    public List<?> next() throws ConnectorException, DataNotAvailableException {
         // Wait on first batch if necessary
         if(waitTime > 0 && !waited) {
             // Wait a random amount of time up to waitTime milliseconds
@@ -119,7 +118,7 @@
     @Override
     public void execute() throws ConnectorException {
         // Get poll interval
-        String pollIntervalString = env.getProperties().getProperty(LoopbackProperties.POLL_INTERVAL);              //$NON-NLS-1$
+        String pollIntervalString = env.getProperties().getProperty(LoopbackProperties.POLL_INTERVAL);            
         if (pollIntervalString != null) {
         	asynch = true;
 	        try {
@@ -164,7 +163,7 @@
         
         // Prepare for execution
         List types = determineOutputTypes(this.command);
-        this.row = createDummyRow(types);        
+        createDummyRow(types);        
     }
     
     @Override
@@ -210,21 +209,17 @@
         if (command instanceof IProcedure) {
         	return Arrays.asList(((IProcedure)command).getResultSetColumnTypes());
         }
-        List types = new ArrayList();
+        List<Class<?>> types = new ArrayList<Class<?>>(1);
         types.add(Integer.class);
         return types;
     }
     
-    private List createDummyRow(List types) throws ConnectorException {
-        List row = new ArrayList(types.size());
+    private void createDummyRow(List<Class<?>> types) {
+        row = new ArrayList<Object>(types.size());
         
-        Iterator iter = types.iterator();
-        while(iter.hasNext()) {
-            Class type = (Class) iter.next();
+        for (Class<?> type : types) {
             row.add( getValue(type) );
         }   
-        
-        return row;
     }
 
     /**

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -147,7 +147,7 @@
                         columnMetadata = new Map[1];
                         columnMetadata[0] = createXMLColumnMetadata((Query)originalCommand);
                     } else if (((Query)originalCommand).getInto() != null) {
-                        columnMetadata = createUpdateMetadata();
+                        columnMetadata = null;
                     } else {
                         columnMetadata = createProjectedSymbolMetadata(originalCommand);
                     }
@@ -163,7 +163,7 @@
             case Command.TYPE_DELETE:
             case Command.TYPE_CREATE:    
             case Command.TYPE_DROP:
-                columnMetadata = createUpdateMetadata();
+                columnMetadata = null;
                 break;    
             case Command.TYPE_XQUERY:
                 columnMetadata = new Map[1];
@@ -332,29 +332,6 @@
         return getDefaultColumn(vdbName, vdbVersion, null, shortColumnName, symbol.getType());
     }
     
-    private Map[] createUpdateMetadata() {
-        Map[] metadata = new Map[1];
-        metadata[0] = new HashMap();
-        metadata[0].put(ResultsMetadataConstants.AUTO_INCREMENTING, Boolean.FALSE);
-        metadata[0].put(ResultsMetadataConstants.CASE_SENSITIVE, Boolean.FALSE);
-        metadata[0].put(ResultsMetadataConstants.CURRENCY, Boolean.FALSE);
-        metadata[0].put(ResultsMetadataConstants.DATA_TYPE, DataTypeManager.DefaultDataTypes.INTEGER);
-        metadata[0].put(ResultsMetadataConstants.DISPLAY_SIZE, ResultsMetadataDefaults.getMaxDisplaySize(DataTypeManager.DefaultDataTypes.INTEGER));
-        metadata[0].put(ResultsMetadataConstants.ELEMENT_LABEL, null); 
-        metadata[0].put(ResultsMetadataConstants.ELEMENT_NAME, ResultsMetadataDefaults.UPDATE_COLUMN);
-        metadata[0].put(ResultsMetadataConstants.GROUP_NAME, null);
-        metadata[0].put(ResultsMetadataConstants.NULLABLE, ResultsMetadataConstants.NULL_TYPES.NOT_NULL);        
-        metadata[0].put(ResultsMetadataConstants.PRECISION, ResultsMetadataDefaults.getDefaultPrecision(DataTypeManager.DefaultDataTypes.INTEGER)); 
-        metadata[0].put(ResultsMetadataConstants.RADIX, new Integer(10));
-        metadata[0].put(ResultsMetadataConstants.SCALE, new Integer(0)); 
-        metadata[0].put(ResultsMetadataConstants.SEARCHABLE, ResultsMetadataConstants.SEARCH_TYPES.UNSEARCHABLE);        
-        metadata[0].put(ResultsMetadataConstants.SIGNED, Boolean.TRUE); 
-        metadata[0].put(ResultsMetadataConstants.WRITABLE, Boolean.FALSE);
-        metadata[0].put(ResultsMetadataConstants.VIRTUAL_DATABASE_NAME, vdbName); 
-        metadata[0].put(ResultsMetadataConstants.VIRTUAL_DATABASE_VERSION, vdbVersion);
-        return metadata;        
-    }
-    
     private int getColumnPrecision(Class dataType, Object elementID) throws QueryMetadataException, MetaMatrixComponentException {
         if (!Number.class.isAssignableFrom(dataType)) {
             int length = metadata.getElementLength(elementID);

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -123,7 +123,7 @@
         List values = requestMsg.getParameterValues();
         if(requestMsg.isPreparedBatchUpdate()){
         	if(values.size() > 1){
-        		((PreparedBatchUpdate)command).setUpdatingModelCount(2);
+        		((PreparedBatchUpdate)userCommand).setUpdatingModelCount(2);
         	}
         	for(int i=0; i<values.size(); i++){
         	   if (params.size() != ((List)values.get(i)).size()) {
@@ -178,7 +178,7 @@
             //already in cache. obtain the values from cache
             analysisRecord = prepPlan.getAnalysisRecord();
             
-            this.command = command;
+            this.userCommand = command;
             createCommandContext(command);
         }
         

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -91,7 +91,9 @@
 import com.metamatrix.query.sql.lang.Command;
 import com.metamatrix.query.sql.lang.Limit;
 import com.metamatrix.query.sql.lang.Option;
+import com.metamatrix.query.sql.lang.Query;
 import com.metamatrix.query.sql.lang.QueryCommand;
+import com.metamatrix.query.sql.lang.SetQuery;
 import com.metamatrix.query.sql.lang.StoredProcedure;
 import com.metamatrix.query.sql.lang.XQuery;
 import com.metamatrix.query.sql.symbol.Constant;
@@ -146,7 +148,8 @@
     
     private int chunkSize;
     
-    protected Command command;
+    protected Command userCommand;
+    protected boolean returnsUpdateCount;
 
     void initialize(RequestMessage requestMsg,
                               ApplicationEnvironment env,
@@ -234,7 +237,28 @@
         }
     }
     
-    protected void createCommandContext(Command command) {
+    protected void createCommandContext(Command command) throws QueryValidatorException {
+    	boolean returnsResultSet = false;
+    	this.returnsUpdateCount = true;
+        if(command instanceof Query) {
+        	Query query = (Query)command;
+    		returnsResultSet = query.getInto() == null;
+    		returnsUpdateCount = !returnsResultSet;
+        } else if (command instanceof SetQuery) {
+        	returnsResultSet = true;
+        	returnsUpdateCount = false;
+        } else if (command instanceof XQuery) {
+        	returnsResultSet = true;
+        	returnsUpdateCount = false;
+        } else if (command instanceof StoredProcedure) {
+        	returnsUpdateCount = false;
+        	StoredProcedure proc = (StoredProcedure)command;
+        	returnsResultSet = proc.returnsResultSet();
+        }
+    	if (this.requestMsg.getRequireResultSet() != null && this.requestMsg.getRequireResultSet() != returnsResultSet) {
+        	throw new QueryValidatorException(DQPPlugin.Util.getString(this.requestMsg.getRequireResultSet()?"Request.no_result_set":"Request.result_set")); //$NON-NLS-1$ //$NON-NLS-2$
+    	}
+
     	// Create command context, used in rewriting, planning, and processing
         // Identifies a "group" of requests on a per-connection basis to allow later
         // cleanup of all resources in the group on connection shutdown
@@ -329,7 +353,7 @@
             }
         }
         
-        this.command = preRewrite;
+        this.userCommand = preRewrite;
         return command;
     }
     
@@ -424,7 +448,7 @@
             
             if(ExecutionProperties.AUTO_WRAP_ON.equals(requestMsg.getTxnAutoWrapMode())){ 
                 startAutoWrapTxn = true;
-            } else if ( command.updatingModelCount(metadata) > 1) { 
+            } else if ( userCommand.updatingModelCount(metadata) > 1) { 
                 if (ExecutionProperties.AUTO_WRAP_OPTIMISTIC.equals(requestMsg.getTxnAutoWrapMode())){ 
                     String msg = DQPPlugin.Util.getString("Request.txn_needed_wrong_mode", requestId); //$NON-NLS-1$
                     throw new MetaMatrixComponentException(msg);
@@ -598,15 +622,15 @@
         
         generatePlan();
         
-        validateEntitlement(command);
+        validateEntitlement(userCommand);
         
-        setSchemasForXMLPlan(command, metadata);
+        setSchemasForXMLPlan(userCommand, metadata);
         
         createProcessor();
     }
     
 	public QueryProcessor createQueryProcessor(String query, String recursionGroup, CommandContext commandContext) throws MetaMatrixProcessingException, MetaMatrixComponentException {
-		boolean isRootXQuery = recursionGroup == null && commandContext.getCallStackDepth() == 0 && command instanceof XQuery;
+		boolean isRootXQuery = recursionGroup == null && commandContext.getCallStackDepth() == 0 && userCommand instanceof XQuery;
 		
 		ParseInfo parseInfo = new ParseInfo();
 		if (isRootXQuery && requestMsg.isDoubleQuotedVariableAllowed()) {

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -145,6 +145,7 @@
     private TransactionContext transactionContext;
     private TupleSourceID resultsID;
     private Collection schemas;     // These are schemas associated with XML results
+    private boolean returnsUpdateCount;
     
     /*
      * maintained during processing
@@ -370,7 +371,7 @@
 
 	protected void processNew() throws MetaMatrixProcessingException, MetaMatrixComponentException {
 		request.processRequest();
-		originalCommand = request.command;
+		originalCommand = request.userCommand;
 		processor = request.processor;
 		processor.setBatchHandler(new BatchHandler() {
 			public void batchProduced(TupleBatch batch)
@@ -407,7 +408,7 @@
 	    if (analysisRecord.recordQueryPlan()) {
 	        analysisRecord.setQueryPlan(processor.getProcessorPlan().getDescriptionProperties());
 	    }
-
+	    this.returnsUpdateCount = request.returnsUpdateCount;
 		request = null;
 	}
 
@@ -441,7 +442,7 @@
             ResultsMessage response = createResultsMessage(requestMsg, batch.getAllTuples(), this.processor.getProcessorPlan().getOutputElements(), analysisRecord);
             response.setFirstRow(batch.getBeginRow());
             response.setLastRow(batch.getEndRow());
-
+            response.setUpdateResult(this.returnsUpdateCount);
             // set final row
             response.setFinalRow(finalRowCount);
             // Results are partial if the rowcount is not yet known,

Modified: trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties	2009-03-23 03:25:55 UTC (rev 613)
@@ -375,7 +375,9 @@
 Request.txn.info.suspend=Suspended transaction "{0}".
 Request.txn_needed_wrong_mode=Detected request "{0}" with multiple updates when using txnAutoWrap=OPTIMISTIC.  If you are using MetaMatrix Enterprise, you can set txnAutoWrap=OFF to avoid using a transaction or txnAutoWrap=PESSIMISTIC to automatically create a transaction when needed. If you are not using MetaMatrix Enterprise, no transaction manager is provided and transactions are not supported.  In that case, you can set txnAutoWrap=OFF to allow transaction methods to be called and ignored without actual transaction support. WARNING: Setting txnAutowrap=OFF and using transaction methods is risky because transactions will not be executed atomically and rollback will not occur!
 Request.transaction_not_supported=Autowrap transaction required, but transaction support is disabled
-Request.potentially_unsafe=The request is modifying more than 1 model without any containing transaction (txnAutoWrap = OFF).  This is potenially unsafe as the updates cannot be rolled back as a single unit.
+Request.potentially_unsafe=The request is modifying more than 1 model without any containing transaction (txnAutoWrap = OFF).  This is potentially unsafe as the updates cannot be rolled back as a single unit.
+Request.no_result_set=Statement does not return a result set.
+Request.result_set=Statement returns a result set, not an update count.
 ParameterImpl.Invalid_direction=Invalid parameter direction: {0}
 DQPCORE.6=Unable to create ResulSet cache.
 ResultSetCache.1=Result batches are not contiguous in cache.

Deleted: trunk/engine/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/engine/src/test/java/com/metamatrix/query/unittest/TimestampUtil.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-/*
- * Date: Jun 16, 2004
- * Time: 1:47:51 PM
- */
-package com.metamatrix.query.unittest;
-
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.TimeZone;
-
-/**
- * TimestampUtil
- *
- * <p>Allows creation of <code>java.sql.Timestamp</code>, <code>java.sql.Date</code>, <code>java.sql.Time</code>
- * by specifying year, month, day, etc. without deprecation errors.</p>
- */
-public class TimestampUtil {
-
-    private static ThreadLocal<Calendar> CAL = new ThreadLocal<Calendar>() {
-    	@Override
-    	protected Calendar initialValue() {
-    		return Calendar.getInstance();
-    	}
-    };
-
-    /**
-     * Replaces deprecated <code>java.sql.Timestamp</code> constructor.
-     *
-     * @param year   year-1900
-     * @param month  0 to 11
-     * @param date   1 to 31
-     * @param hour   0 to 23
-     * @param minute 0 to 59
-     * @param second 0 to 59
-     * @param nano   0 to 999,999,999
-     * @see java.sql.Timestamp
-     * @return A <code>Timestamp</code>
-     */
-    public static Timestamp createTimestamp(int year, int month, int date, int hour, int minute, int second, int nano) {
-        primeCalendar();
-        CAL.get().set(year + 1900, month, date, hour, minute, second);
-        long millis = CAL.get().getTime().getTime();
-        Timestamp ts = new Timestamp(millis);
-        ts.setNanos(nano);
-        return ts;
-    }
-
-    /**
-     * Replaces deprecated <code>java.sql.Date</code> constructor.
-     *
-     * @param   year    the year minus 1900.
-     * @param   month   the month between 0-11.
-     * @param   date    the day of the month between 1-31.
-     * @see java.sql.Date
-     * @return A <code>Date</code>
-     */
-   public static Date createDate(int year, int month, int date) {
-        primeCalendar();
-        CAL.get().set(year + 1900, month, date);
-        return new Date(CAL.get().getTime().getTime());
-   }
-
-    /**
-     * Replaces deprecated <code>java.sql.Time</code> constructor.
-     *
-     * @param hour 0 to 23
-     * @param minute 0 to 59
-     * @param second 0 to 59
-     * @see java.sql.Time
-     * @return A <code>Time</code>
-     */
-    public static Time createTime(int hour, int minute, int second) {
-        primeCalendar();
-        CAL.get().set(Calendar.HOUR_OF_DAY, hour);
-        CAL.get().set(Calendar.MINUTE, minute);
-        CAL.get().set(Calendar.SECOND, second);
-        return new Time(CAL.get().getTime().getTime());
-    }
-
-    private static void primeCalendar() {
-        CAL.get().setTimeZone(TimeZone.getDefault());
-        CAL.get().clear();
-    }
-
-}

Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -96,20 +96,16 @@
 
     public void testSimpleUpdate() throws Exception {
         Map[] metadata = helpGetMetadata("INSERT INTO pm1.g1 (e1) VALUES ('x')", FakeMetadataFactory.example1Cached()); //$NON-NLS-1$
-        assertNotNull(metadata);
-        assertEquals(1, metadata.length);
+        assertNull(metadata);
         
         metadata = helpGetMetadata("DELETE FROM pm1.g1 WHERE e1 = 'x'", FakeMetadataFactory.example1Cached()); //$NON-NLS-1$
-        assertNotNull(metadata);
-        assertEquals(1, metadata.length);
+        assertNull(metadata);
         
         metadata = helpGetMetadata("UPDATE pm1.g1 SET e1='y' WHERE e1 = 'x'", FakeMetadataFactory.example1Cached()); //$NON-NLS-1$
-        assertNotNull(metadata);
-        assertEquals(1, metadata.length);
+        assertNull(metadata);
         
         metadata = helpGetMetadata("SELECT e1, e2, e3, e4 INTO pm1.g2 FROM pm1.g1", FakeMetadataFactory.example1Cached()); //$NON-NLS-1$
-        assertNotNull(metadata);
-        assertEquals(1, metadata.length);
+        assertNull(metadata);
     }
     
     public void testElementLabel() throws Exception {

Modified: trunk/test-integration/src/test/java/com/metamatrix/cdk/TestLoopbackConnector.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/cdk/TestLoopbackConnector.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/test-integration/src/test/java/com/metamatrix/cdk/TestLoopbackConnector.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -22,6 +22,8 @@
 
 package com.metamatrix.cdk;
 
+import org.junit.Test;
+
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.api.AbstractMMQueryTestCase;
 
@@ -30,11 +32,7 @@
 	private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/dqp/dqp.properties"; //$NON-NLS-1$
     private static final String VDB = "PartsSupplier"; //$NON-NLS-1$
         
-    public TestLoopbackConnector(String name) {
-        super(name); 
-    }
-    
-    public void test() {
+    @Test public void test() {
     	getConnection(VDB, DQP_PROP_FILE);
     	
     	executeAndAssertResults("select * from parts", new String[] { //$NON-NLS-1$

Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -1,5 +1,7 @@
 package com.metamatrix.data.metadata.runtime;
 
+import org.junit.Test;
+
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.api.AbstractMMQueryTestCase;
 
@@ -9,16 +11,16 @@
     private static final String VDB = "TestExtensions"; //$NON-NLS-1$
 
  		
-    public void testMetadataTable() throws Exception {
+    @Test public void testMetadataTable() throws Exception {
     	getConnection(VDB, DQP_PROP_FILE, ""); //$NON-NLS-1$
     	execute("Select * from TableA"); //$NON-NLS-1$
     	String expected[] = {"column1[string]    column2[integer]"}; //$NON-NLS-1$
     	assertResults(expected); 
     }
     
-    public void testMetadataProcedure() throws Exception {
+    @Test public void testMetadataProcedure() throws Exception {
     	getConnection(VDB, DQP_PROP_FILE, ""); //$NON-NLS-1$
-    	executeStoredProcedure("exec AnyModel.ProcedureB(?)", new Object[] {"foo"}); //$NON-NLS-1$ //$NON-NLS-2$
+    	execute("exec AnyModel.ProcedureB(?)", new Object[] {"foo"}); //$NON-NLS-1$ //$NON-NLS-2$
     	String expected[] = {"column1[string]    column2[integer]"}; //$NON-NLS-1$
     	assertResults(expected); 
     }	

Modified: trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestPartsDatabaseMetadata.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestPartsDatabaseMetadata.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestPartsDatabaseMetadata.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -27,9 +27,10 @@
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.api.AbstractMMQueryTestCase;
@@ -48,22 +49,14 @@
     public TestPartsDatabaseMetadata() {
     	// this is needed because the result files are generated 
     	// with another tool which uses tab as delimiter 
-    	super.DELIMITER = "\t";
+    	super.DELIMITER = "\t"; //$NON-NLS-1$
     }
     
-    public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTestSuite(TestPartsDatabaseMetadata.class);
-		return createOnceRunSuite(suite, new ConnectionFactory() {
-
-			public com.metamatrix.jdbc.api.Connection createSingleConnection()
-					throws Exception {
-				com.metamatrix.jdbc.api.Connection result = createConnection(VDB, DQP_PROP_FILE, "");
-				dbMetadata = result.getMetaData();
-				return result;
-			}});
-	}    
-    
+    @Before public void setUp() throws SQLException {
+    	getConnection(VDB, DQP_PROP_FILE);
+    	dbMetadata = this.internalConnection.getMetaData();
+    }
+        
     private void checkResult(String testName, ResultSet actualResults)  throws Exception {
     	ResultSetMetaData resultMetadata = actualResults.getMetaData();
         
@@ -74,55 +67,55 @@
         assertResultsSetEquals(actualResults, new File(filename));
     }
         
-    public void testExportedKeys()  throws Exception {
-        checkResult("testExportedKeys", dbMetadata.getExportedKeys(null, VDB, "%")); //$NON-NLS-1$
+    @Test public void testExportedKeys()  throws Exception {
+        checkResult("testExportedKeys", dbMetadata.getExportedKeys(null, VDB, "%")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public void testImportedKeys()  throws Exception {
-        checkResult("testImportedKeys", dbMetadata.getImportedKeys(null, VDB, "%")); //$NON-NLS-1$
+    @Test public void testImportedKeys()  throws Exception {
+        checkResult("testImportedKeys", dbMetadata.getImportedKeys(null, VDB, "%")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public void testPrimaryKeys()  throws Exception {
-        checkResult("testPrimaryKeys", dbMetadata.getPrimaryKeys(null, VDB, "%")); //$NON-NLS-1$
+    @Test public void testPrimaryKeys()  throws Exception {
+        checkResult("testPrimaryKeys", dbMetadata.getPrimaryKeys(null, VDB, "%")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public void testProcedures()  throws Exception {
-        checkResult("testProcedures", dbMetadata.getProcedures(null, VDB, "%")); //$NON-NLS-1$
+    @Test public void testProcedures()  throws Exception {
+        checkResult("testProcedures", dbMetadata.getProcedures(null, VDB, "%")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public void testProcedureColumns()  throws Exception {
-        checkResult("testProcedureColumns", dbMetadata.getProcedureColumns(null, VDB, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$
+    @Test public void testProcedureColumns()  throws Exception {
+        checkResult("testProcedureColumns", dbMetadata.getProcedureColumns(null, VDB, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
-    public void testUDTs()  throws Exception {
-        checkResult("testUDTs", dbMetadata.getUDTs(null, VDB, "%", null)); //$NON-NLS-1$
+    @Test public void testUDTs()  throws Exception {
+        checkResult("testUDTs", dbMetadata.getUDTs(null, VDB, "%", null)); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public void testIndexInfo()  throws Exception {
-        checkResult("testIndexInfo", dbMetadata.getIndexInfo(null, VDB, "%", true, true)); //$NON-NLS-1$
+    @Test public void testIndexInfo()  throws Exception {
+        checkResult("testIndexInfo", dbMetadata.getIndexInfo(null, VDB, "%", true, true)); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public void testCrossReference()  throws Exception {
-        checkResult("testCrossReference", dbMetadata.getCrossReference(null, VDB, "%", null, VDB, "%")); //$NON-NLS-1$ //$NON-NLS-2$
+    @Test public void testCrossReference()  throws Exception {
+        checkResult("testCrossReference", dbMetadata.getCrossReference(null, VDB, "%", null, VDB, "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
-    public void testTypeInfo()  throws Exception {
-        checkResult("testTypeInfo",dbMetadata.getTypeInfo());
+    @Test public void testTypeInfo()  throws Exception {
+        checkResult("testTypeInfo",dbMetadata.getTypeInfo()); //$NON-NLS-1$
     }
     
-    public void testCatalogs()  throws Exception {
-        checkResult("testCatalogs", dbMetadata.getCatalogs());
+    @Test public void testCatalogs()  throws Exception {
+        checkResult("testCatalogs", dbMetadata.getCatalogs()); //$NON-NLS-1$
     }
     
-    public void testSchemas()  throws Exception {
-        checkResult("testSchemas", dbMetadata.getSchemas());
+    @Test public void testSchemas()  throws Exception {
+        checkResult("testSchemas", dbMetadata.getSchemas()); //$NON-NLS-1$
     }
 
-    public void testTables()  throws Exception {
-        checkResult("testTables", dbMetadata.getTables(null,VDB, "%", null)); //$NON-NLS-1$
+    @Test public void testTables()  throws Exception {
+        checkResult("testTables", dbMetadata.getTables(null,VDB, "%", null)); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public void testColumns() throws Exception {
-        checkResult("testColumns", dbMetadata.getColumns(null, VDB, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$
+    @Test public void testColumns() throws Exception {
+        checkResult("testColumns", dbMetadata.getColumns(null, VDB, "%", "%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }    
 }

Modified: trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestResultSetMetadata.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestResultSetMetadata.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestResultSetMetadata.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -22,8 +22,8 @@
 
 package com.metamatrix.systemmodel;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.api.AbstractMMQueryTestCase;
@@ -36,94 +36,89 @@
     public TestResultSetMetadata() {
     	// this is needed because the result files are generated 
     	// with another tool which uses tab as delimiter 
-    	super.DELIMITER = "\t";
+    	super.DELIMITER = "\t"; //$NON-NLS-1$
     }
     
-    public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTestSuite(TestResultSetMetadata.class);
-		return createOnceRunSuite(suite, new ConnectionFactory() {
-
-			public com.metamatrix.jdbc.api.Connection createSingleConnection() throws Exception {
-				// TODO Auto-generated method stub
-				return createConnection(VDB, DQP_PROP_FILE, "");
-			}});
-	} 
+    @Before public void setUp() {
+    	getConnection(VDB, DQP_PROP_FILE);
+    }
     
     private void executeTest(String sql, String[] expected) throws Exception {
-    	java.sql.ResultSet rs = execute(sql);
+    	execute(sql);
+    	java.sql.ResultSet rs = this.internalResultSet;
     	assertResultsSetMetadataEquals(rs.getMetaData(), expected);
     }
     
     private void executePreparedTest(String sql, String[] expected) throws Exception {
-    	java.sql.ResultSet rs = executePreparedStatement(sql, new Object[] {});
+    	execute(sql, new Object[] {});
+    	java.sql.ResultSet rs = this.internalResultSet;
     	assertResultsSetMetadataEquals(rs.getMetaData(), expected);
     }
     
-    public void testCount()  throws Exception {
+    @Test public void testCount()  throws Exception {
     	String[] expected = {
-    		    "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	
-    		    "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null"
+    		    "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	 //$NON-NLS-1$
+    		    "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null" //$NON-NLS-1$
     	};
-    	executeTest("select count(*) from parts", expected);
+    	executeTest("select count(*) from parts", expected); //$NON-NLS-1$
     }
 
-    public void testStar()  throws Exception {
+    @Test public void testStar()  throws Exception {
     	String[] expected = {
-		    "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	
-		    "PART_ID	12	string	java.lang.String	0	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null",
-		    "PART_NAME	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null",
-		    "PART_COLOR	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null",
-		    "PART_WEIGHT	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null"
+		    "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	 //$NON-NLS-1$
+		    "PART_ID	12	string	java.lang.String	0	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null", //$NON-NLS-1$
+		    "PART_NAME	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null", //$NON-NLS-1$
+		    "PART_COLOR	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null", //$NON-NLS-1$
+		    "PART_WEIGHT	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null" //$NON-NLS-1$
     	};
-    	executeTest("select * from parts", expected);
+    	executeTest("select * from parts", expected); //$NON-NLS-1$
     }
 
-    public void testTempGroupStar()  throws Exception {
+    @Test public void testTempGroupStar()  throws Exception {
     	String[] expected = { 
-		    "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	
-		    "PART_ID	12	string	java.lang.String	0	FOO	PartsSupplier	null",
-		    "PART_NAME	12	string	java.lang.String	1	FOO	PartsSupplier	null",
-		    "PART_COLOR	12	string	java.lang.String	1	FOO	PartsSupplier	null",
-		    "PART_WEIGHT	12	string	java.lang.String	1	FOO	PartsSupplier	null"
+		    "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	 //$NON-NLS-1$
+		    "PART_ID	12	string	java.lang.String	0	FOO	PartsSupplier	null", //$NON-NLS-1$
+		    "PART_NAME	12	string	java.lang.String	1	FOO	PartsSupplier	null", //$NON-NLS-1$
+		    "PART_COLOR	12	string	java.lang.String	1	FOO	PartsSupplier	null", //$NON-NLS-1$
+		    "PART_WEIGHT	12	string	java.lang.String	1	FOO	PartsSupplier	null" //$NON-NLS-1$
     	};
-    	executeTest("select * from (select * from parts) foo", expected);
+    	executeTest("select * from (select * from parts) foo", expected); //$NON-NLS-1$
     }
 
-    public void testCountAndElement()  throws Exception {
+    @Test public void testCountAndElement()  throws Exception {
     	String[] expected = {
-	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	
-	        "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null",
-	        "part_name	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null"
+	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",	 //$NON-NLS-1$
+	        "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null", //$NON-NLS-1$
+	        "part_name	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null" //$NON-NLS-1$
     	};
-    	executeTest("select count(*), part_name from parts group by part_name", expected);
+    	executeTest("select count(*), part_name from parts group by part_name", expected); //$NON-NLS-1$
     }
 
-    public void testStar_PreparedStatement()  throws Exception {
+    @Test public void testStar_PreparedStatement()  throws Exception {
     	String[] expected = {
-	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",
-	        "PART_ID	12	string	java.lang.String	0	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null",
-	        "PART_NAME	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null",
-	        "PART_COLOR	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null",
-	        "PART_WEIGHT	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null"
+	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName", //$NON-NLS-1$
+	        "PART_ID	12	string	java.lang.String	0	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null", //$NON-NLS-1$
+	        "PART_NAME	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null", //$NON-NLS-1$
+	        "PART_COLOR	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null", //$NON-NLS-1$
+	        "PART_WEIGHT	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null" //$NON-NLS-1$
     	};    	
-    	executePreparedTest("select * from parts", expected);
+    	executePreparedTest("select * from parts", expected); //$NON-NLS-1$
     }
 
-    public void testCount_PreparedStatement()  throws Exception {
+    @Test public void testCount_PreparedStatement()  throws Exception {
     	String[] expected = {
-	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",
-	        "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null"
+	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName", //$NON-NLS-1$
+	        "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null" //$NON-NLS-1$
     	};
-    	executePreparedTest("select count(*) from parts", expected);
+    	executePreparedTest("select count(*) from parts", expected); //$NON-NLS-1$
     }
 
-    public void testCountAndElement_PreparedStatement()  throws Exception {
+    @Test public void testCountAndElement_PreparedStatement()  throws Exception {
     	String[] expected = {
-	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName",
-	        "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null",
-	        "part_name	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null"
+	        "ColumnName	ColumnType	ColumnTypeName	ColumnClassName	isNullable	TableName	SchemaName	CatalogName", //$NON-NLS-1$
+	        "count	4	integer	java.lang.Integer	1	null	PartsSupplier	null", //$NON-NLS-1$
+	        "part_name	12	string	java.lang.String	1	PartsSupplier.PARTSSUPPLIER.PARTS	PartsSupplier	null" //$NON-NLS-1$
     	};
-    	executePreparedTest("select count(*), part_name from parts group by part_name", expected);
+    	executePreparedTest("select count(*), part_name from parts group by part_name", expected); //$NON-NLS-1$
     }
 }

Modified: trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -22,8 +22,8 @@
 
 package com.metamatrix.systemmodel;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.api.AbstractMMQueryTestCase;
@@ -35,1054 +35,1046 @@
 	private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath()+ "/partssupplier/dqp.properties"; //$NON-NLS-1$
 	private static final String VDB = "PartsSupplier"; //$NON-NLS-1$
 
-	public TestSystemVirtualModel(String name) {
-		super(name);
+	public TestSystemVirtualModel() {
 		// this is needed because the result files are generated
 		// with another tool which uses tab as delimiter
-		super.DELIMITER = "\t";
+		super.DELIMITER = "\t"; //$NON-NLS-1$
 	}
+	
+    @Before public void setUp() {
+    	getConnection(VDB, DQP_PROP_FILE);
+    }
 
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTestSuite(TestSystemVirtualModel.class);
-		return createOnceRunSuite(suite, new ConnectionFactory() {
-
-			public com.metamatrix.jdbc.api.Connection createSingleConnection()
-					throws Exception {
-				return createConnection(VDB, DQP_PROP_FILE, "");
-			}});
-	}
-
-	public void testDefect23534() {
-		String[] expected = { "SCOPE[short]	COLUMN_NAME[string]	DATA_TYPE[short]	TYPE_NAME[string]	PRECISION[integer]	LENGTH[integer]	SCALE[integer]	PSEUDO_COLUMN[short]" };
+	@Test public void testDefect23534() {
+		String[] expected = { "SCOPE[short]	COLUMN_NAME[string]	DATA_TYPE[short]	TYPE_NAME[string]	PRECISION[integer]	LENGTH[integer]	SCALE[integer]	PSEUDO_COLUMN[short]" }; //$NON-NLS-1$
 		executeAndAssertResults(
-				"SELECT OA_SCOPE as \"SCOPE\" , COLUMN_NAME,  DATA_TYPE, TYPE_NAME, OA_PRECISION as \"PRECISION\", " +
-				"OA_LENGTH as \"LENGTH\", OA_SCALE as \"SCALE\", PSEUDO_COLUMN " +
-				"FROM System.ODBC.OA_COLUMNS  " +
-				"WHERE TABLE_NAME = N'AUTHORS' AND TABLE_OWNER = N's1' AND " +
-				"(OA_COLUMNTYPE = 2 OR OA_COLUMNTYPE = 3) " +
-				"AND (OA_SCOPE is null OR OA_SCOPE >= 1) " +
-				"AND (OA_NULLABLE = 0 OR OA_NULLABLE = 1) " +
-				"ORDER BY \"SCOPE\"",
+				"SELECT OA_SCOPE as \"SCOPE\" , COLUMN_NAME,  DATA_TYPE, TYPE_NAME, OA_PRECISION as \"PRECISION\", " + //$NON-NLS-1$
+				"OA_LENGTH as \"LENGTH\", OA_SCALE as \"SCALE\", PSEUDO_COLUMN " + //$NON-NLS-1$
+				"FROM System.ODBC.OA_COLUMNS  " + //$NON-NLS-1$
+				"WHERE TABLE_NAME = N'AUTHORS' AND TABLE_OWNER = N's1' AND " + //$NON-NLS-1$
+				"(OA_COLUMNTYPE = 2 OR OA_COLUMNTYPE = 3) " + //$NON-NLS-1$
+				"AND (OA_SCOPE is null OR OA_SCOPE >= 1) " + //$NON-NLS-1$
+				"AND (OA_NULLABLE = 0 OR OA_NULLABLE = 1) " + //$NON-NLS-1$
+				"ORDER BY \"SCOPE\"", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testModels() {
+	@Test public void testModels() {
 
 		String[] expected = {
-				"Name[string]	IsPhysical[boolean]	SupportsWhereAll[boolean]	SupportsOrderBy[boolean]	SupportsJoin[boolean]	SupportsDistinct[boolean]	SupportsOuterJoin[boolean]	MaxSetSize[integer]	UID[string]	Description[string]	PrimaryMetamodelURI[string]",
-				"PartsSupplier	true	true	true	true	true	true	100	mmuuid:19c7f380-73d8-1edc-a81c-ecf397b10590	null	http://www.metamatrix.com/metamodels/Relational",
-				"System	false	true	true	true	true	true	0	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	System	http://www.metamatrix.com/metamodels/Relational",
+				"Name[string]	IsPhysical[boolean]	SupportsWhereAll[boolean]	SupportsOrderBy[boolean]	SupportsJoin[boolean]	SupportsDistinct[boolean]	SupportsOuterJoin[boolean]	MaxSetSize[integer]	UID[string]	Description[string]	PrimaryMetamodelURI[string]", //$NON-NLS-1$
+				"PartsSupplier	true	true	true	true	true	true	100	mmuuid:19c7f380-73d8-1edc-a81c-ecf397b10590	null	http://www.metamatrix.com/metamodels/Relational", //$NON-NLS-1$
+				"System	false	true	true	true	true	true	0	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	System	http://www.metamatrix.com/metamodels/Relational", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* from System.Models", expected);
+		executeAndAssertResults("select* from System.Models", expected); //$NON-NLS-1$
 	}
 
-	public void testKeys() {
+	@Test public void testKeys() {
 
 		String[] expected = {
-				"ModelName[string]	GroupFullName[string]	Name[string]	Description[string]	NameInSource[string]	Type[string]	IsIndexed[boolean]	GroupName[string]	GroupUpperName[string]	RefKeyUID[string]	UID[string]",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PK_PARTS	null	null	Primary	false	PARTS	PARTS	null	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	PK_SHIP_VIA	null	null	Primary	false	SHIP_VIA	SHIP_VIA	null	mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	PK_STATUS	null	null	Primary	false	STATUS	STATUS	null	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	PK_SUPPLIER	null	null	Primary	false	SUPPLIER	SUPPLIER	null	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PK_SUPPLIER_PARTS	null	null	Primary	false	SUPPLIER_PARTS	SUPPLIER_PARTS	null	mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	FK_SPLIER_STATS	null	FK_SPLIER_STATS	Foreign	false	SUPPLIER	SUPPLIER	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590	mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	FK_SPLIER_PRTS_PRTS	null	FK_SPLIER_PRTS_PRTS	Foreign	false	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	FK_SPLY_PRTS_SPLY	null	FK_SPLY_PRTS_SPLY	Foreign	false	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590",
+				"ModelName[string]	GroupFullName[string]	Name[string]	Description[string]	NameInSource[string]	Type[string]	IsIndexed[boolean]	GroupName[string]	GroupUpperName[string]	RefKeyUID[string]	UID[string]", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PK_PARTS	null	null	Primary	false	PARTS	PARTS	null	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	PK_SHIP_VIA	null	null	Primary	false	SHIP_VIA	SHIP_VIA	null	mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	PK_STATUS	null	null	Primary	false	STATUS	STATUS	null	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	PK_SUPPLIER	null	null	Primary	false	SUPPLIER	SUPPLIER	null	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PK_SUPPLIER_PARTS	null	null	Primary	false	SUPPLIER_PARTS	SUPPLIER_PARTS	null	mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	FK_SPLIER_STATS	null	FK_SPLIER_STATS	Foreign	false	SUPPLIER	SUPPLIER	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590	mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	FK_SPLIER_PRTS_PRTS	null	FK_SPLIER_PRTS_PRTS	Foreign	false	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	FK_SPLY_PRTS_SPLY	null	FK_SPLY_PRTS_SPLY	Foreign	false	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* from System.Keys order by UID",
+		executeAndAssertResults("select* from System.Keys order by UID", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testGroups() {
+	@Test public void testGroups() {
 
 		String[] expected = {
-				"ModelName[string]	FullName[string]	Name[string]	Type[string]	NameInSource[string]	IsPhysical[boolean]	UpperName[string]	SupportsUpdates[boolean]	UID[string]	Cardinality[integer]	Description[string]	IsSystem[boolean]	IsMaterialized[boolean]",
-				"System	System.Models	Models	Table	null	false	MODELS	false	mmuuid:0193bfc0-e013-1ddf-aa2e-88f814a79e93	0	null	true	false",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIP_VIA	Table	SHIP_VIA	true	SHIP_VIA	true	mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590	4	null	false	false",
-				"System	System.ModelProperties	ModelProperties	Table	null	false	MODELPROPERTIES	false	mmuuid:135f7080-c370-1de7-b515-bad6cb0abb8d	0	null	true	false",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS	Table	STATUS	true	STATUS	true	mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590	3	null	false	false",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER	Table	SUPPLIER	true	SUPPLIER	true	mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590	16	null	false	false",
-				"System	System.ProcedureProperties	ProcedureProperties	Table	null	false	PROCEDUREPROPERTIES	false	mmuuid:2ec88080-c5b1-1de7-b515-bad6cb0abb8d	0	null	true	false",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_PARTS	Table	SUPPLIER_PARTS	true	SUPPLIER_PARTS	true	mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590	227	null	false	false",
-				"System	System.ODBC.OA_TABLES	OA_TABLES	Table	null	false	OA_TABLES	false	mmuuid:54cbf440-2ca5-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.ODBC.OA_COLUMNS	OA_COLUMNS	Table	null	false	OA_COLUMNS	false	mmuuid:54cbf446-2ca5-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.ODBC.OA_PROC	OA_PROC	Table	null	false	OA_PROC	false	mmuuid:55b0d600-2ca5-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.ODBC.OA_PROCCOLUMNS	OA_PROCCOLUMNS	Table	null	false	OA_PROCCOLUMNS	false	mmuuid:56a4fa00-2ca5-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.ODBC.OA_TYPES	OA_TYPES	Table	null	false	OA_TYPES	false	mmuuid:57991e00-2ca5-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.ODBC.OA_STATISTICS	OA_STATISTICS	Table	null	false	OA_STATISTICS	false	mmuuid:57991e10-2ca5-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.ODBC.OA_FKEYS	OA_FKEYS	Table	null	false	OA_FKEYS	false	mmuuid:587dffc0-2ca5-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.DataTypeElementProperties	DataTypeElementProperties	Table	null	false	DATATYPEELEMENTPROPERTIES	false	mmuuid:64bdb6c0-c7fe-1de7-ad1c-f3ce4292824e	0	null	true	false",
-				"System	System.Elements	Elements	Table	null	false	ELEMENTS	false	mmuuid:6c04a1c0-0d14-1de0-be14-9d00a629c112	0	null	true	false",
-				"System	System.VirtualDatabases	VirtualDatabases	Table	null	false	VIRTUALDATABASES	false	mmuuid:7ce634df-2953-1de6-8a38-9d76e1f90f2e	0	null	true	false",
-				"System	System.KeyProperties	KeyProperties	Table	null	false	KEYPROPERTIES	false	mmuuid:8f87b840-10f8-1ff5-a438-98ce9bfae8da	0	null	true	false",
-				"System	System.JDBC.ReferenceKeyColumns	ReferenceKeyColumns	Table	null	false	REFERENCEKEYCOLUMNS	false	mmuuid:9d4fe980-2c99-1f8d-a539-a73e664462a1	0	null	true	false",
-				"System	System.DataTypeElements	DataTypeElements	Table	null	false	DATATYPEELEMENTS	false	mmuuid:b22df900-c6f1-1de7-b515-bad6cb0abb8d	0	null	true	false",
-				"System	System.ElementProperties	ElementProperties	Table	null	false	ELEMENTPROPERTIES	false	mmuuid:b4c43500-c514-1de7-b515-bad6cb0abb8d	0	null	true	false",
-				"System	System.ProcedureParams	ProcedureParams	Table	null	false	PROCEDUREPARAMS	false	mmuuid:b86f5f40-1107-1de0-8701-e0b030c0afb8	0	null	true	false",
-				"System	System.Groups	Groups	Table	null	false	GROUPS	false	mmuuid:c5c23382-e000-1ddf-aa2e-88f814a79e93	0	null	true	false",
-				"System	System.DataTypes	DataTypes	Table	null	false	DATATYPES	false	mmuuid:c5c23386-e000-1ddf-aa2e-88f814a79e93	0	null	true	false",
-				"System	System.DataTypeProperties	DataTypeProperties	Table	null	false	DATATYPEPROPERTIES	false	mmuuid:c68bf240-c894-1de7-ad1c-f3ce4292824e	0	null	true	false",
-				"System	System.Keys	Keys	Table	null	false	KEYS	false	mmuuid:d0e3fe00-0d1f-1de0-be14-9d00a629c112	0	null	true	false",
-				"System	System.KeyElements	KeyElements	Table	null	false	KEYELEMENTS	false	mmuuid:ee7d0140-0efb-1de0-8c1f-ee86b9bb7e7f	0	null	true	false",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PARTS	Table	PARTS	true	PARTS	true	mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590	16	null	false	false",
-				"System	System.GroupProperties	GroupProperties	Table	null	false	GROUPPROPERTIES	false	mmuuid:f97f87c0-c47f-1de7-b515-bad6cb0abb8d	0	null	true	false",
-				"System	System.Procedures	Procedures	Table	null	false	PROCEDURES	false	mmuuid:fd2b3700-0f9d-1de0-8701-e0b030c0afb8	0	null	true	false",
+				"ModelName[string]	FullName[string]	Name[string]	Type[string]	NameInSource[string]	IsPhysical[boolean]	UpperName[string]	SupportsUpdates[boolean]	UID[string]	Cardinality[integer]	Description[string]	IsSystem[boolean]	IsMaterialized[boolean]", //$NON-NLS-1$
+				"System	System.Models	Models	Table	null	false	MODELS	false	mmuuid:0193bfc0-e013-1ddf-aa2e-88f814a79e93	0	null	true	false", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIP_VIA	Table	SHIP_VIA	true	SHIP_VIA	true	mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590	4	null	false	false", //$NON-NLS-1$
+				"System	System.ModelProperties	ModelProperties	Table	null	false	MODELPROPERTIES	false	mmuuid:135f7080-c370-1de7-b515-bad6cb0abb8d	0	null	true	false", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS	Table	STATUS	true	STATUS	true	mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590	3	null	false	false", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER	Table	SUPPLIER	true	SUPPLIER	true	mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590	16	null	false	false", //$NON-NLS-1$
+				"System	System.ProcedureProperties	ProcedureProperties	Table	null	false	PROCEDUREPROPERTIES	false	mmuuid:2ec88080-c5b1-1de7-b515-bad6cb0abb8d	0	null	true	false", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_PARTS	Table	SUPPLIER_PARTS	true	SUPPLIER_PARTS	true	mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590	227	null	false	false", //$NON-NLS-1$
+				"System	System.ODBC.OA_TABLES	OA_TABLES	Table	null	false	OA_TABLES	false	mmuuid:54cbf440-2ca5-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.ODBC.OA_COLUMNS	OA_COLUMNS	Table	null	false	OA_COLUMNS	false	mmuuid:54cbf446-2ca5-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.ODBC.OA_PROC	OA_PROC	Table	null	false	OA_PROC	false	mmuuid:55b0d600-2ca5-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.ODBC.OA_PROCCOLUMNS	OA_PROCCOLUMNS	Table	null	false	OA_PROCCOLUMNS	false	mmuuid:56a4fa00-2ca5-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.ODBC.OA_TYPES	OA_TYPES	Table	null	false	OA_TYPES	false	mmuuid:57991e00-2ca5-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.ODBC.OA_STATISTICS	OA_STATISTICS	Table	null	false	OA_STATISTICS	false	mmuuid:57991e10-2ca5-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.ODBC.OA_FKEYS	OA_FKEYS	Table	null	false	OA_FKEYS	false	mmuuid:587dffc0-2ca5-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.DataTypeElementProperties	DataTypeElementProperties	Table	null	false	DATATYPEELEMENTPROPERTIES	false	mmuuid:64bdb6c0-c7fe-1de7-ad1c-f3ce4292824e	0	null	true	false", //$NON-NLS-1$
+				"System	System.Elements	Elements	Table	null	false	ELEMENTS	false	mmuuid:6c04a1c0-0d14-1de0-be14-9d00a629c112	0	null	true	false", //$NON-NLS-1$
+				"System	System.VirtualDatabases	VirtualDatabases	Table	null	false	VIRTUALDATABASES	false	mmuuid:7ce634df-2953-1de6-8a38-9d76e1f90f2e	0	null	true	false", //$NON-NLS-1$
+				"System	System.KeyProperties	KeyProperties	Table	null	false	KEYPROPERTIES	false	mmuuid:8f87b840-10f8-1ff5-a438-98ce9bfae8da	0	null	true	false", //$NON-NLS-1$
+				"System	System.JDBC.ReferenceKeyColumns	ReferenceKeyColumns	Table	null	false	REFERENCEKEYCOLUMNS	false	mmuuid:9d4fe980-2c99-1f8d-a539-a73e664462a1	0	null	true	false", //$NON-NLS-1$
+				"System	System.DataTypeElements	DataTypeElements	Table	null	false	DATATYPEELEMENTS	false	mmuuid:b22df900-c6f1-1de7-b515-bad6cb0abb8d	0	null	true	false", //$NON-NLS-1$
+				"System	System.ElementProperties	ElementProperties	Table	null	false	ELEMENTPROPERTIES	false	mmuuid:b4c43500-c514-1de7-b515-bad6cb0abb8d	0	null	true	false", //$NON-NLS-1$
+				"System	System.ProcedureParams	ProcedureParams	Table	null	false	PROCEDUREPARAMS	false	mmuuid:b86f5f40-1107-1de0-8701-e0b030c0afb8	0	null	true	false", //$NON-NLS-1$
+				"System	System.Groups	Groups	Table	null	false	GROUPS	false	mmuuid:c5c23382-e000-1ddf-aa2e-88f814a79e93	0	null	true	false", //$NON-NLS-1$
+				"System	System.DataTypes	DataTypes	Table	null	false	DATATYPES	false	mmuuid:c5c23386-e000-1ddf-aa2e-88f814a79e93	0	null	true	false", //$NON-NLS-1$
+				"System	System.DataTypeProperties	DataTypeProperties	Table	null	false	DATATYPEPROPERTIES	false	mmuuid:c68bf240-c894-1de7-ad1c-f3ce4292824e	0	null	true	false", //$NON-NLS-1$
+				"System	System.Keys	Keys	Table	null	false	KEYS	false	mmuuid:d0e3fe00-0d1f-1de0-be14-9d00a629c112	0	null	true	false", //$NON-NLS-1$
+				"System	System.KeyElements	KeyElements	Table	null	false	KEYELEMENTS	false	mmuuid:ee7d0140-0efb-1de0-8c1f-ee86b9bb7e7f	0	null	true	false", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PARTS	Table	PARTS	true	PARTS	true	mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590	16	null	false	false", //$NON-NLS-1$
+				"System	System.GroupProperties	GroupProperties	Table	null	false	GROUPPROPERTIES	false	mmuuid:f97f87c0-c47f-1de7-b515-bad6cb0abb8d	0	null	true	false", //$NON-NLS-1$
+				"System	System.Procedures	Procedures	Table	null	false	PROCEDURES	false	mmuuid:fd2b3700-0f9d-1de0-8701-e0b030c0afb8	0	null	true	false", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* from System.Groups order by UID",
+		executeAndAssertResults("select* from System.Groups order by UID", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testDataTypeElements() {
+	@Test public void testDataTypeElements() {
 
-		String[] expected = { "DataTypeName[string]	Name[string]	Position[integer]	Scale[integer]	ElementLength[integer]	UID[string]", };
-		executeAndAssertResults("select* from System.DataTypeElements",
+		String[] expected = { "DataTypeName[string]	Name[string]	Position[integer]	Scale[integer]	ElementLength[integer]	UID[string]", }; //$NON-NLS-1$
+		executeAndAssertResults("select* from System.DataTypeElements", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testDataTypes() {
+	@Test public void testDataTypes() {
 
 		String[] expected = {
-				"Name[string]	IsStandard[boolean]	IsPhysical[boolean]	TypeName[string]	JavaClass[string]	Scale[integer]	TypeLength[integer]	NullType[string]	IsSigned[boolean]	IsAutoIncremented[boolean]	IsCaseSensitive[boolean]	Precision[integer]	Radix[integer]	SearchType[string]	UID[string]	RuntimeType[string]	BaseType[string]	Description[string]",
-				"ENTITIES	false	false	ENTITIES	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:20360100-e742-1e20-8c26-a038c6ed7576	string	ENTITY	null",
-				"ENTITY	false	false	ENTITY	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576	string	NCName	null",
-				"ID	false	false	ID	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576	string	NCName	null",
-				"IDREF	false	false	IDREF	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576	string	NCName	null",
-				"IDREFS	false	false	IDREFS	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576	string	IDREF	null",
-				"NCName	false	false	NCName	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576	string	Name	null",
-				"NMTOKEN	false	false	NMTOKEN	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879	string	token	null",
-				"NMTOKENS	false	false	NMTOKENS	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576	string	NMTOKEN	null",
-				"NOTATION	false	false	NOTATION	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e	string	anySimpleType	null",
-				"Name	false	false	Name	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576	string	token	null",
-				"QName	false	false	QName	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e	string	anySimpleType	null",
-				"XMLLiteral	false	false	XMLLiteral	com.metamatrix.common.types.XMLType	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32	xml	string	null",
-				"anyURI	false	false	anyURI	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e	string	anySimpleType	null",
-				"base64Binary	false	false	base64Binary	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7	string	anySimpleType	null",
-				"bigdecimal	false	false	bigdecimal	java.math.BigDecimal	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d	bigdecimal	decimal	null",
-				"biginteger	false	false	biginteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d	biginteger	decimal	null",
-				"blob	false	false	blob	com.metamatrix.common.types.BlobType	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95	blob	base64Binary	null",
-				"boolean	false	false	boolean	java.lang.Boolean	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7	boolean	anySimpleType	null",
-				"byte	false	false	byte	java.lang.Byte	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016	byte	short	null",
-				"char	false	false	char	java.lang.Character	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d	char	string	null",
-				"clob	false	false	clob	com.metamatrix.common.types.ClobType	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3	clob	string	null",
-				"date	false	false	date	java.sql.Date	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7	date	anySimpleType	null",
-				"dateTime	false	false	dateTime	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21	timestamp	anySimpleType	null",
-				"decimal	false	false	decimal	java.math.BigDecimal	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7	bigdecimal	anySimpleType	null",
-				"double	false	false	double	java.lang.Double	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7	double	anySimpleType	null",
-				"duration	false	false	duration	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21	string	anySimpleType	null",
-				"float	false	false	float	java.lang.Float	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7	float	anySimpleType	null",
-				"gDay	false	false	gDay	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21	biginteger	anySimpleType	null",
-				"gMonth	false	false	gMonth	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21	biginteger	anySimpleType	null",
-				"gMonthDay	false	false	gMonthDay	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21	timestamp	anySimpleType	null",
-				"gYear	false	false	gYear	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21	biginteger	anySimpleType	null",
-				"gYearMonth	false	false	gYearMonth	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21	timestamp	anySimpleType	null",
-				"hexBinary	false	false	hexBinary	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7	string	anySimpleType	null",
-				"int	false	false	int	java.lang.Integer	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016	integer	long	null",
-				"integer	false	false	integer	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576	biginteger	decimal	null",
-				"language	false	false	language	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576	string	token	null",
-				"long	false	false	long	java.lang.Long	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016	long	integer	null",
-				"negativeInteger	false	false	negativeInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016	biginteger	nonPositiveInteger	null",
-				"nonNegativeInteger	false	false	nonNegativeInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016	biginteger	integer	null",
-				"nonPositiveInteger	false	false	nonPositiveInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576	biginteger	integer	null",
-				"normalizedString	false	false	normalizedString	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:4df43700-3b13-1e20-921b-eeee28353879	string	string	null",
-				"object	false	false	object	java.lang.Object	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79	object	base64Binary	null",
-				"positiveInteger	false	false	positiveInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016	biginteger	nonNegativeInteger	null",
-				"short	false	false	short	java.lang.Short	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016	short	int	null",
-				"string	false	false	string	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7	string	anySimpleType	null",
-				"time	false	false	time	java.sql.Time	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7	time	anySimpleType	null",
-				"timestamp	false	false	timestamp	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d	timestamp	string	null",
-				"token	false	false	token	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a	string	normalizedString	null",
-				"unsignedByte	false	false	unsignedByte	java.lang.Short	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016	short	unsignedShort	null",
-				"unsignedInt	false	false	unsignedInt	java.lang.Long	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016	long	unsignedLong	null",
-				"unsignedLong	false	false	unsignedLong	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:54b98780-ba14-1e21-b812-969c8fc8b016	biginteger	nonNegativeInteger	null",
-				"unsignedShort	false	false	unsignedShort	java.lang.Integer	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:327093c0-ba88-1e21-b812-969c8fc8b016	integer	unsignedInt	null",
+				"Name[string]	IsStandard[boolean]	IsPhysical[boolean]	TypeName[string]	JavaClass[string]	Scale[integer]	TypeLength[integer]	NullType[string]	IsSigned[boolean]	IsAutoIncremented[boolean]	IsCaseSensitive[boolean]	Precision[integer]	Radix[integer]	SearchType[string]	UID[string]	RuntimeType[string]	BaseType[string]	Description[string]", //$NON-NLS-1$
+				"ENTITIES	false	false	ENTITIES	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:20360100-e742-1e20-8c26-a038c6ed7576	string	ENTITY	null", //$NON-NLS-1$
+				"ENTITY	false	false	ENTITY	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576	string	NCName	null", //$NON-NLS-1$
+				"ID	false	false	ID	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576	string	NCName	null", //$NON-NLS-1$
+				"IDREF	false	false	IDREF	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576	string	NCName	null", //$NON-NLS-1$
+				"IDREFS	false	false	IDREFS	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576	string	IDREF	null", //$NON-NLS-1$
+				"NCName	false	false	NCName	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576	string	Name	null", //$NON-NLS-1$
+				"NMTOKEN	false	false	NMTOKEN	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879	string	token	null", //$NON-NLS-1$
+				"NMTOKENS	false	false	NMTOKENS	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576	string	NMTOKEN	null", //$NON-NLS-1$
+				"NOTATION	false	false	NOTATION	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e	string	anySimpleType	null", //$NON-NLS-1$
+				"Name	false	false	Name	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576	string	token	null", //$NON-NLS-1$
+				"QName	false	false	QName	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e	string	anySimpleType	null", //$NON-NLS-1$
+				"XMLLiteral	false	false	XMLLiteral	com.metamatrix.common.types.XMLType	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32	xml	string	null", //$NON-NLS-1$
+				"anyURI	false	false	anyURI	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e	string	anySimpleType	null", //$NON-NLS-1$
+				"base64Binary	false	false	base64Binary	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7	string	anySimpleType	null", //$NON-NLS-1$
+				"bigdecimal	false	false	bigdecimal	java.math.BigDecimal	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d	bigdecimal	decimal	null", //$NON-NLS-1$
+				"biginteger	false	false	biginteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d	biginteger	decimal	null", //$NON-NLS-1$
+				"blob	false	false	blob	com.metamatrix.common.types.BlobType	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95	blob	base64Binary	null", //$NON-NLS-1$
+				"boolean	false	false	boolean	java.lang.Boolean	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7	boolean	anySimpleType	null", //$NON-NLS-1$
+				"byte	false	false	byte	java.lang.Byte	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016	byte	short	null", //$NON-NLS-1$
+				"char	false	false	char	java.lang.Character	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d	char	string	null", //$NON-NLS-1$
+				"clob	false	false	clob	com.metamatrix.common.types.ClobType	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3	clob	string	null", //$NON-NLS-1$
+				"date	false	false	date	java.sql.Date	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7	date	anySimpleType	null", //$NON-NLS-1$
+				"dateTime	false	false	dateTime	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21	timestamp	anySimpleType	null", //$NON-NLS-1$
+				"decimal	false	false	decimal	java.math.BigDecimal	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7	bigdecimal	anySimpleType	null", //$NON-NLS-1$
+				"double	false	false	double	java.lang.Double	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7	double	anySimpleType	null", //$NON-NLS-1$
+				"duration	false	false	duration	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21	string	anySimpleType	null", //$NON-NLS-1$
+				"float	false	false	float	java.lang.Float	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7	float	anySimpleType	null", //$NON-NLS-1$
+				"gDay	false	false	gDay	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21	biginteger	anySimpleType	null", //$NON-NLS-1$
+				"gMonth	false	false	gMonth	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21	biginteger	anySimpleType	null", //$NON-NLS-1$
+				"gMonthDay	false	false	gMonthDay	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21	timestamp	anySimpleType	null", //$NON-NLS-1$
+				"gYear	false	false	gYear	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21	biginteger	anySimpleType	null", //$NON-NLS-1$
+				"gYearMonth	false	false	gYearMonth	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21	timestamp	anySimpleType	null", //$NON-NLS-1$
+				"hexBinary	false	false	hexBinary	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7	string	anySimpleType	null", //$NON-NLS-1$
+				"int	false	false	int	java.lang.Integer	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016	integer	long	null", //$NON-NLS-1$
+				"integer	false	false	integer	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576	biginteger	decimal	null", //$NON-NLS-1$
+				"language	false	false	language	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576	string	token	null", //$NON-NLS-1$
+				"long	false	false	long	java.lang.Long	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016	long	integer	null", //$NON-NLS-1$
+				"negativeInteger	false	false	negativeInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016	biginteger	nonPositiveInteger	null", //$NON-NLS-1$
+				"nonNegativeInteger	false	false	nonNegativeInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016	biginteger	integer	null", //$NON-NLS-1$
+				"nonPositiveInteger	false	false	nonPositiveInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576	biginteger	integer	null", //$NON-NLS-1$
+				"normalizedString	false	false	normalizedString	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:4df43700-3b13-1e20-921b-eeee28353879	string	string	null", //$NON-NLS-1$
+				"object	false	false	object	java.lang.Object	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79	object	base64Binary	null", //$NON-NLS-1$
+				"positiveInteger	false	false	positiveInteger	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016	biginteger	nonNegativeInteger	null", //$NON-NLS-1$
+				"short	false	false	short	java.lang.Short	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016	short	int	null", //$NON-NLS-1$
+				"string	false	false	string	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7	string	anySimpleType	null", //$NON-NLS-1$
+				"time	false	false	time	java.sql.Time	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7	time	anySimpleType	null", //$NON-NLS-1$
+				"timestamp	false	false	timestamp	java.sql.Timestamp	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d	timestamp	string	null", //$NON-NLS-1$
+				"token	false	false	token	java.lang.String	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a	string	normalizedString	null", //$NON-NLS-1$
+				"unsignedByte	false	false	unsignedByte	java.lang.Short	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016	short	unsignedShort	null", //$NON-NLS-1$
+				"unsignedInt	false	false	unsignedInt	java.lang.Long	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016	long	unsignedLong	null", //$NON-NLS-1$
+				"unsignedLong	false	false	unsignedLong	java.math.BigInteger	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:54b98780-ba14-1e21-b812-969c8fc8b016	biginteger	nonNegativeInteger	null", //$NON-NLS-1$
+				"unsignedShort	false	false	unsignedShort	java.lang.Integer	0	0	No Nulls	false	false	false	0	0	Searchable	mmuuid:327093c0-ba88-1e21-b812-969c8fc8b016	integer	unsignedInt	null", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* from System.DataTypes", expected);
+		executeAndAssertResults("select* from System.DataTypes", expected); //$NON-NLS-1$
 
 	}
 
-	public void testProcedureParams() {
+	@Test public void testProcedureParams() {
 
 		String[] expected = {
-				"ModelName[string]	ProcedureName[string]	Name[string]	DataType[string]	Position[integer]	Type[string]	Optional[boolean]	Precision[integer]	TypeLength[integer]	Scale[integer]	Radix[integer]	NullType[string]",
-				"System	System.describe	Description	string	1	ResultSet	false	128	128	0	10	No Nulls",
-				"System	System.getVDBResourcePaths	ResourcePath	string	1	ResultSet	false	50	50	0	10	Nullable",
-				"System	System.getBinaryVDBResource	VdbResource	blob	1	ResultSet	false	0	0	0	10	Nullable",
-				"System	System.getCharacterVDBResource	VdbResource	clob	1	ResultSet	false	0	0	0	10	Nullable",
-				"System	System.getUpdatedCharacterVDBResource	VdbResource	clob	1	ResultSet	false	0	0	0	10	Nullable",
-				"System	System.describe	entity	string	1	In	false	0	0	0	10	No Nulls",
-				"System	System.getVDBResourcePaths	isBinary	boolean	2	ResultSet	false	1	1	0	10	Nullable",
-				"System	System.getBinaryVDBResource	resourcePath	string	1	In	false	50	50	0	10	No Nulls",
-				"System	System.getCharacterVDBResource	resourcePath	string	1	In	false	50	50	0	10	No Nulls",
-				"System	System.getUpdatedCharacterVDBResource	resourcePath	string	1	In	false	50	50	0	10	No Nulls",
-				"System	System.getUpdatedCharacterVDBResource	tokenReplacements	object	3	In	false	0	0	0	10	No Nulls",
-				"System	System.getUpdatedCharacterVDBResource	tokens	object	2	In	false	0	0	0	10	No Nulls",
+				"ModelName[string]	ProcedureName[string]	Name[string]	DataType[string]	Position[integer]	Type[string]	Optional[boolean]	Precision[integer]	TypeLength[integer]	Scale[integer]	Radix[integer]	NullType[string]", //$NON-NLS-1$
+				"System	System.describe	Description	string	1	ResultSet	false	128	128	0	10	No Nulls", //$NON-NLS-1$
+				"System	System.getVDBResourcePaths	ResourcePath	string	1	ResultSet	false	50	50	0	10	Nullable", //$NON-NLS-1$
+				"System	System.getBinaryVDBResource	VdbResource	blob	1	ResultSet	false	0	0	0	10	Nullable", //$NON-NLS-1$
+				"System	System.getCharacterVDBResource	VdbResource	clob	1	ResultSet	false	0	0	0	10	Nullable", //$NON-NLS-1$
+				"System	System.getUpdatedCharacterVDBResource	VdbResource	clob	1	ResultSet	false	0	0	0	10	Nullable", //$NON-NLS-1$
+				"System	System.describe	entity	string	1	In	false	0	0	0	10	No Nulls", //$NON-NLS-1$
+				"System	System.getVDBResourcePaths	isBinary	boolean	2	ResultSet	false	1	1	0	10	Nullable", //$NON-NLS-1$
+				"System	System.getBinaryVDBResource	resourcePath	string	1	In	false	50	50	0	10	No Nulls", //$NON-NLS-1$
+				"System	System.getCharacterVDBResource	resourcePath	string	1	In	false	50	50	0	10	No Nulls", //$NON-NLS-1$
+				"System	System.getUpdatedCharacterVDBResource	resourcePath	string	1	In	false	50	50	0	10	No Nulls", //$NON-NLS-1$
+				"System	System.getUpdatedCharacterVDBResource	tokenReplacements	object	3	In	false	0	0	0	10	No Nulls", //$NON-NLS-1$
+				"System	System.getUpdatedCharacterVDBResource	tokens	object	2	In	false	0	0	0	10	No Nulls", //$NON-NLS-1$
 
 		};
 		executeAndAssertResults(
-				"select * from System.ProcedureParams order by Name", expected);
+				"select * from System.ProcedureParams order by Name", expected); //$NON-NLS-1$
 	}
 
-	public void testProcedures() {
+	@Test public void testProcedures() {
 
 		String[] expected = {
-				"ModelName[string]	Name[string]	NameInSource[string]	ReturnsResults[boolean]	ModelUID[string]	UID[string]	Description[string]	FullName[string]",
-				"System	describe	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:93687100-1916-1e87-8525-f813a949866a	null	System.describe",
-				"System	getBinaryVDBResource	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b85dbd44-39d9-1f33-9f26-c47bba154acc	null	System.getBinaryVDBResource",
-				"System	getCharacterVDBResource	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b85dbd40-39d9-1f33-9f26-c47bba154acc	null	System.getCharacterVDBResource",
-				"System	getUpdatedCharacterVDBResource	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b9429f00-39d9-1f33-9f26-c47bba154acc	null	System.getUpdatedCharacterVDBResource",
-				"System	getVDBResourcePaths	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b9429f06-39d9-1f33-9f26-c47bba154acc	null	System.getVDBResourcePaths",
+				"ModelName[string]	Name[string]	NameInSource[string]	ReturnsResults[boolean]	ModelUID[string]	UID[string]	Description[string]	FullName[string]", //$NON-NLS-1$
+				"System	describe	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:93687100-1916-1e87-8525-f813a949866a	null	System.describe", //$NON-NLS-1$
+				"System	getBinaryVDBResource	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b85dbd44-39d9-1f33-9f26-c47bba154acc	null	System.getBinaryVDBResource", //$NON-NLS-1$
+				"System	getCharacterVDBResource	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b85dbd40-39d9-1f33-9f26-c47bba154acc	null	System.getCharacterVDBResource", //$NON-NLS-1$
+				"System	getUpdatedCharacterVDBResource	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b9429f00-39d9-1f33-9f26-c47bba154acc	null	System.getUpdatedCharacterVDBResource", //$NON-NLS-1$
+				"System	getVDBResourcePaths	null	true	mmuuid:70ffc880-29d8-1de6-8a38-9d76e1f90f2e	mmuuid:b9429f06-39d9-1f33-9f26-c47bba154acc	null	System.getVDBResourcePaths", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* from System.Procedures", expected);
+		executeAndAssertResults("select* from System.Procedures", expected); //$NON-NLS-1$
 	}
 
-	public void testGroupProperties() {
+	@Test public void testGroupProperties() {
 
-		String[] expected = { "ModelName[string]	GroupFullName[string]	Name[string]	Value[string]	GroupName[string]	GroupUpperName[string]	UID[string]", };
-		executeAndAssertResults("select* from System.GroupProperties", expected);
+		String[] expected = { "ModelName[string]	GroupFullName[string]	Name[string]	Value[string]	GroupName[string]	GroupUpperName[string]	UID[string]", }; //$NON-NLS-1$
+		executeAndAssertResults("select* from System.GroupProperties", expected); //$NON-NLS-1$
 	}
 
-	public void testModelProperties() {
+	@Test public void testModelProperties() {
 
-		String[] expected = { "ModelName[string]	Name[string]	Value[string]	UID[string]", };
-		executeAndAssertResults("select* from System.ModelProperties", expected);
+		String[] expected = { "ModelName[string]	Name[string]	Value[string]	UID[string]", }; //$NON-NLS-1$
+		executeAndAssertResults("select* from System.ModelProperties", expected); //$NON-NLS-1$
 	}
 
-	public void testProcedureProperties() {
+	@Test public void testProcedureProperties() {
 
-		String[] expected = { "ModelName[string]	ProcedureName[string]	Name[string]	Value[string]	UID[string]",
+		String[] expected = { "ModelName[string]	ProcedureName[string]	Name[string]	Value[string]	UID[string]", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* from System.ProcedureProperties",
+		executeAndAssertResults("select* from System.ProcedureProperties", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testVirtualDatabase() {
+	@Test public void testVirtualDatabase() {
 
-		String[] expected = { "Name[string]	Version[string]	", "PartsSupplier	1",
+		String[] expected = { "Name[string]	Version[string]	", "PartsSupplier	1", //$NON-NLS-1$ //$NON-NLS-2$
 
 		};
-		executeAndAssertResults("select* from System.VirtualDatabases",
+		executeAndAssertResults("select* from System.VirtualDatabases", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testKeyElements() {
+	@Test public void testKeyElements() {
 
 		String[] expected = {
-				"ModelName[string]	GroupFullName[string]	Name[string]	KeyName[string]	KeyType[string]	GroupName[string]	GroupUpperName[string]	RefKeyUID[string]	UID[string]	Position[integer]",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PART_ID	PK_PARTS	Primary	PARTS	PARTS	null	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590	1",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIPPER_ID	PK_SHIP_VIA	Primary	SHIP_VIA	SHIP_VIA	null	mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590	1",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_ID	PK_STATUS	Primary	STATUS	STATUS	null	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590	1",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_ID	PK_SUPPLIER	Primary	SUPPLIER	SUPPLIER	null	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590	1",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATUS	FK_SPLIER_STATS	Foreign	SUPPLIER	SUPPLIER	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590	mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590	1",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	PK_SUPPLIER_PARTS	Primary	SUPPLIER_PARTS	SUPPLIER_PARTS	null	mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590	2",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	FK_SPLIER_PRTS_PRTS	Foreign	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590	1",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	PK_SUPPLIER_PARTS	Primary	SUPPLIER_PARTS	SUPPLIER_PARTS	null	mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590	1",
-				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	FK_SPLY_PRTS_SPLY	Foreign	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590	1",
+				"ModelName[string]	GroupFullName[string]	Name[string]	KeyName[string]	KeyType[string]	GroupName[string]	GroupUpperName[string]	RefKeyUID[string]	UID[string]	Position[integer]", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PART_ID	PK_PARTS	Primary	PARTS	PARTS	null	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIPPER_ID	PK_SHIP_VIA	Primary	SHIP_VIA	SHIP_VIA	null	mmuuid:18aa3cc0-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_ID	PK_STATUS	Primary	STATUS	STATUS	null	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_ID	PK_SUPPLIER	Primary	SUPPLIER	SUPPLIER	null	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATUS	FK_SPLIER_STATS	Foreign	SUPPLIER	SUPPLIER	mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590	mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	PK_SUPPLIER_PARTS	Primary	SUPPLIER_PARTS	SUPPLIER_PARTS	null	mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590	2", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	FK_SPLIER_PRTS_PRTS	Foreign	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:07db4240-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c0-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	PK_SUPPLIER_PARTS	Primary	SUPPLIER_PARTS	SUPPLIER_PARTS	null	mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	FK_SPLY_PRTS_SPLY	Foreign	SUPPLIER_PARTS	SUPPLIER_PARTS	mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590	mmuuid:66ddc4c1-73ff-1edc-a81c-ecf397b10590	1", //$NON-NLS-1$
 
 		};
 		executeAndAssertResults(
-				"select* from System.KeyElements order by GroupFullName, Name",
+				"select* from System.KeyElements order by GroupFullName, Name", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testElementProperties() {
+	@Test public void testElementProperties() {
 
-		String[] expected = { "ModelName[string]	GroupFullName[string]	ElementName[string]	Name[string]	Value[string]	GroupName[string]	ElementUpperName[string]	GroupUpperName[string]	UID[string]", };
-		executeAndAssertResults("select* from System.ElementProperties",
+		String[] expected = { "ModelName[string]	GroupFullName[string]	ElementName[string]	Name[string]	Value[string]	GroupName[string]	ElementUpperName[string]	GroupUpperName[string]	UID[string]", }; //$NON-NLS-1$
+		executeAndAssertResults("select* from System.ElementProperties", //$NON-NLS-1$
 				expected);
 
 	}
 
-	public void testDataTypeElementProperties() {
+	@Test public void testDataTypeElementProperties() {
 
-		String[] expected = { "DataTypeName[string]	DataTypeElementName[string]	Name[string]	Value[string]	UID[string]",
+		String[] expected = { "DataTypeName[string]	DataTypeElementName[string]	Name[string]	Value[string]	UID[string]", //$NON-NLS-1$
 
 		};
 		executeAndAssertResults(
-				"select* from System.DataTypeElementProperties", expected);
+				"select* from System.DataTypeElementProperties", expected); //$NON-NLS-1$
 	}
 
-	public void testDescribe() {
-		executeStoredProcedure("exec System.describe(?)", new Object[] {"parts"});
-		String[] expected = { "Description[string]", };
+	@Test public void testDescribe() {
+		execute("exec System.describe(?)", new Object[] {"parts"}); //$NON-NLS-1$ //$NON-NLS-2$
+		String[] expected = { "Description[string]", }; //$NON-NLS-1$
 		assertResults(expected);
 	}
 
-	public void testVDBResourcePathsProcedure() {
+	@Test public void testVDBResourcePathsProcedure() {
 
-		String[] expected = { "ResourcePath[string]	isBinary[boolean]	",
-				"/parts/partsmd/PartsSupplier.xmi	false",
-				"/System/System.xmi	false",
+		String[] expected = { "ResourcePath[string]	isBinary[boolean]	", //$NON-NLS-1$
+				"/parts/partsmd/PartsSupplier.xmi	false", //$NON-NLS-1$
+				"/System/System.xmi	false", //$NON-NLS-1$
 		};
-		executeStoredProcedure("exec System.getVDBResourcePaths()",new Object[] {});
+		execute("exec System.getVDBResourcePaths()",new Object[] {}); //$NON-NLS-1$
 		assertResults(expected);
 	}
 
-	public void testElements() {
+	@Test public void testElements() {
 
 		String[] expected = {
-				"ModelName[string]	GroupName[string]	GroupFullName[string]	Name[string]	Position[integer]	NameInSource[string]	DataType[string]	Scale[integer]	ElementLength[integer]	IsLengthFixed[boolean]	SupportsSelect[boolean]	SupportsUpdates[boolean]	IsCaseSensitive[boolean]	IsSigned[boolean]	IsCurrency[boolean]	IsAutoIncremented[boolean]	NullType[string]	MinRange[string]	MaxRange[string]	SearchType[string]	Format[string]	DefaultValue[string]	JavaClass[string]	Precision[integer]	CharOctetLength[integer]	Radix[integer]	GroupUpperName[string]	UpperName[string]	UID[string]	Description[string]",
-				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_NAME	2	PART_NAME	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	PARTS	PART_NAME	mmuuid:0067e900-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_COLOR	3	PART_COLOR	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	PARTS	PART_COLOR	mmuuid:015c0d00-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_WEIGHT	4	PART_WEIGHT	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	PARTS	PART_WEIGHT	mmuuid:015c0d01-73ff-1edc-a81c-ecf397b10590	null",
-				"System	Keys	System.Keys	GroupUpperName	9	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	GROUPUPPERNAME	mmuuid:07268b40-c2f4-1de7-b515-bad6cb0abb8d	null",
-				"PartsSupplier	SHIP_VIA	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIPPER_ID	1	SHIPPER_ID	short	0	0	true	true	true	false	true	false	false	No Nulls	null	null	All Except Like	null	null	java.lang.Short	2	0	10	SHIP_VIA	SHIPPER_ID	mmuuid:121bc540-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SHIP_VIA	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIPPER_NAME	2	SHIPPER_NAME	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	SHIP_VIA	SHIPPER_NAME	mmuuid:130fe940-73ff-1edc-a81c-ecf397b10590	null",
-				"System	DataTypes	System.DataTypes	Name	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPES	NAME	mmuuid:15b71f00-c266-1de7-b515-bad6cb0abb8d	null",
-				"PartsSupplier	STATUS	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_ID	1	STATUS_ID	short	0	0	true	true	true	false	true	false	false	No Nulls	null	null	All Except Like	null	null	java.lang.Short	2	0	10	STATUS	STATUS_ID	mmuuid:201d9600-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	STATUS	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_NAME	2	STATUS_NAME	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	STATUS	STATUS_NAME	mmuuid:201d9601-73ff-1edc-a81c-ecf397b10590	null",
-				"System	Models	System.Models	Description	10	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELS	DESCRIPTION	mmuuid:2268b040-3a47-1edb-8606-be949cc6da52	null",
-				"System	ProcedureParams	System.ProcedureParams	Precision	8	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	PROCEDUREPARAMS	PRECISION	mmuuid:2626ed80-634e-1e44-a903-c1472e78d1c5	null",
-				"System	ModelProperties	System.ModelProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELPROPERTIES	MODELNAME	mmuuid:2afa8d80-c3cd-1de7-b515-bad6cb0abb8d	null",
-				"System	ModelProperties	System.ModelProperties	UID	4	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	MODELPROPERTIES	UID	mmuuid:2afa8d82-c3cd-1de7-b515-bad6cb0abb8d	null",
-				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_ID	1	SUPPLIER_ID	string	0	10	false	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	10	10	SUPPLIER	SUPPLIER_ID	mmuuid:2f044880-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_NAME	2	SUPPLIER_NAME	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	SUPPLIER	SUPPLIER_NAME	mmuuid:2f044881-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATUS	3	SUPPLIER_STATUS	short	0	0	true	true	true	false	true	false	false	Nullable	null	null	All Except Like	null	null	java.lang.Short	2	0	10	SUPPLIER	SUPPLIER_STATUS	mmuuid:2f044882-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_CITY	4	SUPPLIER_CITY	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	SUPPLIER	SUPPLIER_CITY	mmuuid:2fe92a40-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATE	5	SUPPLIER_STATE	string	0	2	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	2	10	SUPPLIER	SUPPLIER_STATE	mmuuid:2fe92a41-73ff-1edc-a81c-ecf397b10590	null",
-				"System	Procedures	System.Procedures	NameInSource	3	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDURES	NAMEINSOURCE	mmuuid:339a9a00-35fc-1dee-8e07-e3cb3008f82b	null",
-				"System	DataTypeElementProperties	System.DataTypeElementProperties	DataTypeName	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPEELEMENTPROPERTIES	DATATYPENAME	mmuuid:34af31c0-c88f-1de7-ad1c-f3ce4292824e	null",
-				"System	DataTypeElementProperties	System.DataTypeElementProperties	DataTypeElementName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEELEMENTPROPERTIES	DATATYPEELEMENTNAME	mmuuid:34af31c1-c88f-1de7-ad1c-f3ce4292824e	null",
-				"System	DataTypeElementProperties	System.DataTypeElementProperties	Name	3	null	string	0	50	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEELEMENTPROPERTIES	NAME	mmuuid:34af31c2-c88f-1de7-ad1c-f3ce4292824e	null",
-				"System	DataTypeElementProperties	System.DataTypeElementProperties	UID	5	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEELEMENTPROPERTIES	UID	mmuuid:34af31c3-c88f-1de7-ad1c-f3ce4292824e	null",
-				"System	DataTypeElementProperties	System.DataTypeElementProperties	Value	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEELEMENTPROPERTIES	VALUE	mmuuid:35941381-c88f-1de7-ad1c-f3ce4292824e	null",
-				"System	Elements	System.Elements	Description	30	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	DESCRIPTION	mmuuid:36fd7640-3a50-1edb-8606-be949cc6da52	null",
-				"System	KeyElements	System.KeyElements	Position	10	null	integer	0	10	true	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	KEYELEMENTS	POSITION	mmuuid:39d26b40-396b-1edb-8606-be949cc6da52	null",
-				"System	ProcedureProperties	System.ProcedureProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	MODELNAME	mmuuid:3a5c9f42-c5f6-1de7-b515-bad6cb0abb8d	null",
-				"System	ProcedureProperties	System.ProcedureProperties	ProcedureName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	PROCEDURENAME	mmuuid:3a5c9f43-c5f6-1de7-b515-bad6cb0abb8d	null",
-				"System	ProcedureProperties	System.ProcedureProperties	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	NAME	mmuuid:3a5c9f45-c5f6-1de7-b515-bad6cb0abb8d	null",
-				"System	ProcedureProperties	System.ProcedureProperties	UID	5	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	PROCEDUREPROPERTIES	UID	mmuuid:3a5c9f46-c5f6-1de7-b515-bad6cb0abb8d	null",
-				"System	ProcedureProperties	System.ProcedureProperties	Value	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	VALUE	mmuuid:3a5c9f48-c5f6-1de7-b515-bad6cb0abb8d	null",
-				"System	ModelProperties	System.ModelProperties	Name	2	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELPROPERTIES	NAME	mmuuid:3c881f40-c3dc-1de7-b515-bad6cb0abb8d	null",
-				"System	ModelProperties	System.ModelProperties	Value	3	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELPROPERTIES	VALUE	mmuuid:3c881f41-c3dc-1de7-b515-bad6cb0abb8d	null",
-				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	1	SUPPLIER_ID	string	0	10	false	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	10	10	SUPPLIER_PARTS	SUPPLIER_ID	mmuuid:3ecfdcc0-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	2	PART_ID	string	0	4	true	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	4	10	SUPPLIER_PARTS	PART_ID	mmuuid:3fc400c0-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	QUANTITY	3	QUANTITY	short	0	0	true	true	true	false	true	false	false	Nullable	null	null	All Except Like	null	null	java.lang.Short	3	0	10	SUPPLIER_PARTS	QUANTITY	mmuuid:3fc400c1-73ff-1edc-a81c-ecf397b10590	null",
-				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SHIPPER_ID	4	SHIPPER_ID	short	0	0	true	true	true	false	true	false	false	Nullable	null	null	All Except Like	null	null	java.lang.Short	2	0	10	SUPPLIER_PARTS	SHIPPER_ID	mmuuid:3fc400c2-73ff-1edc-a81c-ecf397b10590	null",
-				"System	Models	System.Models	UID	9	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	MODELS	UID	mmuuid:4610fe00-b6d6-1de7-b705-ef2376c3949e	null",
-				"System	DataTypeElements	System.DataTypeElements	DataTypeName	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPEELEMENTS	DATATYPENAME	mmuuid:49bf3600-c74a-1de7-b515-bad6cb0abb8d	null",
-				"System	DataTypeElements	System.DataTypeElements	Name	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEELEMENTS	NAME	mmuuid:49bf3601-c74a-1de7-b515-bad6cb0abb8d	null",
-				"System	DataTypeElements	System.DataTypeElements	Position	3	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPEELEMENTS	POSITION	mmuuid:49bf3602-c74a-1de7-b515-bad6cb0abb8d	null",
-				"System	DataTypeElements	System.DataTypeElements	UID	6	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEELEMENTS	UID	mmuuid:49bf3604-c74a-1de7-b515-bad6cb0abb8d	null",
-				"System	DataTypeElements	System.DataTypeElements	Scale	4	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPEELEMENTS	SCALE	mmuuid:49bf3605-c74a-1de7-b515-bad6cb0abb8d	null",
-				"System	DataTypeElements	System.DataTypeElements	ElementLength	5	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPEELEMENTS	ELEMENTLENGTH	mmuuid:49bf3606-c74a-1de7-b515-bad6cb0abb8d	null",
-				"System	DataTypes	System.DataTypes	TypeLength	7	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	DATATYPES	TYPELENGTH	mmuuid:505f1740-b823-1de7-b705-ef2376c3949e	null",
-				"System	Models	System.Models	Name	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELS	NAME	mmuuid:51706d40-b6d0-1de7-b705-ef2376c3949e	null",
-				"System	Groups	System.Groups	SupportsUpdates	8	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	GROUPS	SUPPORTSUPDATES	mmuuid:533fa200-348c-1e06-9501-aee4d16940ab	null",
-				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_OWNER	mmuuid:54cbf441-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TABLES	System.ODBC.OA_TABLES	REMARKS	5	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_TABLES	REMARKS	mmuuid:54cbf442-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_TYPE	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_TYPE	mmuuid:54cbf443-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_NAME	mmuuid:54cbf444-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_QUALIFIER	mmuuid:54cbf445-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TABLE_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	TABLE_QUALIFIER	mmuuid:54cbf447-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_NULLABLE	11	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	OA_NULLABLE	mmuuid:54cbf448-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_SCALE	9	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_SCALE	mmuuid:54cbf449-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	TABLE_NAME	mmuuid:54cbf44a-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	REMARKS	15	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_COLUMNS	REMARKS	mmuuid:54cbf44b-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_COLUMNTYPE	14	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	OA_COLUMNTYPE	mmuuid:54cbf44c-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_PRECISION	8	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_PRECISION	mmuuid:54cbf44d-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_RADIX	10	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_RADIX	mmuuid:54cbf44e-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_LENGTH	7	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_LENGTH	mmuuid:54cbf44f-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	COLUMN_NAME	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	COLUMN_NAME	mmuuid:54cbf450-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_SCOPE	12	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	OA_SCOPE	mmuuid:54cbf451-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	DATA_TYPE	5	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	DATA_TYPE	mmuuid:54cbf452-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TYPE_NAME	6	null	string	0	100	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	100	100	10	OA_COLUMNS	TYPE_NAME	mmuuid:54cbf453-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	PSEUDO_COLUMN	13	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	PSEUDO_COLUMN	mmuuid:54cbf454-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	TABLE_OWNER	mmuuid:54cbf455-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	ElementProperties	System.ElementProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	MODELNAME	mmuuid:54d5e2c2-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	ElementProperties	System.ElementProperties	GroupName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	GROUPNAME	mmuuid:54d5e2c3-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	ElementProperties	System.ElementProperties	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	ELEMENTPROPERTIES	GROUPFULLNAME	mmuuid:54d5e2c4-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	ElementProperties	System.ElementProperties	ElementName	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	ELEMENTNAME	mmuuid:54d5e2c5-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	ElementProperties	System.ElementProperties	Name	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	NAME	mmuuid:54d5e2c6-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	ElementProperties	System.ElementProperties	UID	9	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTPROPERTIES	UID	mmuuid:54d5e2c7-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	ElementProperties	System.ElementProperties	Value	5	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	VALUE	mmuuid:54d5e2c9-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	REMARKS	7	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_PROC	REMARKS	mmuuid:55b0d601-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	OA_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROC	OA_OWNER	mmuuid:55b0d602-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	OA_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROC	OA_QUALIFIER	mmuuid:55b0d603-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	NUM_OUTPUT_PARAMS	5	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROC	NUM_OUTPUT_PARAMS	mmuuid:55b0d604-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	NUM_INPUT_PARAMS	4	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROC	NUM_INPUT_PARAMS	mmuuid:55b0d605-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	OA_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROC	OA_NAME	mmuuid:55b0d606-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	PROCEDURE_TYPE	8	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROC	PROCEDURE_TYPE	mmuuid:55b0d607-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROC	System.ODBC.OA_PROC	NUM_RESULT_SETS	6	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROC	NUM_RESULT_SETS	mmuuid:55b0d608-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	ElementProperties	System.ElementProperties	GroupUpperName	8	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	GROUPUPPERNAME	mmuuid:55bac480-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	ElementProperties	System.ElementProperties	ElementUpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	ELEMENTUPPERNAME	mmuuid:55bac481-c59f-1de7-b515-bad6cb0abb8d	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_LENGTH	9	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_LENGTH	mmuuid:56a4fa01-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_PRECISION	8	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_PRECISION	mmuuid:56a4fa02-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	COLUMN_NAME	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	COLUMN_NAME	mmuuid:56a4fa03-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	REMARKS	14	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_PROCCOLUMNS	REMARKS	mmuuid:56a4fa04-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	OA_NAME	mmuuid:56a4fa05-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_RADIX	10	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_RADIX	mmuuid:56a4fa06-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	DATA_TYPE	6	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	DATA_TYPE	mmuuid:56a4fa07-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_SCALE	11	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_SCALE	mmuuid:56a4fa08-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_SCOPE	13	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	OA_SCOPE	mmuuid:56a4fa09-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	TYPE_NAME	7	null	string	0	100	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	100	100	10	OA_PROCCOLUMNS	TYPE_NAME	mmuuid:56a4fa0a-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	OA_QUALIFIER	mmuuid:56a4fa0b-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	OA_OWNER	mmuuid:56a4fa0c-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_NULLABLE	12	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	OA_NULLABLE	mmuuid:56a4fa0d-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_COLUMNTYPE	5	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	OA_COLUMNTYPE	mmuuid:56a4fa0e-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	CREATE_PARAMS	6	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_TYPES	CREATE_PARAMS	mmuuid:57991e01-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	LITERAL_PREFIX	4	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_TYPES	LITERAL_PREFIX	mmuuid:57991e02-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	AUTO_INCREMENT	12	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	AUTO_INCREMENT	mmuuid:57991e03-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_MONEY	11	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	OA_MONEY	mmuuid:57991e04-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	MINIMUM_SCALE	13	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	MINIMUM_SCALE	mmuuid:57991e05-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_PRECISION	3	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_TYPES	OA_PRECISION	mmuuid:57991e06-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	DATA_TYPE	2	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	DATA_TYPE	mmuuid:57991e07-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	MAXIMUM_SCALE	14	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	MAXIMUM_SCALE	mmuuid:57991e08-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	CASE_SENSITIVE	8	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	CASE_SENSITIVE	mmuuid:57991e09-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	LOCAL_TYPE_NAME	15	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TYPES	LOCAL_TYPE_NAME	mmuuid:57991e0a-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	LITERAL_SUFFIX	5	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_TYPES	LITERAL_SUFFIX	mmuuid:57991e0b-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	UNSIGNED_ATTRIB	10	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	UNSIGNED_ATTRIB	mmuuid:57991e0c-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	TYPE_NAME	1	null	string	0	100	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	100	100	10	OA_TYPES	TYPE_NAME	mmuuid:57991e0d-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_NULLABLE	7	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	OA_NULLABLE	mmuuid:57991e0e-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_SEARCHABLE	9	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	OA_SEARCHABLE	mmuuid:57991e0f-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	NON_UNIQUE	4	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_STATISTICS	NON_UNIQUE	mmuuid:57991e11-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_PAGES	12	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_STATISTICS	OA_PAGES	mmuuid:57991e12-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	INDEX_NAME	6	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	INDEX_NAME	mmuuid:57991e13-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	SEQ_IN_INDEX	8	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_STATISTICS	SEQ_IN_INDEX	mmuuid:57991e14-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_COLLATION	10	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	OA_COLLATION	mmuuid:57991e15-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_CARDINALITY	11	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_STATISTICS	OA_CARDINALITY	mmuuid:57991e16-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	TABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	TABLE_OWNER	mmuuid:57991e17-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	COLUMN_NAME	9	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	COLUMN_NAME	mmuuid:57991e18-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	TABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	TABLE_NAME	mmuuid:57991e19-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_TYPE	7	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_STATISTICS	OA_TYPE	mmuuid:57991e1a-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	INDEX_QUALIFIER	5	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	INDEX_QUALIFIER	mmuuid:57991e1b-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	TABLE_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	TABLE_QUALIFIER	mmuuid:57991e1c-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	FILTER_CONDITIONS	13	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	FILTER_CONDITIONS	mmuuid:57991e1d-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	KeyElements	System.KeyElements	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	MODELNAME	mmuuid:57c33242-ba68-1de7-b705-ef2376c3949e	null",
-				"System	KeyElements	System.KeyElements	GroupName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	GROUPNAME	mmuuid:57c33243-ba68-1de7-b705-ef2376c3949e	null",
-				"System	KeyElements	System.KeyElements	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	KEYELEMENTS	GROUPFULLNAME	mmuuid:57c33244-ba68-1de7-b705-ef2376c3949e	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	KEY_SEQ	9	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_FKEYS	KEY_SEQ	mmuuid:587dffc1-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PK_NAME	13	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PK_NAME	mmuuid:587dffc2-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKTABLE_QUALIFIER	5	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKTABLE_QUALIFIER	mmuuid:587dffc3-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKTABLE_NAME	7	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKTABLE_NAME	mmuuid:587dffc4-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKTABLE_OWNER	6	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKTABLE_OWNER	mmuuid:587dffc5-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKCOLUMN_NAME	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKCOLUMN_NAME	mmuuid:587dffc6-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FK_NAME	12	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FK_NAME	mmuuid:587dffc7-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKTABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKTABLE_OWNER	mmuuid:587dffc8-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	UPDATE_RULE	10	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_FKEYS	UPDATE_RULE	mmuuid:587dffc9-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	DELETE_RULE	11	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_FKEYS	DELETE_RULE	mmuuid:587dffca-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKCOLUMN_NAME	8	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKCOLUMN_NAME	mmuuid:587dffcb-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKTABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKTABLE_NAME	mmuuid:587dffcc-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKTABLE_QUALIFIER	1	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKTABLE_QUALIFIER	mmuuid:587dffcd-2ca5-1f8d-a539-a73e664462a1	null",
-				"System	KeyElements	System.KeyElements	KeyName	4	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	KEYNAME	mmuuid:58a81400-ba68-1de7-b705-ef2376c3949e	null",
-				"System	KeyElements	System.KeyElements	RefKeyUID	8	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYELEMENTS	REFKEYUID	mmuuid:58a81402-ba68-1de7-b705-ef2376c3949e	null",
-				"System	KeyElements	System.KeyElements	UID	9	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYELEMENTS	UID	mmuuid:58a81403-ba68-1de7-b705-ef2376c3949e	null",
-				"System	KeyElements	System.KeyElements	GroupUpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	GROUPUPPERNAME	mmuuid:58a81404-ba68-1de7-b705-ef2376c3949e	null",
-				"System	ProcedureParams	System.ProcedureParams	TypeLength	9	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	PROCEDUREPARAMS	TYPELENGTH	mmuuid:5e0fac00-634e-1e44-a903-c1472e78d1c5	null",
-				"System	Procedures	System.Procedures	Description	7	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	225	255	10	PROCEDURES	DESCRIPTION	mmuuid:61164b00-3ab4-1edb-8606-be949cc6da52	null",
-				"System	DataTypeProperties	System.DataTypeProperties	DataType	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPEPROPERTIES	DATATYPE	mmuuid:6609d102-c90a-1de7-ad1c-f3ce4292824e	null",
-				"System	DataTypeProperties	System.DataTypeProperties	Name	2	null	string	0	50	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEPROPERTIES	NAME	mmuuid:6609d103-c90a-1de7-ad1c-f3ce4292824e	null",
-				"System	DataTypeProperties	System.DataTypeProperties	Value	3	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEPROPERTIES	VALUE	mmuuid:6609d106-c90a-1de7-ad1c-f3ce4292824e	null",
-				"System	Models	System.Models	SupportsWhereAll	3	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSWHEREALL	mmuuid:6b529981-b67c-1de7-b705-ef2376c3949e	null",
-				"System	Models	System.Models	SupportsOrderBy	4	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSORDERBY	mmuuid:6c377b40-b67c-1de7-b705-ef2376c3949e	null",
-				"System	Models	System.Models	SupportsJoin	5	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSJOIN	mmuuid:6c377b42-b67c-1de7-b705-ef2376c3949e	null",
-				"System	Models	System.Models	SupportsDistinct	6	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSDISTINCT	mmuuid:6c377b43-b67c-1de7-b705-ef2376c3949e	null",
-				"System	Models	System.Models	SupportsOuterJoin	7	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSOUTERJOIN	mmuuid:6c377b44-b67c-1de7-b705-ef2376c3949e	null",
-				"System	Procedures	System.Procedures	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDURES	MODELNAME	mmuuid:7a19a9c2-b863-1de7-b705-ef2376c3949e	null",
-				"System	Procedures	System.Procedures	Name	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDURES	NAME	mmuuid:7a19a9c3-b863-1de7-b705-ef2376c3949e	null",
-				"System	Procedures	System.Procedures	ModelUID	5	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	PROCEDURES	MODELUID	mmuuid:7a19a9c6-b863-1de7-b705-ef2376c3949e	null",
-				"System	Procedures	System.Procedures	ReturnsResults	4	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	PROCEDURES	RETURNSRESULTS	mmuuid:7afe8b81-b863-1de7-b705-ef2376c3949e	null",
-				"System	Procedures	System.Procedures	UID	6	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	PROCEDURES	UID	mmuuid:7afe8b83-b863-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	MODELNAME	mmuuid:7b0da102-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	GroupName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	GROUPNAME	mmuuid:7b0da103-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	GroupFullName	3	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	ELEMENTS	GROUPFULLNAME	mmuuid:7b0da104-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	Name	4	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	NAME	mmuuid:7b0da105-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	Position	5	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	POSITION	mmuuid:7b0da106-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	DataType	7	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	ELEMENTS	DATATYPE	mmuuid:7bf282c3-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	Scale	8	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	SCALE	mmuuid:7bf282c4-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	ElementLength	9	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	ELEMENTLENGTH	mmuuid:7bf282c5-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	IsLengthFixed	10	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISLENGTHFIXED	mmuuid:7bf282c7-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	SupportsSelect	11	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	SUPPORTSSELECT	mmuuid:7bf282c8-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	SupportsUpdates	12	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	SUPPORTSUPDATES	mmuuid:7ce6a6c0-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	IsCaseSensitive	13	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISCASESENSITIVE	mmuuid:7ce6a6c1-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	IsSigned	14	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISSIGNED	mmuuid:7ce6a6c2-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	IsCurrency	15	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISCURRENCY	mmuuid:7ce6a6c3-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	IsAutoIncremented	16	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISAUTOINCREMENTED	mmuuid:7ce6a6c4-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	NullType	17	null	string	0	20	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	ELEMENTS	NULLTYPE	mmuuid:7ce6a6c5-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	MinRange	18	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTS	MINRANGE	mmuuid:7ce6a6c6-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	MaxRange	19	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTS	MAXRANGE	mmuuid:7ce6a6c7-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	SearchType	20	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	ELEMENTS	SEARCHTYPE	mmuuid:7ce6a6c8-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	Format	21	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	FORMAT	mmuuid:7ce6a6c9-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	DefaultValue	22	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	DEFAULTVALUE	mmuuid:7ddacac1-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	JavaClass	23	null	string	0	500	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	500	500	10	ELEMENTS	JAVACLASS	mmuuid:7ddacac2-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	UID	29	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTS	UID	mmuuid:7ddacac3-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	Precision	24	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	PRECISION	mmuuid:7ddacac5-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	Elements	System.Elements	Radix	26	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	RADIX	mmuuid:7ddacac7-b9b3-1de7-b705-ef2376c3949e	null",
-				"System	VirtualDatabases	System.VirtualDatabases	Name	1	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	VIRTUALDATABASES	NAME	mmuuid:8cfee540-c1d3-1de7-b515-bad6cb0abb8d	null",
-				"System	VirtualDatabases	System.VirtualDatabases	Version	2	null	string	0	50	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	VIRTUALDATABASES	VERSION	mmuuid:8cfee541-c1d3-1de7-b515-bad6cb0abb8d	null",
-				"System	Elements	System.Elements	NameInSource	6	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	NAMEINSOURCE	mmuuid:8f854500-3416-1dee-8e07-e3cb3008f82b	null",
-				"System	ProcedureParams	System.ProcedureParams	Type	6	null	string	0	100	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	PROCEDUREPARAMS	TYPE	mmuuid:91fce1c0-6663-1de8-a732-e7f41500bc3a	null",
-				"System	ProcedureParams	System.ProcedureParams	Scale	10	null	integer	0	10	true	true	true	false	false	false	false	No Nulls	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	PROCEDUREPARAMS	SCALE	mmuuid:95044680-634e-1e44-a903-c1472e78d1c5	null",
-				"System	ProcedureParams	System.ProcedureParams	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPARAMS	MODELNAME	mmuuid:959eca00-b8f3-1de7-b705-ef2376c3949e	null",
-				"System	ProcedureParams	System.ProcedureParams	ProcedureName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPARAMS	PROCEDURENAME	mmuuid:959eca01-b8f3-1de7-b705-ef2376c3949e	null",
-				"System	ProcedureParams	System.ProcedureParams	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPARAMS	NAME	mmuuid:959eca03-b8f3-1de7-b705-ef2376c3949e	null",
-				"System	ProcedureParams	System.ProcedureParams	DataType	4	null	string	0	25	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	25	25	10	PROCEDUREPARAMS	DATATYPE	mmuuid:959eca04-b8f3-1de7-b705-ef2376c3949e	null",
-				"System	ProcedureParams	System.ProcedureParams	Position	5	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	PROCEDUREPARAMS	POSITION	mmuuid:959eca06-b8f3-1de7-b705-ef2376c3949e	null",
-				"System	ProcedureParams	System.ProcedureParams	Optional	7	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	PROCEDUREPARAMS	OPTIONAL	mmuuid:959eca08-b8f3-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	NameInSource	5	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	NAMEINSOURCE	mmuuid:9a749d40-3424-1dee-8e07-e3cb3008f82b	null",
-				"System	KeyProperties	System.KeyProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYPROPERTIES	MODELNAME	mmuuid:9ba7aa01-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKTABLE_CAT	5	null	string	0	1	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	1	1	10	REFERENCEKEYCOLUMNS	FKTABLE_CAT	mmuuid:9d4fe981-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	DELETE_RULE	11	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	REFERENCEKEYCOLUMNS	DELETE_RULE	mmuuid:9d4fe982-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKTABLE_SCHEM	6	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FKTABLE_SCHEM	mmuuid:9d4fe983-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PK_NAME	13	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PK_NAME	mmuuid:9d4fe984-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKCOLUMN_NAME	8	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FKCOLUMN_NAME	mmuuid:9d4fe985-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKTABLE_NAME	3	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PKTABLE_NAME	mmuuid:9d4fe986-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FK_NAME	12	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FK_NAME	mmuuid:9d4fe987-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	KEY_SEQ	9	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	REFERENCEKEYCOLUMNS	KEY_SEQ	mmuuid:9d4fe988-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKTABLE_CAT	1	null	string	0	1	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	1	1	10	REFERENCEKEYCOLUMNS	PKTABLE_CAT	mmuuid:9d4fe989-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	UPDATE_RULE	10	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	REFERENCEKEYCOLUMNS	UPDATE_RULE	mmuuid:9d4fe98a-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKTABLE_NAME	7	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FKTABLE_NAME	mmuuid:9d4fe98b-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	DEFERRABILITY	14	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	REFERENCEKEYCOLUMNS	DEFERRABILITY	mmuuid:9d4fe98c-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKCOLUMN_NAME	4	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PKCOLUMN_NAME	mmuuid:9d4fe98d-2c99-1f8d-a539-a73e664462a1	null",
-				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKTABLE_SCHEM	2	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PKTABLE_SCHEM	mmuuid:9d4fe98e-2c99-1f8d-a539-a73e664462a1	null",
-				"System	KeyProperties	System.KeyProperties	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	KEYPROPERTIES	GROUPFULLNAME	mmuuid:9d80afc0-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	Keys	System.Keys	Type	6	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	KEYS	TYPE	mmuuid:9e0dce80-ce82-1de7-8c2d-d908d66ab0ba	null",
-				"System	Groups	System.Groups	IsMaterialized	13	null	boolean	0	0	false	true	true	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	0	0	10	GROUPS	ISMATERIALIZED	mmuuid:9e5c3980-04e6-101e-861a-a893857ac5a5	null",
-				"System	KeyProperties	System.KeyProperties	KeyName	3	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	KEYPROPERTIES	KEYNAME	mmuuid:9e74d3c0-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	KeyProperties	System.KeyProperties	Name	4	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	KEYPROPERTIES	NAME	mmuuid:9e74d3c5-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	KeyProperties	System.KeyProperties	Value	5	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	KEYPROPERTIES	VALUE	mmuuid:9e74d3ca-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	KeyProperties	System.KeyProperties	GroupName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYPROPERTIES	GROUPNAME	mmuuid:9e74d3cf-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	KeyProperties	System.KeyProperties	GroupUpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYPROPERTIES	GROUPUPPERNAME	mmuuid:9e74d3d4-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	KeyProperties	System.KeyProperties	UID	8	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYPROPERTIES	UID	mmuuid:9f68f7c0-1142-1ff5-a438-98ce9bfae8da	null",
-				"System	Models	System.Models	PrimaryMetamodelURI	11	null	string	0	255	false	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELS	PRIMARYMETAMODELURI	mmuuid:a5682040-ea71-1ee5-b836-ce1850f9b1e5	null",
-				"System	Procedures	System.Procedures	FullName	8	null	string	0	2048	false	true	true	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	PROCEDURES	FULLNAME	mmuuid:af58c3c0-23d0-1f11-bb31-8e2670f95fb1	null",
-				"System	Groups	System.Groups	Description	11	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	DESCRIPTION	mmuuid:afce0780-3a4e-1edb-8606-be949cc6da52	null",
-				"System	Groups	System.Groups	UID	9	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	GROUPS	UID	mmuuid:b1e4e240-ec67-1de9-9115-ad36abcfb081	null",
-				"System	Groups	System.Groups	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	MODELNAME	mmuuid:b1e4e243-ec67-1de9-9115-ad36abcfb081	null",
-				"System	Groups	System.Groups	FullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	GROUPS	FULLNAME	mmuuid:b1e4e244-ec67-1de9-9115-ad36abcfb081	null",
-				"System	Groups	System.Groups	Name	3	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	NAME	mmuuid:b1e4e245-ec67-1de9-9115-ad36abcfb081	null",
-				"System	Groups	System.Groups	IsPhysical	6	null	boolean	0	1	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	GROUPS	ISPHYSICAL	mmuuid:b1e4e248-ec67-1de9-9115-ad36abcfb081	null",
-				"System	Groups	System.Groups	Cardinality	10	null	integer	0	10	false	true	false	true	true	false	false	No Nulls	null	null	All Except Like	null	null	java.lang.Integer	10	10	10	GROUPS	CARDINALITY	mmuuid:b2d85ec0-ebd5-1eda-b235-cf50afc035e1	null",
-				"System	Groups	System.Groups	UpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	UPPERNAME	mmuuid:b2d90641-ec67-1de9-9115-ad36abcfb081	null",
-				"System	Groups	System.Groups	Type	4	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	GROUPS	TYPE	mmuuid:b2d90642-ec67-1de9-9115-ad36abcfb081	null",
-				"System	Elements	System.Elements	CharOctetLength	25	null	integer	0	10	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	CHAROCTETLENGTH	mmuuid:c0b5e1c0-cdd8-1de7-8c2d-d908d66ab0ba	null",
-				"System	Groups	System.Groups	NameInSource	5	null	string	0	255	true	true	false	true	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	NAMEINSOURCE	mmuuid:c143df00-3409-1dee-8e07-e3cb3008f82b	null",
-				"System	ProcedureParams	System.ProcedureParams	Radix	11	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	PROCEDUREPARAMS	RADIX	mmuuid:c65e8d80-634e-1e44-a903-c1472e78d1c5	null",
-				"System	GroupProperties	System.GroupProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	MODELNAME	mmuuid:c8e43042-c509-1de7-b515-bad6cb0abb8d	null",
-				"System	GroupProperties	System.GroupProperties	GroupName	5	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	GROUPNAME	mmuuid:c8e43043-c509-1de7-b515-bad6cb0abb8d	null",
-				"System	GroupProperties	System.GroupProperties	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	GROUPPROPERTIES	GROUPFULLNAME	mmuuid:c8e43044-c509-1de7-b515-bad6cb0abb8d	null",
-				"System	GroupProperties	System.GroupProperties	Name	3	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	NAME	mmuuid:c8e43045-c509-1de7-b515-bad6cb0abb8d	null",
-				"System	GroupProperties	System.GroupProperties	UID	7	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	GROUPPROPERTIES	UID	mmuuid:c8e43046-c509-1de7-b515-bad6cb0abb8d	null",
-				"System	GroupProperties	System.GroupProperties	Value	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	VALUE	mmuuid:c8e43048-c509-1de7-b515-bad6cb0abb8d	null",
-				"System	GroupProperties	System.GroupProperties	GroupUpperName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	GROUPUPPERNAME	mmuuid:c8e43049-c509-1de7-b515-bad6cb0abb8d	null",
-				"System	Models	System.Models	IsPhysical	2	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	ISPHYSICAL	mmuuid:d5a73440-b6b7-1de7-b705-ef2376c3949e	null",
-				"System	Models	System.Models	MaxSetSize	8	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	MODELS	MAXSETSIZE	mmuuid:d5a73442-b6b7-1de7-b705-ef2376c3949e	null",
-				"System	KeyElements	System.KeyElements	KeyType	5	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	KEYELEMENTS	KEYTYPE	mmuuid:db288f80-ce87-1de7-8c2d-d908d66ab0ba	null",
-				"System	DataTypeProperties	System.DataTypeProperties	UID	4	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEPROPERTIES	UID	mmuuid:dba25280-a5e0-1e42-ba2a-a0f062ab71df	null",
-				"System	DataTypes	System.DataTypes	RuntimeType	16	null	string	0	64	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	64	64	10	DATATYPES	RUNTIMETYPE	mmuuid:de321500-e584-1e20-b806-d8b2a0a91d66	null",
-				"System	DataTypes	System.DataTypes	IsStandard	2	null	boolean	0	1	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	DATATYPES	ISSTANDARD	mmuuid:e21059c5-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	IsPhysical	3	null	boolean	0	1	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	DATATYPES	ISPHYSICAL	mmuuid:e2f53b80-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	TypeName	4	null	string	0	100	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPES	TYPENAME	mmuuid:e2f53b81-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	Scale	6	null	integer	0	10	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	DATATYPES	SCALE	mmuuid:e2f53b82-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	NullType	8	null	string	0	20	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	DATATYPES	NULLTYPE	mmuuid:e2f53b84-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	IsSigned	9	null	boolean	0	1	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	('0')	java.lang.Boolean	1	1	10	DATATYPES	ISSIGNED	mmuuid:e2f53b85-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	IsAutoIncremented	10	null	boolean	0	1	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	('0')	java.lang.Boolean	1	1	10	DATATYPES	ISAUTOINCREMENTED	mmuuid:e2f53b86-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	IsCaseSensitive	11	null	boolean	0	1	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	('0')	java.lang.Boolean	1	1	10	DATATYPES	ISCASESENSITIVE	mmuuid:e2f53b87-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	JavaClass	5	null	string	0	500	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	500	500	10	DATATYPES	JAVACLASS	mmuuid:e3e95f82-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	UID	15	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPES	UID	mmuuid:e3e95f83-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	Precision	12	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPES	PRECISION	mmuuid:e3e95f84-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	Radix	13	null	integer	0	10	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPES	RADIX	mmuuid:e3e95f85-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	SearchType	14	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	DATATYPES	SEARCHTYPE	mmuuid:e3e95f87-b80e-1de7-b705-ef2376c3949e	null",
-				"System	DataTypes	System.DataTypes	Description	18	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPES	DESCRIPTION	mmuuid:e81d8400-3a83-1edb-8606-be949cc6da52	null",
-				"System	DataTypes	System.DataTypes	BaseType	17	null	string	0	64	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	64	64	10	DATATYPES	BASETYPE	mmuuid:e8729800-e584-1e20-b806-d8b2a0a91d66	null",
-				"System	Elements	System.Elements	GroupUpperName	27	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	GROUPUPPERNAME	mmuuid:e92fbb00-c2a0-1de7-b515-bad6cb0abb8d	null",
-				"System	Elements	System.Elements	UpperName	28	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	UPPERNAME	mmuuid:ea23df00-c2a0-1de7-b515-bad6cb0abb8d	null",
-				"System	KeyElements	System.KeyElements	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	NAME	mmuuid:ed887840-c318-1de7-b515-bad6cb0abb8d	null",
-				"System	Groups	System.Groups	IsSystem	12	null	boolean	0	1	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	GROUPS	ISSYSTEM	mmuuid:ee427900-7eec-1eea-940e-bcb0b71c723a	null",
-				"System	ProcedureParams	System.ProcedureParams	NullType	12	null	string	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	10	10	10	PROCEDUREPARAMS	NULLTYPE	mmuuid:f8acf880-634e-1e44-a903-c1472e78d1c5	null",
-				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_ID	1	PART_ID	string	0	4	true	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	4	10	PARTS	PART_ID	mmuuid:fadcd7c0-73fe-1edc-a81c-ecf397b10590	null",
-				"System	Keys	System.Keys	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	MODELNAME	mmuuid:fe2c6482-b9eb-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	GroupName	8	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	GROUPNAME	mmuuid:fe2c6483-b9eb-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	KEYS	GROUPFULLNAME	mmuuid:fe2c6484-b9eb-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	NAME	mmuuid:fe2c6485-b9eb-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	Description	4	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	DESCRIPTION	mmuuid:fe2c6486-b9eb-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	IsIndexed	7	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	KEYS	ISINDEXED	mmuuid:ff208881-b9eb-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	RefKeyUID	10	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYS	REFKEYUID	mmuuid:ff208882-b9eb-1de7-b705-ef2376c3949e	null",
-				"System	Keys	System.Keys	UID	11	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYS	UID	mmuuid:ff208884-b9eb-1de7-b705-ef2376c3949e	null",
+				"ModelName[string]	GroupName[string]	GroupFullName[string]	Name[string]	Position[integer]	NameInSource[string]	DataType[string]	Scale[integer]	ElementLength[integer]	IsLengthFixed[boolean]	SupportsSelect[boolean]	SupportsUpdates[boolean]	IsCaseSensitive[boolean]	IsSigned[boolean]	IsCurrency[boolean]	IsAutoIncremented[boolean]	NullType[string]	MinRange[string]	MaxRange[string]	SearchType[string]	Format[string]	DefaultValue[string]	JavaClass[string]	Precision[integer]	CharOctetLength[integer]	Radix[integer]	GroupUpperName[string]	UpperName[string]	UID[string]	Description[string]", //$NON-NLS-1$
+				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_NAME	2	PART_NAME	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	PARTS	PART_NAME	mmuuid:0067e900-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_COLOR	3	PART_COLOR	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	PARTS	PART_COLOR	mmuuid:015c0d00-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_WEIGHT	4	PART_WEIGHT	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	PARTS	PART_WEIGHT	mmuuid:015c0d01-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	GroupUpperName	9	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	GROUPUPPERNAME	mmuuid:07268b40-c2f4-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"PartsSupplier	SHIP_VIA	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIPPER_ID	1	SHIPPER_ID	short	0	0	true	true	true	false	true	false	false	No Nulls	null	null	All Except Like	null	null	java.lang.Short	2	0	10	SHIP_VIA	SHIPPER_ID	mmuuid:121bc540-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SHIP_VIA	PartsSupplier.PARTSSUPPLIER.SHIP_VIA	SHIPPER_NAME	2	SHIPPER_NAME	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	SHIP_VIA	SHIPPER_NAME	mmuuid:130fe940-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	Name	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPES	NAME	mmuuid:15b71f00-c266-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"PartsSupplier	STATUS	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_ID	1	STATUS_ID	short	0	0	true	true	true	false	true	false	false	No Nulls	null	null	All Except Like	null	null	java.lang.Short	2	0	10	STATUS	STATUS_ID	mmuuid:201d9600-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	STATUS	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_NAME	2	STATUS_NAME	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	STATUS	STATUS_NAME	mmuuid:201d9601-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"System	Models	System.Models	Description	10	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELS	DESCRIPTION	mmuuid:2268b040-3a47-1edb-8606-be949cc6da52	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	Precision	8	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	PROCEDUREPARAMS	PRECISION	mmuuid:2626ed80-634e-1e44-a903-c1472e78d1c5	null", //$NON-NLS-1$
+				"System	ModelProperties	System.ModelProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELPROPERTIES	MODELNAME	mmuuid:2afa8d80-c3cd-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ModelProperties	System.ModelProperties	UID	4	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	MODELPROPERTIES	UID	mmuuid:2afa8d82-c3cd-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_ID	1	SUPPLIER_ID	string	0	10	false	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	10	10	SUPPLIER	SUPPLIER_ID	mmuuid:2f044880-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_NAME	2	SUPPLIER_NAME	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	SUPPLIER	SUPPLIER_NAME	mmuuid:2f044881-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATUS	3	SUPPLIER_STATUS	short	0	0	true	true	true	false	true	false	false	Nullable	null	null	All Except Like	null	null	java.lang.Short	2	0	10	SUPPLIER	SUPPLIER_STATUS	mmuuid:2f044882-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_CITY	4	SUPPLIER_CITY	string	0	30	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	30	10	SUPPLIER	SUPPLIER_CITY	mmuuid:2fe92a40-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATE	5	SUPPLIER_STATE	string	0	2	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	2	10	SUPPLIER	SUPPLIER_STATE	mmuuid:2fe92a41-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	NameInSource	3	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDURES	NAMEINSOURCE	mmuuid:339a9a00-35fc-1dee-8e07-e3cb3008f82b	null", //$NON-NLS-1$
+				"System	DataTypeElementProperties	System.DataTypeElementProperties	DataTypeName	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPEELEMENTPROPERTIES	DATATYPENAME	mmuuid:34af31c0-c88f-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	DataTypeElementProperties	System.DataTypeElementProperties	DataTypeElementName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEELEMENTPROPERTIES	DATATYPEELEMENTNAME	mmuuid:34af31c1-c88f-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	DataTypeElementProperties	System.DataTypeElementProperties	Name	3	null	string	0	50	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEELEMENTPROPERTIES	NAME	mmuuid:34af31c2-c88f-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	DataTypeElementProperties	System.DataTypeElementProperties	UID	5	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEELEMENTPROPERTIES	UID	mmuuid:34af31c3-c88f-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	DataTypeElementProperties	System.DataTypeElementProperties	Value	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEELEMENTPROPERTIES	VALUE	mmuuid:35941381-c88f-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	Description	30	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	DESCRIPTION	mmuuid:36fd7640-3a50-1edb-8606-be949cc6da52	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	Position	10	null	integer	0	10	true	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	KEYELEMENTS	POSITION	mmuuid:39d26b40-396b-1edb-8606-be949cc6da52	null", //$NON-NLS-1$
+				"System	ProcedureProperties	System.ProcedureProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	MODELNAME	mmuuid:3a5c9f42-c5f6-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ProcedureProperties	System.ProcedureProperties	ProcedureName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	PROCEDURENAME	mmuuid:3a5c9f43-c5f6-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ProcedureProperties	System.ProcedureProperties	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	NAME	mmuuid:3a5c9f45-c5f6-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ProcedureProperties	System.ProcedureProperties	UID	5	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	PROCEDUREPROPERTIES	UID	mmuuid:3a5c9f46-c5f6-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ProcedureProperties	System.ProcedureProperties	Value	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPROPERTIES	VALUE	mmuuid:3a5c9f48-c5f6-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ModelProperties	System.ModelProperties	Name	2	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELPROPERTIES	NAME	mmuuid:3c881f40-c3dc-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ModelProperties	System.ModelProperties	Value	3	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELPROPERTIES	VALUE	mmuuid:3c881f41-c3dc-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	1	SUPPLIER_ID	string	0	10	false	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	10	10	SUPPLIER_PARTS	SUPPLIER_ID	mmuuid:3ecfdcc0-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	2	PART_ID	string	0	4	true	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	4	10	SUPPLIER_PARTS	PART_ID	mmuuid:3fc400c0-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	QUANTITY	3	QUANTITY	short	0	0	true	true	true	false	true	false	false	Nullable	null	null	All Except Like	null	null	java.lang.Short	3	0	10	SUPPLIER_PARTS	QUANTITY	mmuuid:3fc400c1-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"PartsSupplier	SUPPLIER_PARTS	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SHIPPER_ID	4	SHIPPER_ID	short	0	0	true	true	true	false	true	false	false	Nullable	null	null	All Except Like	null	null	java.lang.Short	2	0	10	SUPPLIER_PARTS	SHIPPER_ID	mmuuid:3fc400c2-73ff-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"System	Models	System.Models	UID	9	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	MODELS	UID	mmuuid:4610fe00-b6d6-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypeElements	System.DataTypeElements	DataTypeName	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPEELEMENTS	DATATYPENAME	mmuuid:49bf3600-c74a-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	DataTypeElements	System.DataTypeElements	Name	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEELEMENTS	NAME	mmuuid:49bf3601-c74a-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	DataTypeElements	System.DataTypeElements	Position	3	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPEELEMENTS	POSITION	mmuuid:49bf3602-c74a-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	DataTypeElements	System.DataTypeElements	UID	6	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEELEMENTS	UID	mmuuid:49bf3604-c74a-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	DataTypeElements	System.DataTypeElements	Scale	4	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPEELEMENTS	SCALE	mmuuid:49bf3605-c74a-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	DataTypeElements	System.DataTypeElements	ElementLength	5	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPEELEMENTS	ELEMENTLENGTH	mmuuid:49bf3606-c74a-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	TypeLength	7	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	DATATYPES	TYPELENGTH	mmuuid:505f1740-b823-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Models	System.Models	Name	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELS	NAME	mmuuid:51706d40-b6d0-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	SupportsUpdates	8	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	GROUPS	SUPPORTSUPDATES	mmuuid:533fa200-348c-1e06-9501-aee4d16940ab	null", //$NON-NLS-1$
+				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_OWNER	mmuuid:54cbf441-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TABLES	System.ODBC.OA_TABLES	REMARKS	5	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_TABLES	REMARKS	mmuuid:54cbf442-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_TYPE	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_TYPE	mmuuid:54cbf443-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_NAME	mmuuid:54cbf444-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TABLES	System.ODBC.OA_TABLES	TABLE_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TABLES	TABLE_QUALIFIER	mmuuid:54cbf445-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TABLE_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	TABLE_QUALIFIER	mmuuid:54cbf447-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_NULLABLE	11	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	OA_NULLABLE	mmuuid:54cbf448-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_SCALE	9	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_SCALE	mmuuid:54cbf449-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	TABLE_NAME	mmuuid:54cbf44a-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	REMARKS	15	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_COLUMNS	REMARKS	mmuuid:54cbf44b-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_COLUMNTYPE	14	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	OA_COLUMNTYPE	mmuuid:54cbf44c-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_PRECISION	8	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_PRECISION	mmuuid:54cbf44d-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_RADIX	10	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_RADIX	mmuuid:54cbf44e-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_LENGTH	7	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_COLUMNS	OA_LENGTH	mmuuid:54cbf44f-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	COLUMN_NAME	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	COLUMN_NAME	mmuuid:54cbf450-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	OA_SCOPE	12	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	OA_SCOPE	mmuuid:54cbf451-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	DATA_TYPE	5	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	DATA_TYPE	mmuuid:54cbf452-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TYPE_NAME	6	null	string	0	100	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	100	100	10	OA_COLUMNS	TYPE_NAME	mmuuid:54cbf453-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	PSEUDO_COLUMN	13	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_COLUMNS	PSEUDO_COLUMN	mmuuid:54cbf454-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_COLUMNS	System.ODBC.OA_COLUMNS	TABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_COLUMNS	TABLE_OWNER	mmuuid:54cbf455-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	MODELNAME	mmuuid:54d5e2c2-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	GroupName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	GROUPNAME	mmuuid:54d5e2c3-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	ELEMENTPROPERTIES	GROUPFULLNAME	mmuuid:54d5e2c4-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	ElementName	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	ELEMENTNAME	mmuuid:54d5e2c5-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	Name	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	NAME	mmuuid:54d5e2c6-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	UID	9	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTPROPERTIES	UID	mmuuid:54d5e2c7-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	Value	5	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	VALUE	mmuuid:54d5e2c9-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	REMARKS	7	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_PROC	REMARKS	mmuuid:55b0d601-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	OA_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROC	OA_OWNER	mmuuid:55b0d602-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	OA_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROC	OA_QUALIFIER	mmuuid:55b0d603-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	NUM_OUTPUT_PARAMS	5	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROC	NUM_OUTPUT_PARAMS	mmuuid:55b0d604-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	NUM_INPUT_PARAMS	4	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROC	NUM_INPUT_PARAMS	mmuuid:55b0d605-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	OA_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROC	OA_NAME	mmuuid:55b0d606-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	PROCEDURE_TYPE	8	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROC	PROCEDURE_TYPE	mmuuid:55b0d607-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROC	System.ODBC.OA_PROC	NUM_RESULT_SETS	6	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROC	NUM_RESULT_SETS	mmuuid:55b0d608-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	GroupUpperName	8	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	GROUPUPPERNAME	mmuuid:55bac480-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	ElementProperties	System.ElementProperties	ElementUpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTPROPERTIES	ELEMENTUPPERNAME	mmuuid:55bac481-c59f-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_LENGTH	9	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_LENGTH	mmuuid:56a4fa01-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_PRECISION	8	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_PRECISION	mmuuid:56a4fa02-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	COLUMN_NAME	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	COLUMN_NAME	mmuuid:56a4fa03-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	REMARKS	14	null	string	0	254	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	254	254	10	OA_PROCCOLUMNS	REMARKS	mmuuid:56a4fa04-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	OA_NAME	mmuuid:56a4fa05-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_RADIX	10	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_RADIX	mmuuid:56a4fa06-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	DATA_TYPE	6	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	DATA_TYPE	mmuuid:56a4fa07-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_SCALE	11	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_PROCCOLUMNS	OA_SCALE	mmuuid:56a4fa08-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_SCOPE	13	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	OA_SCOPE	mmuuid:56a4fa09-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	TYPE_NAME	7	null	string	0	100	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	100	100	10	OA_PROCCOLUMNS	TYPE_NAME	mmuuid:56a4fa0a-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	OA_QUALIFIER	mmuuid:56a4fa0b-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_PROCCOLUMNS	OA_OWNER	mmuuid:56a4fa0c-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_NULLABLE	12	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	OA_NULLABLE	mmuuid:56a4fa0d-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_PROCCOLUMNS	System.ODBC.OA_PROCCOLUMNS	OA_COLUMNTYPE	5	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_PROCCOLUMNS	OA_COLUMNTYPE	mmuuid:56a4fa0e-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	CREATE_PARAMS	6	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_TYPES	CREATE_PARAMS	mmuuid:57991e01-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	LITERAL_PREFIX	4	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_TYPES	LITERAL_PREFIX	mmuuid:57991e02-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	AUTO_INCREMENT	12	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	AUTO_INCREMENT	mmuuid:57991e03-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_MONEY	11	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	OA_MONEY	mmuuid:57991e04-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	MINIMUM_SCALE	13	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	MINIMUM_SCALE	mmuuid:57991e05-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_PRECISION	3	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	OA_TYPES	OA_PRECISION	mmuuid:57991e06-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	DATA_TYPE	2	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	DATA_TYPE	mmuuid:57991e07-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	MAXIMUM_SCALE	14	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	MAXIMUM_SCALE	mmuuid:57991e08-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	CASE_SENSITIVE	8	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	CASE_SENSITIVE	mmuuid:57991e09-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	LOCAL_TYPE_NAME	15	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_TYPES	LOCAL_TYPE_NAME	mmuuid:57991e0a-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	LITERAL_SUFFIX	5	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_TYPES	LITERAL_SUFFIX	mmuuid:57991e0b-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	UNSIGNED_ATTRIB	10	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	UNSIGNED_ATTRIB	mmuuid:57991e0c-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	TYPE_NAME	1	null	string	0	100	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	100	100	10	OA_TYPES	TYPE_NAME	mmuuid:57991e0d-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_NULLABLE	7	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	OA_NULLABLE	mmuuid:57991e0e-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_TYPES	System.ODBC.OA_TYPES	OA_SEARCHABLE	9	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_TYPES	OA_SEARCHABLE	mmuuid:57991e0f-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	NON_UNIQUE	4	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_STATISTICS	NON_UNIQUE	mmuuid:57991e11-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_PAGES	12	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_STATISTICS	OA_PAGES	mmuuid:57991e12-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	INDEX_NAME	6	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	INDEX_NAME	mmuuid:57991e13-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	SEQ_IN_INDEX	8	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_STATISTICS	SEQ_IN_INDEX	mmuuid:57991e14-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_COLLATION	10	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	OA_COLLATION	mmuuid:57991e15-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_CARDINALITY	11	null	string	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	10	10	10	OA_STATISTICS	OA_CARDINALITY	mmuuid:57991e16-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	TABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	TABLE_OWNER	mmuuid:57991e17-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	COLUMN_NAME	9	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	COLUMN_NAME	mmuuid:57991e18-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	TABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	TABLE_NAME	mmuuid:57991e19-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	OA_TYPE	7	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_STATISTICS	OA_TYPE	mmuuid:57991e1a-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	INDEX_QUALIFIER	5	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	INDEX_QUALIFIER	mmuuid:57991e1b-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	TABLE_QUALIFIER	1	null	string	0	128	false	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	TABLE_QUALIFIER	mmuuid:57991e1c-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_STATISTICS	System.ODBC.OA_STATISTICS	FILTER_CONDITIONS	13	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_STATISTICS	FILTER_CONDITIONS	mmuuid:57991e1d-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	MODELNAME	mmuuid:57c33242-ba68-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	GroupName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	GROUPNAME	mmuuid:57c33243-ba68-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	KEYELEMENTS	GROUPFULLNAME	mmuuid:57c33244-ba68-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	KEY_SEQ	9	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_FKEYS	KEY_SEQ	mmuuid:587dffc1-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PK_NAME	13	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PK_NAME	mmuuid:587dffc2-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKTABLE_QUALIFIER	5	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKTABLE_QUALIFIER	mmuuid:587dffc3-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKTABLE_NAME	7	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKTABLE_NAME	mmuuid:587dffc4-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKTABLE_OWNER	6	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKTABLE_OWNER	mmuuid:587dffc5-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKCOLUMN_NAME	4	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKCOLUMN_NAME	mmuuid:587dffc6-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FK_NAME	12	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FK_NAME	mmuuid:587dffc7-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKTABLE_OWNER	2	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKTABLE_OWNER	mmuuid:587dffc8-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	UPDATE_RULE	10	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_FKEYS	UPDATE_RULE	mmuuid:587dffc9-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	DELETE_RULE	11	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	OA_FKEYS	DELETE_RULE	mmuuid:587dffca-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	FKCOLUMN_NAME	8	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	FKCOLUMN_NAME	mmuuid:587dffcb-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKTABLE_NAME	3	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKTABLE_NAME	mmuuid:587dffcc-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	OA_FKEYS	System.ODBC.OA_FKEYS	PKTABLE_QUALIFIER	1	null	string	0	128	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	128	128	10	OA_FKEYS	PKTABLE_QUALIFIER	mmuuid:587dffcd-2ca5-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	KeyName	4	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	KEYNAME	mmuuid:58a81400-ba68-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	RefKeyUID	8	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYELEMENTS	REFKEYUID	mmuuid:58a81402-ba68-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	UID	9	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYELEMENTS	UID	mmuuid:58a81403-ba68-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	GroupUpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	GROUPUPPERNAME	mmuuid:58a81404-ba68-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	TypeLength	9	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	PROCEDUREPARAMS	TYPELENGTH	mmuuid:5e0fac00-634e-1e44-a903-c1472e78d1c5	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	Description	7	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	225	255	10	PROCEDURES	DESCRIPTION	mmuuid:61164b00-3ab4-1edb-8606-be949cc6da52	null", //$NON-NLS-1$
+				"System	DataTypeProperties	System.DataTypeProperties	DataType	1	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPEPROPERTIES	DATATYPE	mmuuid:6609d102-c90a-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	DataTypeProperties	System.DataTypeProperties	Name	2	null	string	0	50	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEPROPERTIES	NAME	mmuuid:6609d103-c90a-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	DataTypeProperties	System.DataTypeProperties	Value	3	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPEPROPERTIES	VALUE	mmuuid:6609d106-c90a-1de7-ad1c-f3ce4292824e	null", //$NON-NLS-1$
+				"System	Models	System.Models	SupportsWhereAll	3	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSWHEREALL	mmuuid:6b529981-b67c-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Models	System.Models	SupportsOrderBy	4	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSORDERBY	mmuuid:6c377b40-b67c-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Models	System.Models	SupportsJoin	5	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSJOIN	mmuuid:6c377b42-b67c-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Models	System.Models	SupportsDistinct	6	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSDISTINCT	mmuuid:6c377b43-b67c-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Models	System.Models	SupportsOuterJoin	7	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	SUPPORTSOUTERJOIN	mmuuid:6c377b44-b67c-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDURES	MODELNAME	mmuuid:7a19a9c2-b863-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	Name	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDURES	NAME	mmuuid:7a19a9c3-b863-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	ModelUID	5	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	PROCEDURES	MODELUID	mmuuid:7a19a9c6-b863-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	ReturnsResults	4	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	PROCEDURES	RETURNSRESULTS	mmuuid:7afe8b81-b863-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	UID	6	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	PROCEDURES	UID	mmuuid:7afe8b83-b863-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	MODELNAME	mmuuid:7b0da102-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	GroupName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	GROUPNAME	mmuuid:7b0da103-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	GroupFullName	3	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	ELEMENTS	GROUPFULLNAME	mmuuid:7b0da104-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	Name	4	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	NAME	mmuuid:7b0da105-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	Position	5	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	POSITION	mmuuid:7b0da106-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	DataType	7	null	string	0	100	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	ELEMENTS	DATATYPE	mmuuid:7bf282c3-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	Scale	8	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	SCALE	mmuuid:7bf282c4-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	ElementLength	9	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	ELEMENTLENGTH	mmuuid:7bf282c5-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	IsLengthFixed	10	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISLENGTHFIXED	mmuuid:7bf282c7-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	SupportsSelect	11	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	SUPPORTSSELECT	mmuuid:7bf282c8-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	SupportsUpdates	12	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	SUPPORTSUPDATES	mmuuid:7ce6a6c0-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	IsCaseSensitive	13	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISCASESENSITIVE	mmuuid:7ce6a6c1-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	IsSigned	14	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISSIGNED	mmuuid:7ce6a6c2-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	IsCurrency	15	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISCURRENCY	mmuuid:7ce6a6c3-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	IsAutoIncremented	16	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	ELEMENTS	ISAUTOINCREMENTED	mmuuid:7ce6a6c4-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	NullType	17	null	string	0	20	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	ELEMENTS	NULLTYPE	mmuuid:7ce6a6c5-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	MinRange	18	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTS	MINRANGE	mmuuid:7ce6a6c6-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	MaxRange	19	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTS	MAXRANGE	mmuuid:7ce6a6c7-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	SearchType	20	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	ELEMENTS	SEARCHTYPE	mmuuid:7ce6a6c8-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	Format	21	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	FORMAT	mmuuid:7ce6a6c9-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	DefaultValue	22	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	DEFAULTVALUE	mmuuid:7ddacac1-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	JavaClass	23	null	string	0	500	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	500	500	10	ELEMENTS	JAVACLASS	mmuuid:7ddacac2-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	UID	29	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	ELEMENTS	UID	mmuuid:7ddacac3-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	Precision	24	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	PRECISION	mmuuid:7ddacac5-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	Radix	26	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	RADIX	mmuuid:7ddacac7-b9b3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	VirtualDatabases	System.VirtualDatabases	Name	1	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	VIRTUALDATABASES	NAME	mmuuid:8cfee540-c1d3-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	VirtualDatabases	System.VirtualDatabases	Version	2	null	string	0	50	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	VIRTUALDATABASES	VERSION	mmuuid:8cfee541-c1d3-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	NameInSource	6	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	NAMEINSOURCE	mmuuid:8f854500-3416-1dee-8e07-e3cb3008f82b	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	Type	6	null	string	0	100	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	PROCEDUREPARAMS	TYPE	mmuuid:91fce1c0-6663-1de8-a732-e7f41500bc3a	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	Scale	10	null	integer	0	10	true	true	true	false	false	false	false	No Nulls	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	PROCEDUREPARAMS	SCALE	mmuuid:95044680-634e-1e44-a903-c1472e78d1c5	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPARAMS	MODELNAME	mmuuid:959eca00-b8f3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	ProcedureName	2	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPARAMS	PROCEDURENAME	mmuuid:959eca01-b8f3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	PROCEDUREPARAMS	NAME	mmuuid:959eca03-b8f3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	DataType	4	null	string	0	25	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	25	25	10	PROCEDUREPARAMS	DATATYPE	mmuuid:959eca04-b8f3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	Position	5	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	PROCEDUREPARAMS	POSITION	mmuuid:959eca06-b8f3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	Optional	7	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	PROCEDUREPARAMS	OPTIONAL	mmuuid:959eca08-b8f3-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	NameInSource	5	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	NAMEINSOURCE	mmuuid:9a749d40-3424-1dee-8e07-e3cb3008f82b	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYPROPERTIES	MODELNAME	mmuuid:9ba7aa01-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKTABLE_CAT	5	null	string	0	1	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	1	1	10	REFERENCEKEYCOLUMNS	FKTABLE_CAT	mmuuid:9d4fe981-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	DELETE_RULE	11	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	REFERENCEKEYCOLUMNS	DELETE_RULE	mmuuid:9d4fe982-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKTABLE_SCHEM	6	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FKTABLE_SCHEM	mmuuid:9d4fe983-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PK_NAME	13	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PK_NAME	mmuuid:9d4fe984-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKCOLUMN_NAME	8	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FKCOLUMN_NAME	mmuuid:9d4fe985-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKTABLE_NAME	3	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PKTABLE_NAME	mmuuid:9d4fe986-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FK_NAME	12	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FK_NAME	mmuuid:9d4fe987-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	KEY_SEQ	9	null	short	0	5	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Short	5	5	10	REFERENCEKEYCOLUMNS	KEY_SEQ	mmuuid:9d4fe988-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKTABLE_CAT	1	null	string	0	1	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	1	1	10	REFERENCEKEYCOLUMNS	PKTABLE_CAT	mmuuid:9d4fe989-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	UPDATE_RULE	10	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	REFERENCEKEYCOLUMNS	UPDATE_RULE	mmuuid:9d4fe98a-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	FKTABLE_NAME	7	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	FKTABLE_NAME	mmuuid:9d4fe98b-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	DEFERRABILITY	14	null	integer	0	10	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	REFERENCEKEYCOLUMNS	DEFERRABILITY	mmuuid:9d4fe98c-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKCOLUMN_NAME	4	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PKCOLUMN_NAME	mmuuid:9d4fe98d-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	ReferenceKeyColumns	System.JDBC.ReferenceKeyColumns	PKTABLE_SCHEM	2	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	REFERENCEKEYCOLUMNS	PKTABLE_SCHEM	mmuuid:9d4fe98e-2c99-1f8d-a539-a73e664462a1	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	KEYPROPERTIES	GROUPFULLNAME	mmuuid:9d80afc0-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	Type	6	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	KEYS	TYPE	mmuuid:9e0dce80-ce82-1de7-8c2d-d908d66ab0ba	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	IsMaterialized	13	null	boolean	0	0	false	true	true	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	0	0	10	GROUPS	ISMATERIALIZED	mmuuid:9e5c3980-04e6-101e-861a-a893857ac5a5	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	KeyName	3	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	KEYPROPERTIES	KEYNAME	mmuuid:9e74d3c0-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	Name	4	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	KEYPROPERTIES	NAME	mmuuid:9e74d3c5-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	Value	5	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	0	255	10	KEYPROPERTIES	VALUE	mmuuid:9e74d3ca-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	GroupName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYPROPERTIES	GROUPNAME	mmuuid:9e74d3cf-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	GroupUpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYPROPERTIES	GROUPUPPERNAME	mmuuid:9e74d3d4-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	KeyProperties	System.KeyProperties	UID	8	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYPROPERTIES	UID	mmuuid:9f68f7c0-1142-1ff5-a438-98ce9bfae8da	null", //$NON-NLS-1$
+				"System	Models	System.Models	PrimaryMetamodelURI	11	null	string	0	255	false	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	MODELS	PRIMARYMETAMODELURI	mmuuid:a5682040-ea71-1ee5-b836-ce1850f9b1e5	null", //$NON-NLS-1$
+				"System	Procedures	System.Procedures	FullName	8	null	string	0	2048	false	true	true	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	PROCEDURES	FULLNAME	mmuuid:af58c3c0-23d0-1f11-bb31-8e2670f95fb1	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	Description	11	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	DESCRIPTION	mmuuid:afce0780-3a4e-1edb-8606-be949cc6da52	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	UID	9	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	GROUPS	UID	mmuuid:b1e4e240-ec67-1de9-9115-ad36abcfb081	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	MODELNAME	mmuuid:b1e4e243-ec67-1de9-9115-ad36abcfb081	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	FullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	GROUPS	FULLNAME	mmuuid:b1e4e244-ec67-1de9-9115-ad36abcfb081	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	Name	3	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	NAME	mmuuid:b1e4e245-ec67-1de9-9115-ad36abcfb081	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	IsPhysical	6	null	boolean	0	1	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	GROUPS	ISPHYSICAL	mmuuid:b1e4e248-ec67-1de9-9115-ad36abcfb081	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	Cardinality	10	null	integer	0	10	false	true	false	true	true	false	false	No Nulls	null	null	All Except Like	null	null	java.lang.Integer	10	10	10	GROUPS	CARDINALITY	mmuuid:b2d85ec0-ebd5-1eda-b235-cf50afc035e1	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	UpperName	7	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	UPPERNAME	mmuuid:b2d90641-ec67-1de9-9115-ad36abcfb081	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	Type	4	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	GROUPS	TYPE	mmuuid:b2d90642-ec67-1de9-9115-ad36abcfb081	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	CharOctetLength	25	null	integer	0	10	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	ELEMENTS	CHAROCTETLENGTH	mmuuid:c0b5e1c0-cdd8-1de7-8c2d-d908d66ab0ba	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	NameInSource	5	null	string	0	255	true	true	false	true	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPS	NAMEINSOURCE	mmuuid:c143df00-3409-1dee-8e07-e3cb3008f82b	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	Radix	11	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	PROCEDUREPARAMS	RADIX	mmuuid:c65e8d80-634e-1e44-a903-c1472e78d1c5	null", //$NON-NLS-1$
+				"System	GroupProperties	System.GroupProperties	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	MODELNAME	mmuuid:c8e43042-c509-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	GroupProperties	System.GroupProperties	GroupName	5	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	GROUPNAME	mmuuid:c8e43043-c509-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	GroupProperties	System.GroupProperties	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	GROUPPROPERTIES	GROUPFULLNAME	mmuuid:c8e43044-c509-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	GroupProperties	System.GroupProperties	Name	3	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	NAME	mmuuid:c8e43045-c509-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	GroupProperties	System.GroupProperties	UID	7	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	GROUPPROPERTIES	UID	mmuuid:c8e43046-c509-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	GroupProperties	System.GroupProperties	Value	4	null	string	0	255	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	VALUE	mmuuid:c8e43048-c509-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	GroupProperties	System.GroupProperties	GroupUpperName	6	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	GROUPPROPERTIES	GROUPUPPERNAME	mmuuid:c8e43049-c509-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	Models	System.Models	IsPhysical	2	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	MODELS	ISPHYSICAL	mmuuid:d5a73440-b6b7-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Models	System.Models	MaxSetSize	8	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	MODELS	MAXSETSIZE	mmuuid:d5a73442-b6b7-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	KeyType	5	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	KEYELEMENTS	KEYTYPE	mmuuid:db288f80-ce87-1de7-8c2d-d908d66ab0ba	null", //$NON-NLS-1$
+				"System	DataTypeProperties	System.DataTypeProperties	UID	4	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPEPROPERTIES	UID	mmuuid:dba25280-a5e0-1e42-ba2a-a0f062ab71df	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	RuntimeType	16	null	string	0	64	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	64	64	10	DATATYPES	RUNTIMETYPE	mmuuid:de321500-e584-1e20-b806-d8b2a0a91d66	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	IsStandard	2	null	boolean	0	1	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	DATATYPES	ISSTANDARD	mmuuid:e21059c5-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	IsPhysical	3	null	boolean	0	1	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	DATATYPES	ISPHYSICAL	mmuuid:e2f53b80-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	TypeName	4	null	string	0	100	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	100	100	10	DATATYPES	TYPENAME	mmuuid:e2f53b81-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	Scale	6	null	integer	0	10	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	(0)	java.lang.Integer	10	10	10	DATATYPES	SCALE	mmuuid:e2f53b82-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	NullType	8	null	string	0	20	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	DATATYPES	NULLTYPE	mmuuid:e2f53b84-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	IsSigned	9	null	boolean	0	1	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	('0')	java.lang.Boolean	1	1	10	DATATYPES	ISSIGNED	mmuuid:e2f53b85-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	IsAutoIncremented	10	null	boolean	0	1	true	true	false	true	true	false	false	No Nulls	null	null	Searchable	null	('0')	java.lang.Boolean	1	1	10	DATATYPES	ISAUTOINCREMENTED	mmuuid:e2f53b86-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	IsCaseSensitive	11	null	boolean	0	1	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	('0')	java.lang.Boolean	1	1	10	DATATYPES	ISCASESENSITIVE	mmuuid:e2f53b87-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	JavaClass	5	null	string	0	500	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	500	500	10	DATATYPES	JAVACLASS	mmuuid:e3e95f82-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	UID	15	null	string	0	50	true	true	false	false	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	DATATYPES	UID	mmuuid:e3e95f83-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	Precision	12	null	integer	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPES	PRECISION	mmuuid:e3e95f84-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	Radix	13	null	integer	0	10	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.Integer	10	10	10	DATATYPES	RADIX	mmuuid:e3e95f85-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	SearchType	14	null	string	0	20	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	20	20	10	DATATYPES	SEARCHTYPE	mmuuid:e3e95f87-b80e-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	Description	18	null	string	0	255	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	DATATYPES	DESCRIPTION	mmuuid:e81d8400-3a83-1edb-8606-be949cc6da52	null", //$NON-NLS-1$
+				"System	DataTypes	System.DataTypes	BaseType	17	null	string	0	64	true	true	false	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	64	64	10	DATATYPES	BASETYPE	mmuuid:e8729800-e584-1e20-b806-d8b2a0a91d66	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	GroupUpperName	27	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	GROUPUPPERNAME	mmuuid:e92fbb00-c2a0-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	Elements	System.Elements	UpperName	28	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	ELEMENTS	UPPERNAME	mmuuid:ea23df00-c2a0-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	KeyElements	System.KeyElements	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYELEMENTS	NAME	mmuuid:ed887840-c318-1de7-b515-bad6cb0abb8d	null", //$NON-NLS-1$
+				"System	Groups	System.Groups	IsSystem	12	null	boolean	0	1	false	true	true	true	true	false	false	Nullable	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	GROUPS	ISSYSTEM	mmuuid:ee427900-7eec-1eea-940e-bcb0b71c723a	null", //$NON-NLS-1$
+				"System	ProcedureParams	System.ProcedureParams	NullType	12	null	string	0	10	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	10	10	10	PROCEDUREPARAMS	NULLTYPE	mmuuid:f8acf880-634e-1e44-a903-c1472e78d1c5	null", //$NON-NLS-1$
+				"PartsSupplier	PARTS	PartsSupplier.PARTSSUPPLIER.PARTS	PART_ID	1	PART_ID	string	0	4	true	true	true	true	true	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	0	4	10	PARTS	PART_ID	mmuuid:fadcd7c0-73fe-1edc-a81c-ecf397b10590	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	ModelName	1	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	MODELNAME	mmuuid:fe2c6482-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	GroupName	8	null	string	0	255	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	GROUPNAME	mmuuid:fe2c6483-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	GroupFullName	2	null	string	0	2048	true	true	false	true	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	2048	2048	10	KEYS	GROUPFULLNAME	mmuuid:fe2c6484-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	Name	3	null	string	0	255	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	NAME	mmuuid:fe2c6485-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	Description	4	null	string	0	255	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	255	255	10	KEYS	DESCRIPTION	mmuuid:fe2c6486-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	IsIndexed	7	null	boolean	0	1	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.Boolean	1	1	10	KEYS	ISINDEXED	mmuuid:ff208881-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	RefKeyUID	10	null	string	0	50	true	true	false	false	false	false	false	Nullable	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYS	REFKEYUID	mmuuid:ff208882-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
+				"System	Keys	System.Keys	UID	11	null	string	0	50	true	true	false	false	false	false	false	No Nulls	null	null	Searchable	null	null	java.lang.String	50	50	10	KEYS	UID	mmuuid:ff208884-b9eb-1de7-b705-ef2376c3949e	null", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* from System.Elements order by UID",
+		executeAndAssertResults("select* from System.Elements order by UID", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testGroupType() {
+	@Test public void testGroupType() {
 
-		String[] expected = { "Type[string]	", "Table", };
+		String[] expected = { "Type[string]	", "Table", }; //$NON-NLS-1$ //$NON-NLS-2$
 		executeAndAssertResults(
-				"select distinct Type from System.Groups order by Type",
+				"select distinct Type from System.Groups order by Type", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testGroupIsSystem() {
+	@Test public void testGroupIsSystem() {
 
-		String[] expected = { "Name[string]	", "PARTS", "SHIP_VIA", "STATUS",
-				"SUPPLIER", "SUPPLIER_PARTS", };
+		String[] expected = { "Name[string]	", "PARTS", "SHIP_VIA", "STATUS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				"SUPPLIER", "SUPPLIER_PARTS", }; //$NON-NLS-1$ //$NON-NLS-2$
 		executeAndAssertResults(
-				"select Name from System.Groups where IsSystem = 'false' order by Name",
+				"select Name from System.Groups where IsSystem = 'false' order by Name", //$NON-NLS-1$
 				expected);
 	}
 
-	public void test_OA_PROC() {
+	@Test public void test_OA_PROC() {
 
 		String[] expected = {
-				"OA_QUALIFIER[string]	OA_OWNER[string]	OA_NAME[string]	NUM_INPUT_PARAMS[integer]	NUM_OUTPUT_PARAMS[integer]	NUM_RESULT_SETS[integer]	REMARKS[string]	PROCEDURE_TYPE[short]",
-				"PartsSupplier	System	describe	0	0	0	null	1",
-				"PartsSupplier	System	getBinaryVDBResource	0	0	0	null	1",
-				"PartsSupplier	System	getCharacterVDBResource	0	0	0	null	1",
-				"PartsSupplier	System	getUpdatedCharacterVDBResource	0	0	0	null	1",
-				"PartsSupplier	System	getVDBResourcePaths	0	0	0	null	1",
+				"OA_QUALIFIER[string]	OA_OWNER[string]	OA_NAME[string]	NUM_INPUT_PARAMS[integer]	NUM_OUTPUT_PARAMS[integer]	NUM_RESULT_SETS[integer]	REMARKS[string]	PROCEDURE_TYPE[short]", //$NON-NLS-1$
+				"PartsSupplier	System	describe	0	0	0	null	1", //$NON-NLS-1$
+				"PartsSupplier	System	getBinaryVDBResource	0	0	0	null	1", //$NON-NLS-1$
+				"PartsSupplier	System	getCharacterVDBResource	0	0	0	null	1", //$NON-NLS-1$
+				"PartsSupplier	System	getUpdatedCharacterVDBResource	0	0	0	null	1", //$NON-NLS-1$
+				"PartsSupplier	System	getVDBResourcePaths	0	0	0	null	1", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* FROM System.ODBC.OA_PROC", expected);
+		executeAndAssertResults("select* FROM System.ODBC.OA_PROC", expected); //$NON-NLS-1$
 	}
 
-	public void test_OA_PROCCOLUMNS() {
+	@Test public void test_OA_PROCCOLUMNS() {
 
 		String[] expected = {
-				"OA_QUALIFIER[string]	OA_OWNER[string]	OA_NAME[string]	COLUMN_NAME[string]	OA_COLUMNTYPE[short]	DATA_TYPE[short]	TYPE_NAME[string]	OA_PRECISION[integer]	OA_LENGTH[integer]	OA_RADIX[integer]	OA_SCALE[integer]	OA_NULLABLE[short]	OA_SCOPE[short]	REMARKS[string]",
-				"PartsSupplier	System	describe	Description	0	12	VARCHAR	128	128	10	0	0	0	",
-				"PartsSupplier	System	describe	entity	0	12	VARCHAR	0	0	10	0	0	0	",
-				"PartsSupplier	System	getBinaryVDBResource	VdbResource	0	12	VARCHAR	0	0	10	0	1	0	",
-				"PartsSupplier	System	getBinaryVDBResource	resourcePath	0	12	VARCHAR	50	50	10	0	0	0	",
-				"PartsSupplier	System	getCharacterVDBResource	VdbResource	0	12	VARCHAR	0	0	10	0	1	0	",
-				"PartsSupplier	System	getCharacterVDBResource	resourcePath	0	12	VARCHAR	50	50	10	0	0	0	",
-				"PartsSupplier	System	getUpdatedCharacterVDBResource	VdbResource	0	12	VARCHAR	0	0	10	0	1	0	",
-				"PartsSupplier	System	getUpdatedCharacterVDBResource	resourcePath	0	12	VARCHAR	50	50	10	0	0	0	",
-				"PartsSupplier	System	getUpdatedCharacterVDBResource	tokenReplacements	0	12	VARCHAR	0	0	10	0	0	0	",
-				"PartsSupplier	System	getUpdatedCharacterVDBResource	tokens	0	12	VARCHAR	0	0	10	0	0	0	",
-				"PartsSupplier	System	getVDBResourcePaths	ResourcePath	0	12	VARCHAR	50	50	10	0	1	0	",
-				"PartsSupplier	System	getVDBResourcePaths	isBinary	0	5	SMALLINT	1	1	10	0	1	0",
+				"OA_QUALIFIER[string]	OA_OWNER[string]	OA_NAME[string]	COLUMN_NAME[string]	OA_COLUMNTYPE[short]	DATA_TYPE[short]	TYPE_NAME[string]	OA_PRECISION[integer]	OA_LENGTH[integer]	OA_RADIX[integer]	OA_SCALE[integer]	OA_NULLABLE[short]	OA_SCOPE[short]	REMARKS[string]", //$NON-NLS-1$
+				"PartsSupplier	System	describe	Description	0	12	VARCHAR	128	128	10	0	0	0	", //$NON-NLS-1$
+				"PartsSupplier	System	describe	entity	0	12	VARCHAR	0	0	10	0	0	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getBinaryVDBResource	VdbResource	0	12	VARCHAR	0	0	10	0	1	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getBinaryVDBResource	resourcePath	0	12	VARCHAR	50	50	10	0	0	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getCharacterVDBResource	VdbResource	0	12	VARCHAR	0	0	10	0	1	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getCharacterVDBResource	resourcePath	0	12	VARCHAR	50	50	10	0	0	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getUpdatedCharacterVDBResource	VdbResource	0	12	VARCHAR	0	0	10	0	1	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getUpdatedCharacterVDBResource	resourcePath	0	12	VARCHAR	50	50	10	0	0	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getUpdatedCharacterVDBResource	tokenReplacements	0	12	VARCHAR	0	0	10	0	0	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getUpdatedCharacterVDBResource	tokens	0	12	VARCHAR	0	0	10	0	0	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getVDBResourcePaths	ResourcePath	0	12	VARCHAR	50	50	10	0	1	0	", //$NON-NLS-1$
+				"PartsSupplier	System	getVDBResourcePaths	isBinary	0	5	SMALLINT	1	1	10	0	1	0", //$NON-NLS-1$
 
 		};
 		executeAndAssertResults(
-				"select* FROM System.ODBC.OA_PROCCOLUMNS ORDER BY OA_NAME, COLUMN_NAME ",
+				"select* FROM System.ODBC.OA_PROCCOLUMNS ORDER BY OA_NAME, COLUMN_NAME ", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testOATYPES() {
-		String[] expected = { "TYPE_NAME[string]	DATA_TYPE[short]	PRECISION[integer]	LITERAL_PREFIX[string]	LITERAL_SUFFIX[string]	CREATE_PARAMS[string]	NULLABLE[short]	CASE_SENSITIVE[short]	SEARCHABLE[short]	UNSIGNED_ATTRIBUTE[short]	MONEY[short]	AUTO_INCREMENT[short]	LOCAL_TYPE_NAME[string]	MINIMUM_SCALE[short]	MAXIMUM_SCALE[short]", };
+	@Test public void testOATYPES() {
+		String[] expected = { "TYPE_NAME[string]	DATA_TYPE[short]	PRECISION[integer]	LITERAL_PREFIX[string]	LITERAL_SUFFIX[string]	CREATE_PARAMS[string]	NULLABLE[short]	CASE_SENSITIVE[short]	SEARCHABLE[short]	UNSIGNED_ATTRIBUTE[short]	MONEY[short]	AUTO_INCREMENT[short]	LOCAL_TYPE_NAME[string]	MINIMUM_SCALE[short]	MAXIMUM_SCALE[short]", }; //$NON-NLS-1$
 
 		executeAndAssertResults(
-				"select TYPE_NAME, DATA_TYPE, OA_PRECISION as PRECISION, LITERAL_PREFIX, LITERAL_SUFFIX, "
-						+ " CREATE_PARAMS, OA_NULLABLE as NULLABLE, CASE_SENSITIVE, OA_SEARCHABLE as SEARCHABLE, "
-						+ " UNSIGNED_ATTRIB as UNSIGNED_ATTRIBUTE, OA_MONEY as MONEY, AUTO_INCREMENT, LOCAL_TYPE_NAME, "
-						+ " MINIMUM_SCALE, MAXIMUM_SCALE  FROM System.ODBC.OA_TYPES  WHERE DATA_TYPE = -6",
+				"select TYPE_NAME, DATA_TYPE, OA_PRECISION as PRECISION, LITERAL_PREFIX, LITERAL_SUFFIX, " //$NON-NLS-1$
+						+ " CREATE_PARAMS, OA_NULLABLE as NULLABLE, CASE_SENSITIVE, OA_SEARCHABLE as SEARCHABLE, " //$NON-NLS-1$
+						+ " UNSIGNED_ATTRIB as UNSIGNED_ATTRIBUTE, OA_MONEY as MONEY, AUTO_INCREMENT, LOCAL_TYPE_NAME, " //$NON-NLS-1$
+						+ " MINIMUM_SCALE, MAXIMUM_SCALE  FROM System.ODBC.OA_TYPES  WHERE DATA_TYPE = -6", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testOACOLUMNSAll() {
+	@Test public void testOACOLUMNSAll() {
 
 		String[] expected = {
-				"TABLE_QUALIFIER[string]	TABLE_OWNER[string]	TABLE_NAME[string]	COLUMN_NAME[string]	DATA_TYPE[short]	TYPE_NAME[string]	OA_LENGTH[integer]	OA_PRECISION[integer]	OA_SCALE[integer]	OA_RADIX[integer]	OA_NULLABLE[short]	OA_SCOPE[short]	PSEUDO_COLUMN[short]	OA_COLUMNTYPE[short]	REMARKS[string]",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_COLOR	12	VARCHAR	30	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_ID	12	VARCHAR	4	0	0	10	0	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_NAME	12	VARCHAR	255	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_WEIGHT	12	VARCHAR	255	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	SHIPPER_ID	5	SMALLINT	0	2	0	10	0	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	SHIPPER_NAME	12	VARCHAR	30	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_ID	5	SMALLINT	0	2	0	10	0	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_NAME	12	VARCHAR	30	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_CITY	12	VARCHAR	30	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_ID	12	VARCHAR	10	0	0	10	0	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_NAME	12	VARCHAR	30	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_STATE	12	VARCHAR	2	0	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_STATUS	5	SMALLINT	0	2	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	PART_ID	12	VARCHAR	4	0	0	10	0	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	QUANTITY	5	SMALLINT	0	3	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SHIPPER_ID	5	SMALLINT	0	2	0	10	1	0	0	0	null",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SUPPLIER_ID	12	VARCHAR	10	0	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElementProperties	DataTypeElementName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElementProperties	DataTypeName	12	VARCHAR	100	100	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElementProperties	Name	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElementProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElementProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElements	DataTypeName	12	VARCHAR	100	100	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElements	ElementLength	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElements	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElements	Position	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElements	Scale	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeElements	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeProperties	DataType	12	VARCHAR	100	100	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeProperties	Name	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypeProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	BaseType	12	VARCHAR	64	64	0	10	1	0	0	0	null",
-				"PartsSupplier	System	DataTypes	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	DataTypes	IsAutoIncremented	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	IsCaseSensitive	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	IsPhysical	5	SMALLINT	1	1	0	10	1	0	0	0	null",
-				"PartsSupplier	System	DataTypes	IsSigned	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	IsStandard	5	SMALLINT	1	1	0	10	1	0	0	0	null",
-				"PartsSupplier	System	DataTypes	JavaClass	12	VARCHAR	500	500	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	Name	12	VARCHAR	100	100	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	NullType	12	VARCHAR	20	20	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	Precision	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	Radix	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System	DataTypes	RuntimeType	12	VARCHAR	64	64	0	10	1	0	0	0	null",
-				"PartsSupplier	System	DataTypes	Scale	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System	DataTypes	SearchType	12	VARCHAR	20	20	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	TypeLength	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	TypeName	12	VARCHAR	100	100	0	10	0	0	0	0	null",
-				"PartsSupplier	System	DataTypes	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	ElementName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	ElementUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ElementProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	CharOctetLength	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Elements	DataType	12	VARCHAR	100	100	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	DefaultValue	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Elements	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Elements	ElementLength	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	Format	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Elements	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	IsAutoIncremented	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	IsCaseSensitive	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	IsCurrency	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	IsLengthFixed	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	IsSigned	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	JavaClass	12	VARCHAR	500	500	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	MaxRange	12	VARCHAR	50	50	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Elements	MinRange	12	VARCHAR	50	50	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Elements	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Elements	NullType	12	VARCHAR	20	20	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	Position	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	Precision	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	Radix	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	Scale	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	SearchType	12	VARCHAR	20	20	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	SupportsSelect	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	SupportsUpdates	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Elements	UpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	GroupProperties	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	GroupProperties	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	GroupProperties	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	GroupProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	GroupProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	GroupProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	GroupProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	Cardinality	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Groups	FullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	IsMaterialized	5	SMALLINT	0	0	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	IsPhysical	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	IsSystem	5	SMALLINT	1	1	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Groups	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Groups	SupportsUpdates	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	Type	12	VARCHAR	20	20	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Groups	UpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyElements	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyElements	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyElements	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyElements	KeyName	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	KeyElements	KeyType	12	VARCHAR	20	20	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyElements	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyElements	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyElements	Position	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System	KeyElements	RefKeyUID	12	VARCHAR	50	50	0	10	1	0	0	0	null",
-				"PartsSupplier	System	KeyElements	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	KeyName	12	VARCHAR	255	0	0	10	1	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	Name	12	VARCHAR	255	0	0	10	1	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	KeyProperties	Value	12	VARCHAR	255	0	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Keys	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Keys	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Keys	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Keys	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Keys	IsIndexed	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Keys	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Keys	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Keys	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Keys	RefKeyUID	12	VARCHAR	50	50	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Keys	Type	12	VARCHAR	20	20	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Keys	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ModelProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ModelProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ModelProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ModelProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Models	IsPhysical	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	MaxSetSize	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	PrimaryMetamodelURI	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	SupportsDistinct	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	SupportsJoin	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	SupportsOrderBy	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	SupportsOuterJoin	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	SupportsWhereAll	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Models	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	DataType	12	VARCHAR	25	25	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	NullType	12	VARCHAR	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	Optional	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	Position	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	Precision	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	ProcedureName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	Radix	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	Scale	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	Type	12	VARCHAR	100	100	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureParams	TypeLength	4	INTEGER	10	10	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureProperties	ProcedureName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	ProcedureProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Procedures	Description	12	VARCHAR	255	225	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Procedures	FullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Procedures	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Procedures	ModelUID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Procedures	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Procedures	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System	Procedures	ReturnsResults	5	SMALLINT	1	1	0	10	0	0	0	0	null",
-				"PartsSupplier	System	Procedures	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System	VirtualDatabases	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null",
-				"PartsSupplier	System	VirtualDatabases	Version	12	VARCHAR	50	50	0	10	0	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	DEFERRABILITY	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	DELETE_RULE	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKCOLUMN_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKTABLE_CAT	12	VARCHAR	1	1	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKTABLE_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKTABLE_SCHEM	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FK_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	KEY_SEQ	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKCOLUMN_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKTABLE_CAT	12	VARCHAR	1	1	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKTABLE_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKTABLE_SCHEM	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PK_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null",
-				"PartsSupplier	System/JDBC	ReferenceKeyColumns	UPDATE_RULE	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	COLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	DATA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_COLUMNTYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_LENGTH	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_NULLABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_PRECISION	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_RADIX	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_SCALE	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_SCOPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	PSEUDO_COLUMN	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	TABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	TABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	TABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_COLUMNS	TYPE_NAME	12	VARCHAR	100	100	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	DELETE_RULE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	FKCOLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	FKTABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	FKTABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	FKTABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	FK_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	KEY_SEQ	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	PKCOLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	PKTABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	PKTABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	PKTABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	PK_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_FKEYS	UPDATE_RULE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	NUM_INPUT_PARAMS	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	NUM_OUTPUT_PARAMS	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	NUM_RESULT_SETS	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	OA_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	OA_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	OA_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	PROCEDURE_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROC	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	COLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	DATA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_COLUMNTYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_LENGTH	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_NULLABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_PRECISION	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_RADIX	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_SCALE	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_SCOPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	TYPE_NAME	12	VARCHAR	100	100	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	COLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	FILTER_CONDITIONS	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	INDEX_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	INDEX_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	NON_UNIQUE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_CARDINALITY	12	VARCHAR	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_COLLATION	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_PAGES	12	VARCHAR	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	SEQ_IN_INDEX	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	TABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	TABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_STATISTICS	TABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TABLES	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_TYPE	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	AUTO_INCREMENT	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	CASE_SENSITIVE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	CREATE_PARAMS	12	VARCHAR	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	DATA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	LITERAL_PREFIX	12	VARCHAR	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	LITERAL_SUFFIX	12	VARCHAR	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	LOCAL_TYPE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	MAXIMUM_SCALE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	MINIMUM_SCALE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	OA_MONEY	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	OA_NULLABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	OA_PRECISION	4	INTEGER	10	10	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	OA_SEARCHABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	TYPE_NAME	12	VARCHAR	100	100	0	10	1	0	0	0	null",
-				"PartsSupplier	System/ODBC	OA_TYPES	UNSIGNED_ATTRIB	5	SMALLINT	5	5	0	10	1	0	0	0	null",
+				"TABLE_QUALIFIER[string]	TABLE_OWNER[string]	TABLE_NAME[string]	COLUMN_NAME[string]	DATA_TYPE[short]	TYPE_NAME[string]	OA_LENGTH[integer]	OA_PRECISION[integer]	OA_SCALE[integer]	OA_RADIX[integer]	OA_NULLABLE[short]	OA_SCOPE[short]	PSEUDO_COLUMN[short]	OA_COLUMNTYPE[short]	REMARKS[string]", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_COLOR	12	VARCHAR	30	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_ID	12	VARCHAR	4	0	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_NAME	12	VARCHAR	255	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_WEIGHT	12	VARCHAR	255	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	SHIPPER_ID	5	SMALLINT	0	2	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	SHIPPER_NAME	12	VARCHAR	30	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_ID	5	SMALLINT	0	2	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_NAME	12	VARCHAR	30	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_CITY	12	VARCHAR	30	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_ID	12	VARCHAR	10	0	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_NAME	12	VARCHAR	30	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_STATE	12	VARCHAR	2	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_STATUS	5	SMALLINT	0	2	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	PART_ID	12	VARCHAR	4	0	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	QUANTITY	5	SMALLINT	0	3	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SHIPPER_ID	5	SMALLINT	0	2	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SUPPLIER_ID	12	VARCHAR	10	0	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElementProperties	DataTypeElementName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElementProperties	DataTypeName	12	VARCHAR	100	100	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElementProperties	Name	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElementProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElementProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElements	DataTypeName	12	VARCHAR	100	100	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElements	ElementLength	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElements	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElements	Position	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElements	Scale	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeElements	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeProperties	DataType	12	VARCHAR	100	100	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeProperties	Name	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypeProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	BaseType	12	VARCHAR	64	64	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	IsAutoIncremented	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	IsCaseSensitive	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	IsPhysical	5	SMALLINT	1	1	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	IsSigned	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	IsStandard	5	SMALLINT	1	1	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	JavaClass	12	VARCHAR	500	500	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	Name	12	VARCHAR	100	100	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	NullType	12	VARCHAR	20	20	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	Precision	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	Radix	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	RuntimeType	12	VARCHAR	64	64	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	Scale	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	SearchType	12	VARCHAR	20	20	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	TypeLength	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	TypeName	12	VARCHAR	100	100	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	DataTypes	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	ElementName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	ElementUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ElementProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	CharOctetLength	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	DataType	12	VARCHAR	100	100	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	DefaultValue	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	ElementLength	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	Format	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	IsAutoIncremented	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	IsCaseSensitive	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	IsCurrency	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	IsLengthFixed	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	IsSigned	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	JavaClass	12	VARCHAR	500	500	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	MaxRange	12	VARCHAR	50	50	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	MinRange	12	VARCHAR	50	50	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	NullType	12	VARCHAR	20	20	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	Position	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	Precision	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	Radix	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	Scale	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	SearchType	12	VARCHAR	20	20	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	SupportsSelect	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	SupportsUpdates	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Elements	UpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	GroupProperties	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	GroupProperties	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	GroupProperties	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	GroupProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	GroupProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	GroupProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	GroupProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	Cardinality	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	FullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	IsMaterialized	5	SMALLINT	0	0	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	IsPhysical	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	IsSystem	5	SMALLINT	1	1	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	SupportsUpdates	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	Type	12	VARCHAR	20	20	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Groups	UpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	KeyName	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	KeyType	12	VARCHAR	20	20	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	Position	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	RefKeyUID	12	VARCHAR	50	50	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyElements	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	KeyName	12	VARCHAR	255	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	Name	12	VARCHAR	255	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	KeyProperties	Value	12	VARCHAR	255	0	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	GroupFullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	GroupName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	GroupUpperName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	IsIndexed	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	RefKeyUID	12	VARCHAR	50	50	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	Type	12	VARCHAR	20	20	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Keys	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ModelProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ModelProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ModelProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ModelProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	Description	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	IsPhysical	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	MaxSetSize	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	PrimaryMetamodelURI	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	SupportsDistinct	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	SupportsJoin	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	SupportsOrderBy	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	SupportsOuterJoin	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	SupportsWhereAll	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Models	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	DataType	12	VARCHAR	25	25	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	NullType	12	VARCHAR	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	Optional	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	Position	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	Precision	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	ProcedureName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	Radix	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	Scale	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	Type	12	VARCHAR	100	100	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureParams	TypeLength	4	INTEGER	10	10	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureProperties	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureProperties	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureProperties	ProcedureName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureProperties	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	ProcedureProperties	Value	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	Description	12	VARCHAR	255	225	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	FullName	12	VARCHAR	2048	2048	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	ModelName	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	ModelUID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	NameInSource	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	ReturnsResults	5	SMALLINT	1	1	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	Procedures	UID	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	VirtualDatabases	Name	12	VARCHAR	255	255	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System	VirtualDatabases	Version	12	VARCHAR	50	50	0	10	0	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	DEFERRABILITY	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	DELETE_RULE	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKCOLUMN_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKTABLE_CAT	12	VARCHAR	1	1	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKTABLE_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FKTABLE_SCHEM	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	FK_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	KEY_SEQ	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKCOLUMN_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKTABLE_CAT	12	VARCHAR	1	1	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKTABLE_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PKTABLE_SCHEM	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	PK_NAME	12	VARCHAR	255	255	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/JDBC	ReferenceKeyColumns	UPDATE_RULE	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	COLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	DATA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_COLUMNTYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_LENGTH	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_NULLABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_PRECISION	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_RADIX	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_SCALE	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	OA_SCOPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	PSEUDO_COLUMN	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	TABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	TABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	TABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_COLUMNS	TYPE_NAME	12	VARCHAR	100	100	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	DELETE_RULE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	FKCOLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	FKTABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	FKTABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	FKTABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	FK_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	KEY_SEQ	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	PKCOLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	PKTABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	PKTABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	PKTABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	PK_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_FKEYS	UPDATE_RULE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	NUM_INPUT_PARAMS	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	NUM_OUTPUT_PARAMS	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	NUM_RESULT_SETS	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	OA_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	OA_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	OA_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	PROCEDURE_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROC	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	COLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	DATA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_COLUMNTYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_LENGTH	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_NULLABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_PRECISION	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_RADIX	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_SCALE	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	OA_SCOPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_PROCCOLUMNS	TYPE_NAME	12	VARCHAR	100	100	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	COLUMN_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	FILTER_CONDITIONS	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	INDEX_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	INDEX_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	NON_UNIQUE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_CARDINALITY	12	VARCHAR	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_COLLATION	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_PAGES	12	VARCHAR	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	OA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	SEQ_IN_INDEX	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	TABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	TABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_STATISTICS	TABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TABLES	REMARKS	12	VARCHAR	254	254	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_OWNER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_QUALIFIER	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TABLES	TABLE_TYPE	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	AUTO_INCREMENT	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	CASE_SENSITIVE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	CREATE_PARAMS	12	VARCHAR	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	DATA_TYPE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	LITERAL_PREFIX	12	VARCHAR	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	LITERAL_SUFFIX	12	VARCHAR	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	LOCAL_TYPE_NAME	12	VARCHAR	128	128	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	MAXIMUM_SCALE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	MINIMUM_SCALE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	OA_MONEY	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	OA_NULLABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	OA_PRECISION	4	INTEGER	10	10	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	OA_SEARCHABLE	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	TYPE_NAME	12	VARCHAR	100	100	0	10	1	0	0	0	null", //$NON-NLS-1$
+				"PartsSupplier	System/ODBC	OA_TYPES	UNSIGNED_ATTRIB	5	SMALLINT	5	5	0	10	1	0	0	0	null", //$NON-NLS-1$
 
 		};
 
 		executeAndAssertResults(
-				"select* FROM System.ODBC.OA_COLUMNS ORDER BY TABLE_QUALIFIER, TABLE_OWNER, TABLE_NAME, COLUMN_NAME",
+				"select* FROM System.ODBC.OA_COLUMNS ORDER BY TABLE_QUALIFIER, TABLE_OWNER, TABLE_NAME, COLUMN_NAME", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testOATYPESAll() {
+	@Test public void testOATYPESAll() {
 		String[] expected = {
-				"TYPE_NAME[string]	DATA_TYPE[short]	OA_PRECISION[integer]	LITERAL_PREFIX[string]	LITERAL_SUFFIX[string]	CREATE_PARAMS[string]	OA_NULLABLE[short]	CASE_SENSITIVE[short]	OA_SEARCHABLE[short]	UNSIGNED_ATTRIB[short]	OA_MONEY[short]	AUTO_INCREMENT[short]	MINIMUM_SCALE[short]	MAXIMUM_SCALE[short]	LOCAL_TYPE_NAME[string]",
-				"CHAR	1	2147483647	'	'	null	1	1	3	0	0	0	null	null	CHAR",
-				"DATE	9	10	{d '	'}	null	1	0	2	0	0	0	null	null	DATE",
-				"DOUBLE	8	15	null	null	null	1	0	2	0	0	0	null	null	DOUBLE",
-				"FLOAT	6	15	null	null	null	1	0	2	0	0	0	null	null	FLOAT",
-				"INTEGER	4	10	null	null	null	1	0	2	0	0	0	null	null	INTEGER",
-				"LONGVARBINARY	-4	2147483647	0x	null	null	1	0	0	0	0	0	null	null	null",
-				"NUMERIC	2	32	null	null	null	1	0	2	0	0	0	0	32	NUMERIC",
-				"REAL	7	7	null	null	null	1	0	2	0	0	0	null	null	REAL",
-				"SMALLINT	5	5	null	null	null	1	0	2	0	0	0	null	null	SMALLINT",
-				"TIME	10	8	{t '	'}	null	1	0	2	0	0	0	null	null	TIME",
-				"TIMESTAMP	11	19	{ts '	'}	null	1	0	2	0	0	0	null	null	TIMESTAMP",
-				"VARCHAR	12	2147483647	'	'	null	1	1	3	0	0	0	null	null	VARCHAR", };
+				"TYPE_NAME[string]	DATA_TYPE[short]	OA_PRECISION[integer]	LITERAL_PREFIX[string]	LITERAL_SUFFIX[string]	CREATE_PARAMS[string]	OA_NULLABLE[short]	CASE_SENSITIVE[short]	OA_SEARCHABLE[short]	UNSIGNED_ATTRIB[short]	OA_MONEY[short]	AUTO_INCREMENT[short]	MINIMUM_SCALE[short]	MAXIMUM_SCALE[short]	LOCAL_TYPE_NAME[string]", //$NON-NLS-1$
+				"CHAR	1	2147483647	'	'	null	1	1	3	0	0	0	null	null	CHAR", //$NON-NLS-1$
+				"DATE	9	10	{d '	'}	null	1	0	2	0	0	0	null	null	DATE", //$NON-NLS-1$
+				"DOUBLE	8	15	null	null	null	1	0	2	0	0	0	null	null	DOUBLE", //$NON-NLS-1$
+				"FLOAT	6	15	null	null	null	1	0	2	0	0	0	null	null	FLOAT", //$NON-NLS-1$
+				"INTEGER	4	10	null	null	null	1	0	2	0	0	0	null	null	INTEGER", //$NON-NLS-1$
+				"LONGVARBINARY	-4	2147483647	0x	null	null	1	0	0	0	0	0	null	null	null", //$NON-NLS-1$
+				"NUMERIC	2	32	null	null	null	1	0	2	0	0	0	0	32	NUMERIC", //$NON-NLS-1$
+				"REAL	7	7	null	null	null	1	0	2	0	0	0	null	null	REAL", //$NON-NLS-1$
+				"SMALLINT	5	5	null	null	null	1	0	2	0	0	0	null	null	SMALLINT", //$NON-NLS-1$
+				"TIME	10	8	{t '	'}	null	1	0	2	0	0	0	null	null	TIME", //$NON-NLS-1$
+				"TIMESTAMP	11	19	{ts '	'}	null	1	0	2	0	0	0	null	null	TIMESTAMP", //$NON-NLS-1$
+				"VARCHAR	12	2147483647	'	'	null	1	1	3	0	0	0	null	null	VARCHAR", }; //$NON-NLS-1$
 		executeAndAssertResults(
-				"select* FROM System.ODBC.OA_TYPES ORDER BY TYPE_NAME",
+				"select* FROM System.ODBC.OA_TYPES ORDER BY TYPE_NAME", //$NON-NLS-1$
 				expected);
 
 	}
 
-	public void testOAFKEYS() {
+	@Test public void testOAFKEYS() {
 		String[] expected = {
-				"PKTABLE_QUALIFIER[string]	PKTABLE_OWNER[string]	PKTABLE_NAME[string]	PKCOLUMN_NAME[string]	FKTABLE_QUALIFIER[string]	FKTABLE_OWNER[string]	FKTABLE_NAME[string]	FKCOLUMN_NAME[string]	KEY_SEQ[short]	UPDATE_RULE[short]	DELETE_RULE[short]	FK_NAME[string]	PK_NAME[string]",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_PARTS",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	PART_ID	1	null	null	FK_SPLIER_PRTS_PRTS	PK_PARTS",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	SHIPPER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_SHIP_VIA",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_STATUS",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_STATUS	1	null	null	FK_SPLIER_STATS	PK_STATUS",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_SUPPLIER",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SUPPLIER_ID	1	null	null	FK_SPLY_PRTS_SPLY	PK_SUPPLIER",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SUPPLIER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_SUPPLIER_PARTS",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	PART_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	2	null	null	null	PK_SUPPLIER_PARTS",
+				"PKTABLE_QUALIFIER[string]	PKTABLE_OWNER[string]	PKTABLE_NAME[string]	PKCOLUMN_NAME[string]	FKTABLE_QUALIFIER[string]	FKTABLE_OWNER[string]	FKTABLE_NAME[string]	FKCOLUMN_NAME[string]	KEY_SEQ[short]	UPDATE_RULE[short]	DELETE_RULE[short]	FK_NAME[string]	PK_NAME[string]", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_PARTS", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	PART_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	PART_ID	1	null	null	FK_SPLIER_PRTS_PRTS	PK_PARTS", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	SHIPPER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_SHIP_VIA", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_STATUS", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	STATUS_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_STATUS	1	null	null	FK_SPLIER_STATS	PK_STATUS", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_SUPPLIER", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	SUPPLIER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SUPPLIER_ID	1	null	null	FK_SPLY_PRTS_SPLY	PK_SUPPLIER", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	SUPPLIER_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	1	null	null	null	PK_SUPPLIER_PARTS", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	PART_ID	PartsSupplier	PartsSupplier/PARTSSUPPLIER	null	null	2	null	null	null	PK_SUPPLIER_PARTS", //$NON-NLS-1$
 
 		};
 		executeAndAssertResults(
-				"select* FROM System.ODBC.OA_FKEYS ORDER BY PK_NAME, KEY_SEQ",
+				"select* FROM System.ODBC.OA_FKEYS ORDER BY PK_NAME, KEY_SEQ", //$NON-NLS-1$
 				expected);
 
 	}
 
-	public void testOASTATISTICS() {
+	@Test public void testOASTATISTICS() {
 		String[] expected = {
-				"TABLE_QUALIFIER[string]	TABLE_OWNER[string]	TABLE_NAME[string]	NON_UNIQUE[short]	INDEX_QUALIFIER[string]	INDEX_NAME[string]	OA_TYPE[short]	SEQ_IN_INDEX[short]	COLUMN_NAME[string]	OA_COLLATION[string]	OA_CARDINALITY[string]	OA_PAGES[string]	FILTER_CONDITIONS[string]",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	0		PK_SHIP_VIA	3	1	SHIPPER_ID	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	0		PK_STATUS	3	1	STATUS_ID	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	0		PK_SUPPLIER	3	1	SUPPLIER_ID	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	1		FK_SPLIER_STATS	3	1	SUPPLIER_STATUS	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	0		PK_SUPPLIER_PARTS	3	1	SUPPLIER_ID	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	1		FK_SPLY_PRTS_SPLY	3	1	SUPPLIER_ID	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	0		PK_SUPPLIER_PARTS	3	2	PART_ID	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	1		FK_SPLIER_PRTS_PRTS	3	1	PART_ID	null	null	null	",
-				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	0		PK_PARTS	3	1	PART_ID	null	null	null",
+				"TABLE_QUALIFIER[string]	TABLE_OWNER[string]	TABLE_NAME[string]	NON_UNIQUE[short]	INDEX_QUALIFIER[string]	INDEX_NAME[string]	OA_TYPE[short]	SEQ_IN_INDEX[short]	COLUMN_NAME[string]	OA_COLLATION[string]	OA_CARDINALITY[string]	OA_PAGES[string]	FILTER_CONDITIONS[string]", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SHIP_VIA	0		PK_SHIP_VIA	3	1	SHIPPER_ID	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	STATUS	0		PK_STATUS	3	1	STATUS_ID	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	0		PK_SUPPLIER	3	1	SUPPLIER_ID	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER	1		FK_SPLIER_STATS	3	1	SUPPLIER_STATUS	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	0		PK_SUPPLIER_PARTS	3	1	SUPPLIER_ID	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	1		FK_SPLY_PRTS_SPLY	3	1	SUPPLIER_ID	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	0		PK_SUPPLIER_PARTS	3	2	PART_ID	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	SUPPLIER_PARTS	1		FK_SPLIER_PRTS_PRTS	3	1	PART_ID	null	null	null	", //$NON-NLS-1$
+				"PartsSupplier	PartsSupplier/PARTSSUPPLIER	PARTS	0		PK_PARTS	3	1	PART_ID	null	null	null", //$NON-NLS-1$
 
 		};
-		executeAndAssertResults("select* FROM System.ODBC.OA_STATISTICS",
+		executeAndAssertResults("select* FROM System.ODBC.OA_STATISTICS", //$NON-NLS-1$
 				expected);
 
 	}
 
-	public void testDefect12054() {
+	@Test public void testDefect12054() {
 
 		String[] expected = {
-				"PKTABLE_QUALIFIER[string]	PKTABLE_OWNER[string]	PKTABLE_NAME[string]	PKCOLUMN_NAME[string]	FKTABLE_QUALIFIER[string]	FKTABLE_OWNER[string]	FKTABLE_NAME[string]	FKCOLUMN_NAME[string]	KEY_SEQ[short]	UPDATE_RULE[short]	DELETE_RULE[short]	FK_NAME[string]	PK_NAME[string]",
-				"		PARTS	PART_ID			SUPPLIER_PARTS	PART_ID	1	null	null	FK_SPLIER_PRTS_PRTS	PK_PARTS",
-				"		SHIP_VIA	SHIPPER_ID			null	null	1	null	null	null	PK_SHIP_VIA",
-				"		STATUS	STATUS_ID			SUPPLIER	SUPPLIER_STATUS	1	null	null	FK_SPLIER_STATS	PK_STATUS",
-				"		SUPPLIER	SUPPLIER_ID			SUPPLIER_PARTS	SUPPLIER_ID	1	null	null	FK_SPLY_PRTS_SPLY	PK_SUPPLIER",
-				"		SUPPLIER_PARTS	SUPPLIER_ID			null	null	1	null	null	null	PK_SUPPLIER_PARTS",
-				"		SUPPLIER_PARTS	PART_ID			null	null	2	null	null	null	PK_SUPPLIER_PARTS",
-				"		SUPPLIER	SUPPLIER_STATUS			null	null	1	null	null	null	FK_SPLIER_STATS",
-				"		SUPPLIER_PARTS	PART_ID			null	null	1	null	null	null	FK_SPLIER_PRTS_PRTS",
-				"		SUPPLIER_PARTS	SUPPLIER_ID			null	null	1	null	null	null	FK_SPLY_PRTS_SPLY",
+				"PKTABLE_QUALIFIER[string]	PKTABLE_OWNER[string]	PKTABLE_NAME[string]	PKCOLUMN_NAME[string]	FKTABLE_QUALIFIER[string]	FKTABLE_OWNER[string]	FKTABLE_NAME[string]	FKCOLUMN_NAME[string]	KEY_SEQ[short]	UPDATE_RULE[short]	DELETE_RULE[short]	FK_NAME[string]	PK_NAME[string]", //$NON-NLS-1$
+				"		PARTS	PART_ID			SUPPLIER_PARTS	PART_ID	1	null	null	FK_SPLIER_PRTS_PRTS	PK_PARTS", //$NON-NLS-1$
+				"		SHIP_VIA	SHIPPER_ID			null	null	1	null	null	null	PK_SHIP_VIA", //$NON-NLS-1$
+				"		STATUS	STATUS_ID			SUPPLIER	SUPPLIER_STATUS	1	null	null	FK_SPLIER_STATS	PK_STATUS", //$NON-NLS-1$
+				"		SUPPLIER	SUPPLIER_ID			SUPPLIER_PARTS	SUPPLIER_ID	1	null	null	FK_SPLY_PRTS_SPLY	PK_SUPPLIER", //$NON-NLS-1$
+				"		SUPPLIER_PARTS	SUPPLIER_ID			null	null	1	null	null	null	PK_SUPPLIER_PARTS", //$NON-NLS-1$
+				"		SUPPLIER_PARTS	PART_ID			null	null	2	null	null	null	PK_SUPPLIER_PARTS", //$NON-NLS-1$
+				"		SUPPLIER	SUPPLIER_STATUS			null	null	1	null	null	null	FK_SPLIER_STATS", //$NON-NLS-1$
+				"		SUPPLIER_PARTS	PART_ID			null	null	1	null	null	null	FK_SPLIER_PRTS_PRTS", //$NON-NLS-1$
+				"		SUPPLIER_PARTS	SUPPLIER_ID			null	null	1	null	null	null	FK_SPLY_PRTS_SPLY", //$NON-NLS-1$
 
 		};
 
 		executeAndAssertResults(
-				"select '' AS PKTABLE_QUALIFIER, '' AS PKTABLE_OWNER, PK.GroupName AS PKTABLE_NAME, PK.Name AS PKCOLUMN_NAME, '' AS FKTABLE_QUALIFIER, '' AS FKTABLE_OWNER, FK.GroupName AS FKTABLE_NAME, FK.Name AS FKCOLUMN_NAME, convert(PK.Position, short) AS KEY_SEQ, convert(null, short) AS UPDATE_RULE, convert(null, short) AS DELETE_RULE, FK.KeyName AS FK_NAME, PK.KeyName AS PK_NAME FROM System.KeyElements AS PK LEFT OUTER JOIN System.KeyElements AS FK ON FK.RefKeyUID = PK.UID",
+				"select '' AS PKTABLE_QUALIFIER, '' AS PKTABLE_OWNER, PK.GroupName AS PKTABLE_NAME, PK.Name AS PKCOLUMN_NAME, '' AS FKTABLE_QUALIFIER, '' AS FKTABLE_OWNER, FK.GroupName AS FKTABLE_NAME, FK.Name AS FKCOLUMN_NAME, convert(PK.Position, short) AS KEY_SEQ, convert(null, short) AS UPDATE_RULE, convert(null, short) AS DELETE_RULE, FK.KeyName AS FK_NAME, PK.KeyName AS PK_NAME FROM System.KeyElements AS PK LEFT OUTER JOIN System.KeyElements AS FK ON FK.RefKeyUID = PK.UID", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testDefect12064() {
+	@Test public void testDefect12064() {
 		String[] expected = { 
-				"KeyName[string]	RefKeyUID[string]	", 
-				"PK_PARTS	null",
-				"PK_SHIP_VIA	null",
-				"PK_STATUS	null", 
-				"PK_SUPPLIER	null", 
-				"PK_SUPPLIER_PARTS	null",
-				"PK_SUPPLIER_PARTS	null", 
+				"KeyName[string]	RefKeyUID[string]	",  //$NON-NLS-1$
+				"PK_PARTS	null", //$NON-NLS-1$
+				"PK_SHIP_VIA	null", //$NON-NLS-1$
+				"PK_STATUS	null",  //$NON-NLS-1$
+				"PK_SUPPLIER	null",  //$NON-NLS-1$
+				"PK_SUPPLIER_PARTS	null", //$NON-NLS-1$
+				"PK_SUPPLIER_PARTS	null",  //$NON-NLS-1$
 				
 
 		};
-		executeAndAssertResults("select KeyName, RefKeyUID FROM System.KeyElements WHERE RefKeyUID IS NULL order by KeyName",expected);
+		executeAndAssertResults("select KeyName, RefKeyUID FROM System.KeyElements WHERE RefKeyUID IS NULL order by KeyName",expected); //$NON-NLS-1$
 	}
 
-	public void testSlowSystemQuery() {
-		String[] expected = { "groupFullName[string]	SOURCE_NAME[string]	INFO_CAT_NAME[string]	COMMON_SCHEMA_FLAG[string]", };
+	@Test public void testSlowSystemQuery() {
+		String[] expected = { "groupFullName[string]	SOURCE_NAME[string]	INFO_CAT_NAME[string]	COMMON_SCHEMA_FLAG[string]", }; //$NON-NLS-1$
 		executeAndAssertResults(
-				"select sgp1.groupFullName, sgp1.groupname AS SOURCE_NAME, sgp1.value AS INFO_CAT_NAME, sgp3.value AS COMMON_SCHEMA_FLAG from System.GroupProperties sgp1, System.GroupProperties sgp2, System.GroupProperties sgp3 where sgp1.groupFullName = sgp2.groupFullName and sgp1.groupFullName = sgp3.groupFullName and sgp2.groupFullName = sgp3.groupFullName and sgp1.name='InformationCategory' and sgp2.name = 'presentationMetadataFlag' and sgp2.value = 'true' and sgp3.name = 'infoCatCommonSchemaFlag'",
+				"select sgp1.groupFullName, sgp1.groupname AS SOURCE_NAME, sgp1.value AS INFO_CAT_NAME, sgp3.value AS COMMON_SCHEMA_FLAG from System.GroupProperties sgp1, System.GroupProperties sgp2, System.GroupProperties sgp3 where sgp1.groupFullName = sgp2.groupFullName and sgp1.groupFullName = sgp3.groupFullName and sgp2.groupFullName = sgp3.groupFullName and sgp1.name='InformationCategory' and sgp2.name = 'presentationMetadataFlag' and sgp2.value = 'true' and sgp3.name = 'infoCatCommonSchemaFlag'", //$NON-NLS-1$
 				expected);
 	}
 
-	public void testReferenceKeyColumns() {
+	@Test public void testReferenceKeyColumns() {
 		String[] expected = {
-				"PKTABLE_CAT[string]	PKTABLE_SCHEM[string]	PKTABLE_NAME[string]	PKCOLUMN_NAME[string]	FKTABLE_CAT[string]	FKTABLE_SCHEM[string]	FKTABLE_NAME[string]	FKCOLUMN_NAME[string]	KEY_SEQ[short]	UPDATE_RULE[integer]	DELETE_RULE[integer]	FK_NAME[string]	PK_NAME[string]	DEFERRABILITY[integer]",
-				"null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_ID	null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATUS	1	3	3	FK_SPLIER_STATS	PK_STATUS	5",
-				"null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_ID	null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	1	3	3	FK_SPLY_PRTS_SPLY	PK_SUPPLIER	5",
-				"null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PART_ID	null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	1	3	3	FK_SPLIER_PRTS_PRTS	PK_PARTS	5", };
+				"PKTABLE_CAT[string]	PKTABLE_SCHEM[string]	PKTABLE_NAME[string]	PKCOLUMN_NAME[string]	FKTABLE_CAT[string]	FKTABLE_SCHEM[string]	FKTABLE_NAME[string]	FKCOLUMN_NAME[string]	KEY_SEQ[short]	UPDATE_RULE[integer]	DELETE_RULE[integer]	FK_NAME[string]	PK_NAME[string]	DEFERRABILITY[integer]", //$NON-NLS-1$
+				"null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.STATUS	STATUS_ID	null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_STATUS	1	3	3	FK_SPLIER_STATS	PK_STATUS	5", //$NON-NLS-1$
+				"null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER	SUPPLIER_ID	null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	SUPPLIER_ID	1	3	3	FK_SPLY_PRTS_SPLY	PK_SUPPLIER	5", //$NON-NLS-1$
+				"null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.PARTS	PART_ID	null	PartsSupplier	PartsSupplier.PARTSSUPPLIER.SUPPLIER_PARTS	PART_ID	1	3	3	FK_SPLIER_PRTS_PRTS	PK_PARTS	5", }; //$NON-NLS-1$
 
-		executeAndAssertResults("select* FROM System.JDBC.ReferenceKeyColumns",
+		executeAndAssertResults("select* FROM System.JDBC.ReferenceKeyColumns", //$NON-NLS-1$
 				expected);
 	}
 	
-	public void testVirtualLookup() {
-		String[] expected = { "expr[string]", "null"};
+	@Test public void testVirtualLookup() {
+		String[] expected = { "expr[string]", "null"}; //$NON-NLS-1$ //$NON-NLS-2$
 		executeAndAssertResults(
-				"select lookup('System.KeyElements', 'RefKeyUID', 'KeyName', 'PK_PARTS')", expected);
+				"select lookup('System.KeyElements', 'RefKeyUID', 'KeyName', 'PK_PARTS')", expected); //$NON-NLS-1$
 		
 	}
 }

Modified: trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestVirtualDocWithVirtualProc.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestVirtualDocWithVirtualProc.java	2009-03-20 21:48:08 UTC (rev 612)
+++ trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestVirtualDocWithVirtualProc.java	2009-03-23 03:25:55 UTC (rev 613)
@@ -22,11 +22,9 @@
 
 package com.metamatrix.systemmodel;
 
-import java.sql.Connection;
+import org.junit.Before;
+import org.junit.Test;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.api.AbstractMMQueryTestCase;
 
@@ -39,27 +37,18 @@
 	private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/xml-vp/xmlvp.properties"; //$NON-NLS-1$
     private static final String VDB = "xmlvp"; //$NON-NLS-1$
 
-    static Connection connection;
-    
     public TestVirtualDocWithVirtualProc() {
     	// this is needed because the result files are generated 
     	// with another tool which uses tab as delimiter 
     	super.DELIMITER = "\t"; //$NON-NLS-1$
     }
     
-    public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTestSuite(TestVirtualDocWithVirtualProc.class);
-		return createOnceRunSuite(suite, new ConnectionFactory() {
+    @Before public void setUp() {
+    	getConnection(VDB, DQP_PROP_FILE);
+    }
+    
+    @Test public void testDefect15241() {
 
-			public com.metamatrix.jdbc.api.Connection createSingleConnection()
-					throws Exception {
-				return createConnection(VDB, DQP_PROP_FILE, ""); //$NON-NLS-1$
-			}});
-	}    
-        
-    public void testDefect15241() {
-
     	String sql = "SELECT ModelName, Name, Description FROM System.Groups WHERE Name = 'yyyTestDocument'"; //$NON-NLS-1$
 
     	String[] expected ={
@@ -70,7 +59,7 @@
     	executeAndAssertResults(sql, expected);
     }
 
-    public void testDefect15241a() {
+    @Test public void testDefect15241a() {
     	String sql = "SELECT GroupName, Name, Description FROM System.Elements WHERE Name = 'IntKey'"; //$NON-NLS-1$
     	String[] expected ={
 		    "GroupName[string]	Name[string]	Description[string]",	 //$NON-NLS-1$
@@ -86,7 +75,7 @@
     	executeAndAssertResults(sql, expected);
     }
 
-    public void testDefect15241b() {
+    @Test public void testDefect15241b() {
     	
     	String sql = "SELECT GroupName, Name, Value, UID FROM System.GroupProperties WHERE ModelName = 'testDoc'"; //$NON-NLS-1$
     	String[] expected ={




More information about the teiid-commits mailing list