Author: shawkins Date: 2011-06-13 13:35:41 -0400 (Mon, 13 Jun 2011) New Revision: 3249 Added: branches/7.4.x/metadata/DATATYPES.INDEX Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/system_schema.xml branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties branches/7.4.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java branches/7.4.x/metadata/src/main/resources/System.vdb branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected branches/7.4.x/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java Log: TEIID-1632 added system procedures for logging Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-06-13 17:35:41 UTC (rev 3249) @@ -60,7 +60,8 @@ <LI><B>ODBC SSL</B> - added support for SSL encrypted ODBC connections. <LI><B>Reauthentication Statement</B> - SET SESSION AUTHORIZATION can now be used to perform a reauthentication via JDBC or ODBC. <LI><B>Pluggable Authorization</B> - an alternative PolicyDecider can be defined in the teiid-jboss-beans.xml file to customize authorization decisions. - <LI><B>Streaming XQuery</B> - in situations where document projection applies if the XMLQUERY/XMLTABLE path expressions meet certian conditions, then the incoming document will not only be projected, but the independent subtrees will be processed without loading the entire document. This allows for nearly arbitrarily large XML documents to be processed. See the Reference for more. + <LI><B>Streaming XQuery</B> - in situations where document projection applies if the XMLQUERY/XMLTABLE path expressions meet certain conditions, then the incoming document will not only be projected, but the independent subtrees will be processed without loading the entire document. This allows for nearly arbitrarily large XML documents to be processed. See the Reference for more. + <LI><B>Logging Procedures</B> - added SYSADMIN.isLoggable and SYSADMIN.logMsg to aid in debugging procedure logic. </UL> <h2><a name="Compatibility">Compatibility Issues</a></h2> Modified: branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/system_schema.xml =================================================================== --- branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/system_schema.xml 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/system_schema.xml 2011-06-13 17:35:41 UTC (rev 3249) @@ -1807,6 +1807,32 @@ <para><synopsis>SYS.getXMLSchemas(document in string) returns schema string</synopsis></para> </section> <section> + <title>SYSADMIN.logMsg</title> + <para>Log a message to the underlying logging system.</para> + <para><synopsis>SYSADMIN.logMsg(logged RETURN boolean, level IN string, context IN string, msg IN object)</synopsis></para> + <para>Returns true if the message was logged. level can be one of the log4j levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE. level defaults to 'DEBUG' and context defaults to 'org.teiid.PROCESSOR'</para> + <example lang="sql"> + <title>Example logMsg</title> + <programlisting>CALL SYSADMIN.logMsg(msg=>'some debug', context=>'org.something')</programlisting> + <para>This will log the message 'some debug' at the default level DEBUG to the context org.something.</para> + </example> + </section> + <section> + <title>SYSADMIN.isLoggable</title> + <para>Tests if logging is enabled at the given level and context.</para> + <para><synopsis>SYSADMIN.isLoggable(loggable RETURN boolean, level IN string, context IN string)</synopsis></para> + <para>Returns true if logging is enabled. level can be one of the log4j levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE. level defaults to 'DEBUG' and context defaults to 'org.teiid.PROCESSOR'</para> + <example lang="sql"> + <title>Example isLoggable</title> + <programlisting>IF ((CALL SYSADMIN.isLoggable(context=>'org.something')) +BEGIN + DECLARE STRING msg; + // logic to build the message ... + CALL SYSADMIN.logMsg(msg=>msg, context=>'org.something') +END</programlisting> + </example> + </section> + <section> <title>SYSADMIN.refreshMatView</title> <para>Returns integer RowsUpdated. -1 indicates a load is in progress, otherwise the cardinality of the table is returned. See the Caching Guide for more.</para> <para><synopsis>SYSADMIN.refreshMatView(RowsUpdated return integer, ViewName in string, Invalidate in boolean)</synopsis></para> Modified: branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -33,6 +33,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.TreeMap; import javax.sql.rowset.serial.SerialClob; @@ -60,6 +61,8 @@ import org.teiid.dqp.message.RequestID; import org.teiid.dqp.service.BufferService; import org.teiid.events.EventDistributor; +import org.teiid.logging.LogManager; +import org.teiid.logging.MessageLevel; import org.teiid.metadata.AbstractMetadataRecord; import org.teiid.metadata.Column; import org.teiid.metadata.ColumnStats; @@ -120,13 +123,34 @@ private enum SystemAdminProcs { SETTABLESTATS, SETCOLUMNSTATS, - SETPROPERTY + SETPROPERTY, + LOGMSG, + ISLOGGABLE } private enum SystemProcs { GETXMLSCHEMAS } + private static final TreeMap<String, Integer> levelMap = new TreeMap<String, Integer>(String.CASE_INSENSITIVE_ORDER); + static { + levelMap.put("OFF", MessageLevel.NONE); //$NON-NLS-1$ + levelMap.put("FATAL", MessageLevel.CRITICAL); //$NON-NLS-1$ + levelMap.put("ERROR", MessageLevel.ERROR); //$NON-NLS-1$ + levelMap.put("WARN", MessageLevel.WARNING); //$NON-NLS-1$ + levelMap.put("INFO", MessageLevel.INFO); //$NON-NLS-1$ + levelMap.put("DEBUG", MessageLevel.DETAIL); //$NON-NLS-1$ + levelMap.put("TRACE", MessageLevel.TRACE); //$NON-NLS-1$ + } + + public static int getLevel(String level) throws TeiidProcessingException { + Integer intLevel = levelMap.get(level); + if (intLevel == null) { + throw new TeiidProcessingException(QueryPlugin.Util.getString("FunctionMethods.unknown_level", level, levelMap.keySet())); //$NON-NLS-1$ + } + return intLevel; + } + // Resources private DQPCore requestMgr; private BufferService bufferService; @@ -361,6 +385,26 @@ if (StringUtil.startsWithIgnoreCase(proc.getProcedureCallableName(), CoreConstants.SYSTEM_ADMIN_MODEL)) { final SystemAdminProcs sysProc = SystemAdminProcs.valueOf(proc.getProcedureCallableName().substring(CoreConstants.SYSTEM_ADMIN_MODEL.length() + 1).toUpperCase()); switch (sysProc) { + case LOGMSG: + case ISLOGGABLE: + String level = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); + String logContext = (String)((Constant)proc.getParameter(3).getExpression()).getValue(); + Object message = null; + if (sysProc == SystemAdminProcs.LOGMSG) { + message = ((Constant)proc.getParameter(4).getExpression()).getValue(); + } + int msgLevel = getLevel(level); + boolean logged = false; + if (LogManager.isMessageToBeRecorded(logContext, msgLevel)) { + if (message != null) { + LogManager.log(msgLevel, logContext, message); + } + logged = true; + } + if (proc.returnParameters()) { + rows.add(Arrays.asList(logged)); + } + return new CollectionTupleSource(rows.iterator()); case SETPROPERTY: try { String uuid = (String)((Constant)proc.getParameter(2).getExpression()).getValue(); @@ -385,10 +429,12 @@ if (eventDistributor != null) { eventDistributor.setProperty(vdbName, vdbVersion, uuid, key, strVal); } - if (result == null) { - rows.add(Arrays.asList((Clob)null)); - } else { - rows.add(Arrays.asList(new ClobType(new SerialClob(result.toCharArray())))); + if (proc.returnParameters()) { + if (result == null) { + rows.add(Arrays.asList((Clob)null)); + } else { + rows.add(Arrays.asList(new ClobType(new SerialClob(result.toCharArray())))); + } } return new CollectionTupleSource(rows.iterator()); } catch (SQLException e) { Modified: branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties 2011-06-13 17:35:41 UTC (rev 3249) @@ -913,6 +913,7 @@ MultiSource.out_procedure=The multisource plan must execute a procedure returning parameter values exactly 1: {0} FunctionMethods.not_array_value=Expected a java.sql.Array, or java array type, but got: {0} +FunctionMethods.unknown_level=Unknown log level: {0}, expected one of {1} FunctionMethods.array_index=Array index out of range: {0} ArrayTableNode.conversion_error=Could not convert value for column: {0} Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -1104,14 +1104,14 @@ sq15.setResultSet(rs18); QueryNode sq16n1 = new QueryNode("CREATE VIRTUAL PROCEDURE BEGIN INSERT INTO pm1.g1 ( e1, e2 ) VALUES( 1, 2 ); END"); //$NON-NLS-1$ //$NON-NLS-2$ - Procedure sq16 = createVirtualProcedure("sq16", pm1, null, sq16n1); //$NON-NLS-1$ + createVirtualProcedure("sq16", pm1, null, sq16n1); //$NON-NLS-1$ ColumnSet<Procedure> rs19 = createResultSet("pm1.rs19", new String[] { "xml" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ QueryNode sq17n1 = new QueryNode("CREATE VIRTUAL PROCEDURE BEGIN SELECT * FROM xmltest.doc1; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure sq17 = createVirtualProcedure("sq17", pm1, null, sq17n1); //$NON-NLS-1$ sq17.setResultSet(rs19); - Procedure sp3 = createStoredProcedure("sp3", pm1, null); //$NON-NLS-1$ //$NON-NLS-2$ + createStoredProcedure("sp3", pm1, null); //$NON-NLS-1$ //$NON-NLS-2$ ColumnSet<Procedure> rs20 = createResultSet("pm1.rs20", new String[] { "xml" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ QueryNode sq18n1 = new QueryNode("CREATE VIRTUAL PROCEDURE BEGIN SELECT * FROM xmltest.doc1; END"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -1130,7 +1130,7 @@ sp4.setResultSet(rs22); // no params or result set at all - Procedure sp5 = createStoredProcedure("sp5", pm1, new ArrayList<ProcedureParameter>()); //$NON-NLS-1$ //$NON-NLS-2$ + createStoredProcedure("sp5", pm1, new ArrayList<ProcedureParameter>()); //$NON-NLS-1$ //$NON-NLS-2$ //virtual stored procedures ColumnSet<Procedure> vsprs1 = vsprs1(); //$NON-NLS-1$ //$NON-NLS-2$ Added: branches/7.4.x/metadata/DATATYPES.INDEX =================================================================== (Binary files differ) Property changes on: branches/7.4.x/metadata/DATATYPES.INDEX ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/7.4.x/metadata/src/main/resources/System.vdb =================================================================== (Binary files differ) Modified: branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java =================================================================== --- branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -80,7 +80,7 @@ } - protected void helpTest(String query, String[] expected, String vdb, String props, String urlProperties) { + protected void helpTest(String query, String[] expected, String vdb, String props, String urlProperties) throws SQLException { getConnection(vdb, props, urlProperties); executeAndAssertResults(query, expected); closeConnection(); Modified: branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java =================================================================== --- branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/AbstractQueryTest.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -86,11 +86,11 @@ return this.internalConnection; } - public boolean execute(String sql) { + public boolean execute(String sql) throws SQLException { return execute(sql, new Object[] {}); } - public boolean execute(String sql, Object[] params) { + public boolean execute(String sql, Object[] params) throws SQLException { closeResultSet(); closeStatement(); this.updateCount = -1; @@ -122,7 +122,7 @@ } catch (SQLException e) { this.internalException = e; if (!exceptionExpected()) { - throw new RuntimeException(e); + throw e; } } return false; @@ -465,7 +465,7 @@ } - protected void executeAndAssertResults(String query, String[] expected) { + protected void executeAndAssertResults(String query, String[] expected) throws SQLException { execute(query); if (expected != null) { assertResults(expected); Modified: branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java =================================================================== --- branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -1,5 +1,7 @@ package org.teiid.jdbc; +import java.sql.SQLException; + import org.junit.Test; import org.teiid.core.util.UnitTestUtil; @@ -66,7 +68,7 @@ executeTest("select * from tables where schemaname ='PartsSupplier'", expected); //$NON-NLS-1$ } - private void executeTest(String sql, String[] expected){ + private void executeTest(String sql, String[] expected) throws SQLException{ execute(sql); if (expected != null) { assertResults(expected); Modified: branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java =================================================================== --- branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -67,7 +67,7 @@ public String answer(InvocationOnMock invocation) throws Throwable { Procedure t = (Procedure)invocation.getArguments()[2]; if (t.getName().equals("proc")) { - return "create virtual procedure begin select '2011'; end"; + return "create virtual procedure begin select '2011'; if ((call isLoggable())) call logMsg(msg=>'hello'); end"; } return null; } Modified: branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java =================================================================== --- branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -83,7 +83,7 @@ checkResult("testProcedures", "select* from SYS.Procedures order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } - @Test public void testProperties() { + @Test public void testProperties() throws Exception { String[] expected = { "Name[string] Value[string] UID[string] OID[integer] ClobValue[clob]", "pg_type:oid 30 mmuid:ffa4ac73-b549-470e-931f-dc36330cb8c4 1 30", "pg_type:oid 1009 mmuid:d9f36bdc-7b25-4af0-b9f5-a96aac6d3094 2 1009", @@ -94,7 +94,7 @@ executeAndAssertResults("select* from SYS.Properties", expected); //$NON-NLS-1$ } - @Test public void testVirtualDatabase() { + @Test public void testVirtualDatabase() throws Exception { String[] expected = { "Name[string] Version[string] ", "PartsSupplier 1", //$NON-NLS-1$ //$NON-NLS-2$ @@ -116,7 +116,7 @@ checkResult("testColumns", "select* from SYS.Columns order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } - @Test public void testTableType() { + @Test public void testTableType() throws Exception { String[] expected = { "Type[string] ", "Table", }; //$NON-NLS-1$ //$NON-NLS-2$ executeAndAssertResults( @@ -128,7 +128,7 @@ checkResult("testTableIsSystem", "select Name from SYS.Tables where IsSystem = 'false' order by Name"); //$NON-NLS-1$ //$NON-NLS-2$ } - @Test public void testDefect12064() { + @Test public void testDefect12064() throws Exception { String[] expected = { "KeyName[string] RefKeyUID[string] ", //$NON-NLS-1$ "PK_PARTS null", //$NON-NLS-1$ @@ -174,4 +174,12 @@ oidCount = getRowCount(); assertEquals(uidCount, oidCount); } + + @Test public void testLogMsg() throws Exception { + execute("call logMsg(level=>'DEBUG', context=>'org.teiid.foo', msg=>'hello world')"); //$NON-NLS-1$ + } + + @Test(expected=SQLException.class) public void testLogMsg1() throws Exception { + execute("call logMsg(level=>'foo', context=>'org.teiid.foo', msg=>'hello world')"); //$NON-NLS-1$ + } } Modified: branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java =================================================================== --- branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/java/org/teiid/systemmodel/TestVirtualDocWithVirtualProc.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -55,7 +55,7 @@ closeConnection(); } - @Test public void testDefect15241() { + @Test public void testDefect15241() throws Exception { String sql = "SELECT SchemaName, Name, Description FROM SYS.Tables WHERE Name = 'yyyTestDocument'"; //$NON-NLS-1$ @@ -67,7 +67,7 @@ executeAndAssertResults(sql, expected); } - @Test public void testDefect15241a() { + @Test public void testDefect15241a() throws Exception { String sql = "SELECT TableName, Name, Description FROM SYS.Columns WHERE Name = 'IntKey'"; //$NON-NLS-1$ String[] expected ={ "TableName[string] Name[string] Description[string]", //$NON-NLS-1$ @@ -83,7 +83,7 @@ executeAndAssertResults(sql, expected); } - @Test public void testDefect15241b() { + @Test public void testDefect15241b() throws Exception { String sql = "SELECT p.Name, p.Value, UID FROM SYS.Properties p"; //$NON-NLS-1$ String[] expected ={ Modified: branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected =================================================================== --- branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected 2011-06-13 17:35:41 UTC (rev 3249) @@ -43,6 +43,13 @@ QT_Ora9DS SP sp_rows_between ObjectValue 3 2000 object 2147483647 2048 0 10 1 <null> <null> <null> <null> <null> 17 YES sp_rows_between QT_Ora9DS SYS getXMLSchemas document 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO getXMLSchemas QT_Ora9DS SYS getXMLSchemas schema 3 2009 xml 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getXMLSchemas +QT_Ora9DS SYSADMIN isLoggable level 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 2 NO isLoggable +QT_Ora9DS SYSADMIN isLoggable context 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 3 NO isLoggable +QT_Ora9DS SYSADMIN isLoggable loggable 5 -7 boolean 1 1 0 10 0 <null> <null> <null> <null> <null> 1 NO isLoggable +QT_Ora9DS SYSADMIN logMsg level 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 2 NO logMsg +QT_Ora9DS SYSADMIN logMsg context 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 3 NO logMsg +QT_Ora9DS SYSADMIN logMsg msg 1 2000 object 2147483647 2147483647 0 10 0 <null> <null> <null> <null> <null> 4 NO logMsg +QT_Ora9DS SYSADMIN logMsg logged 5 -7 boolean 1 1 0 10 0 <null> <null> <null> <null> <null> 1 NO logMsg QT_Ora9DS SYSADMIN refreshMatView ViewName 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO refreshMatView QT_Ora9DS SYSADMIN refreshMatView Invalidate 1 -7 boolean 1 1 0 10 0 <null> <null> <null> <null> <null> 2 NO refreshMatView QT_Ora9DS SYSADMIN refreshMatView RowsUpdated 5 4 integer 10 10 0 10 0 <null> <null> <null> <null> <null> 3 NO refreshMatView @@ -61,7 +68,7 @@ QT_Ora9DS SYSADMIN setProperty OldValue 5 2005 clob 2147483647 2097152 0 10 0 <null> <null> <null> <null> <null> 1 NO setProperty QT_Ora9DS SYSADMIN setTableStats tableName 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO setTableStats QT_Ora9DS SYSADMIN setTableStats cardinality 1 4 integer 10 10 0 10 0 <null> <null> <null> <null> <null> 2 NO setTableStats -Row Count : 61 +Row Count : 68 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS ProcedureParams 255 255 0 false false false false 0 true true false false SchemaName 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS ProcedureParams 255 255 0 false true false true 1 false true true true Modified: branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected =================================================================== --- branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected 2011-06-13 17:35:41 UTC (rev 3249) @@ -5,12 +5,14 @@ QT_Ora9DS SP sp_count_rows_between <null> <null> <null> <null> 1 sp_count_rows_between QT_Ora9DS SP sp_rows_between <null> <null> <null> <null> 2 sp_rows_between QT_Ora9DS SYS getXMLSchemas <null> <null> <null> <null> 2 getXMLSchemas +QT_Ora9DS SYSADMIN isLoggable <null> <null> <null> <null> 1 isLoggable +QT_Ora9DS SYSADMIN logMsg <null> <null> <null> <null> 1 logMsg QT_Ora9DS SYSADMIN refreshMatView <null> <null> <null> <null> 1 refreshMatView QT_Ora9DS SYSADMIN refreshMatViewRow <null> <null> <null> <null> 1 refreshMatViewRow QT_Ora9DS SYSADMIN setColumnStats <null> <null> <null> <null> 1 setColumnStats QT_Ora9DS SYSADMIN setProperty <null> <null> <null> <null> 1 setProperty QT_Ora9DS SYSADMIN setTableStats <null> <null> <null> <null> 1 setTableStats -Row Count : 10 +Row Count : 12 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false SchemaName 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true Modified: branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected =================================================================== --- branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected 2011-06-13 17:35:41 UTC (rev 3249) @@ -5,12 +5,14 @@ QT_Ora9DS SP sp_count_rows_between <null> <null> <null> <null> 1 sp_count_rows_between QT_Ora9DS SP sp_rows_between <null> <null> <null> <null> 2 sp_rows_between QT_Ora9DS SYS getXMLSchemas <null> <null> <null> <null> 2 getXMLSchemas +QT_Ora9DS SYSADMIN isLoggable <null> <null> <null> <null> 1 isLoggable +QT_Ora9DS SYSADMIN logMsg <null> <null> <null> <null> 1 logMsg QT_Ora9DS SYSADMIN refreshMatView <null> <null> <null> <null> 1 refreshMatView QT_Ora9DS SYSADMIN refreshMatViewRow <null> <null> <null> <null> 1 refreshMatViewRow QT_Ora9DS SYSADMIN setColumnStats <null> <null> <null> <null> 1 setColumnStats QT_Ora9DS SYSADMIN setProperty <null> <null> <null> <null> 1 setProperty QT_Ora9DS SYSADMIN setTableStats <null> <null> <null> <null> 1 setTableStats -Row Count : 10 +Row Count : 12 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 QT_Ora9DS java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false SchemaName 12 QT_Ora9DS java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true Modified: branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected =================================================================== --- branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected 2011-06-13 17:35:41 UTC (rev 3249) @@ -2,6 +2,13 @@ VDBName SchemaName ProcedureName Name COLUMN_TYPE DATA_TYPE DataType PRECISION LENGTH SCALE Radix NULLABLE Description COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH Position IS_NULLABLE ProcedureName PartsSupplier SYS getXMLSchemas document 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO getXMLSchemas PartsSupplier SYS getXMLSchemas schema 3 2009 xml 2147483647 2147483647 0 10 1 <null> <null> <null> <null> <null> 1 YES getXMLSchemas +PartsSupplier SYSADMIN isLoggable level 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 2 NO isLoggable +PartsSupplier SYSADMIN isLoggable context 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 3 NO isLoggable +PartsSupplier SYSADMIN isLoggable loggable 5 -7 boolean 1 1 0 10 0 <null> <null> <null> <null> <null> 1 NO isLoggable +PartsSupplier SYSADMIN logMsg level 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 2 NO logMsg +PartsSupplier SYSADMIN logMsg context 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 3 NO logMsg +PartsSupplier SYSADMIN logMsg msg 1 2000 object 2147483647 2147483647 0 10 0 <null> <null> <null> <null> <null> 4 NO logMsg +PartsSupplier SYSADMIN logMsg logged 5 -7 boolean 1 1 0 10 0 <null> <null> <null> <null> <null> 1 NO logMsg PartsSupplier SYSADMIN refreshMatView ViewName 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO refreshMatView PartsSupplier SYSADMIN refreshMatView Invalidate 1 -7 boolean 1 1 0 10 0 <null> <null> <null> <null> <null> 2 NO refreshMatView PartsSupplier SYSADMIN refreshMatView RowsUpdated 5 4 integer 10 10 0 10 0 <null> <null> <null> <null> <null> 3 NO refreshMatView @@ -20,7 +27,7 @@ PartsSupplier SYSADMIN setProperty OldValue 5 2005 clob 2147483647 2097152 0 10 0 <null> <null> <null> <null> <null> 1 NO setProperty PartsSupplier SYSADMIN setTableStats tableName 1 12 string 4000 4000 0 10 0 <null> <null> <null> <null> <null> 1 NO setTableStats PartsSupplier SYSADMIN setTableStats cardinality 1 4 integer 10 10 0 10 0 <null> <null> <null> <null> <null> 2 NO setTableStats -Row Count : 20 +Row Count : 27 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String PROCEDURE_CAT string SYS ProcedureParams 255 255 0 false false false false 0 true true false false SchemaName 12 PartsSupplier java.lang.String PROCEDURE_SCHEM string SYS ProcedureParams 255 255 0 false true false true 1 false true true true Modified: branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected =================================================================== --- branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected 2011-06-13 17:35:41 UTC (rev 3249) @@ -1,12 +1,14 @@ string string string string string string string short string VDBName SchemaName Name RESERVED_1 RESERVED_2 RESERVED_3 Description PROCEDURE_TYPE Name PartsSupplier SYS getXMLSchemas <null> <null> <null> <null> 2 getXMLSchemas +PartsSupplier SYSADMIN isLoggable <null> <null> <null> <null> 1 isLoggable +PartsSupplier SYSADMIN logMsg <null> <null> <null> <null> 1 logMsg PartsSupplier SYSADMIN refreshMatView <null> <null> <null> <null> 1 refreshMatView PartsSupplier SYSADMIN refreshMatViewRow <null> <null> <null> <null> 1 refreshMatViewRow PartsSupplier SYSADMIN setColumnStats <null> <null> <null> <null> 1 setColumnStats PartsSupplier SYSADMIN setProperty <null> <null> <null> <null> 1 setProperty PartsSupplier SYSADMIN setTableStats <null> <null> <null> <null> 1 setTableStats -Row Count : 6 +Row Count : 8 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String PROCEDURE_CAT string SYS Procedures 255 255 0 false false false false 0 true true false false SchemaName 12 PartsSupplier java.lang.String PROCEDURE_SCHEM string SYS Procedures 255 255 0 false true false true 1 false true true true Modified: branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected =================================================================== --- branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected 2011-06-13 17:35:41 UTC (rev 3249) @@ -1,26 +1,33 @@ string string string string string integer string boolean integer integer integer integer string string string integer VDBName SchemaName ProcedureName Name DataType Position Type Optional Precision TypeLength Scale Radix NullType UID Description OID -PartsSupplier SYSADMIN refreshMatView Invalidate boolean 2 In false 0 0 0 10 No Nulls mmuuid:5736cfd3-750f-42d8-b083-102061e11c60 <null> 5 -PartsSupplier SYSADMIN refreshMatViewRow Key object 2 In false 0 0 0 10 No Nulls mmuuid:7af5a63b-1b91-4d1e-912e-846a7e84c579 <null> 2 -PartsSupplier SYSADMIN setProperty Name string 3 In false 0 0 0 10 No Nulls mmuuid:ea92812c-1516-4c75-b5d3-c531fdbd8475 <null> 15 -PartsSupplier SYSADMIN setProperty OldValue clob 1 ReturnValue false 0 2097152 0 10 No Nulls mmuuid:48034d50-dd11-4653-aeae-b0d8d3d55656 <null> 13 -PartsSupplier SYSADMIN refreshMatViewRow RowsUpdated integer 3 ReturnValue false 0 0 0 10 No Nulls mmuuid:05a6a9be-c014-4d06-bcac-746cee4f118b <null> 3 -PartsSupplier SYSADMIN refreshMatView RowsUpdated integer 3 ReturnValue false 0 0 0 10 No Nulls mmuuid:d07a6a75-aa12-4dac-8eab-b2acdbaaffd8 <null> 6 -PartsSupplier SYSADMIN setProperty UID string 2 In false 0 50 0 10 No Nulls mmuuid:d377510e-2ec5-445e-bdf0-59c7c0380962 <null> 14 -PartsSupplier SYSADMIN setProperty Value clob 4 In false 0 2097152 0 10 Nullable mmuuid:ac5beeb8-2d0d-48ff-a533-4237d53b67e8 <null> 16 -PartsSupplier SYSADMIN refreshMatViewRow ViewName string 1 In false 0 0 0 10 No Nulls mmuuid:ba635c44-a052-496d-9c35-ca010c0ebebe <null> 1 -PartsSupplier SYSADMIN refreshMatView ViewName string 1 In false 0 0 0 10 No Nulls mmuuid:e0c28e00-d987-48e4-8c60-5f637f10bf33 <null> 4 -PartsSupplier SYSADMIN setTableStats cardinality integer 2 In false 0 0 0 10 No Nulls mmuuid:0aba7849-7fd3-4bc6-a3d3-dfe433bc67a4 <null> 18 -PartsSupplier SYSADMIN setColumnStats columnName string 2 In false 0 0 0 10 No Nulls mmuuid:76553706-632f-4e60-8489-9d0361f58541 <null> 8 -PartsSupplier SYSADMIN setColumnStats distinctCount integer 3 In false 0 0 0 10 Nullable mmuuid:2c61976e-abb5-4c74-bdae-278681b82aa3 <null> 9 -PartsSupplier SYS getXMLSchemas document string 1 In false 0 0 0 10 No Nulls mmuuid:85b88af5-f0b8-401f-b35a-ccee56155492 <null> 19 -PartsSupplier SYSADMIN setColumnStats max string 5 In false 0 0 0 10 Nullable mmuuid:8f42e701-3609-413d-8c10-77e32cd816f2 <null> 11 -PartsSupplier SYSADMIN setColumnStats min string 6 In false 0 0 0 10 Nullable mmuuid:4511ea3f-f2d2-4abf-b363-afb5186bc2d2 <null> 12 -PartsSupplier SYSADMIN setColumnStats nullCount integer 4 In false 0 0 0 10 Nullable mmuuid:44b8c83c-9fcd-4bd2-a730-76e401205536 <null> 10 -PartsSupplier SYS getXMLSchemas schema xml 1 ResultSet false 0 0 0 10 Nullable mmuuid:003980bb-38bb-41ad-b8c2-c87ca47aa554 <null> 20 -PartsSupplier SYSADMIN setColumnStats tableName string 1 In false 0 0 0 10 No Nulls mmuuid:4dcab018-ca4a-467b-96cc-7f28734c840e <null> 7 -PartsSupplier SYSADMIN setTableStats tableName string 1 In false 0 0 0 10 No Nulls mmuuid:28d8ad4a-e091-4934-afd9-7d27310bd370 <null> 17 -Row Count : 20 +PartsSupplier SYSADMIN refreshMatView Invalidate boolean 2 In false 0 0 0 10 No Nulls mmuuid:5736cfd3-750f-42d8-b083-102061e11c60 <null> 12 +PartsSupplier SYSADMIN refreshMatViewRow Key object 2 In false 0 0 0 10 No Nulls mmuuid:7af5a63b-1b91-4d1e-912e-846a7e84c579 <null> 9 +PartsSupplier SYSADMIN setProperty Name string 3 In false 0 0 0 10 No Nulls mmuuid:ea92812c-1516-4c75-b5d3-c531fdbd8475 <null> 22 +PartsSupplier SYSADMIN setProperty OldValue clob 1 ReturnValue false 0 2097152 0 10 No Nulls mmuuid:48034d50-dd11-4653-aeae-b0d8d3d55656 <null> 20 +PartsSupplier SYSADMIN refreshMatViewRow RowsUpdated integer 3 ReturnValue false 0 0 0 10 No Nulls mmuuid:05a6a9be-c014-4d06-bcac-746cee4f118b <null> 10 +PartsSupplier SYSADMIN refreshMatView RowsUpdated integer 3 ReturnValue false 0 0 0 10 No Nulls mmuuid:d07a6a75-aa12-4dac-8eab-b2acdbaaffd8 <null> 13 +PartsSupplier SYSADMIN setProperty UID string 2 In false 0 50 0 10 No Nulls mmuuid:d377510e-2ec5-445e-bdf0-59c7c0380962 <null> 21 +PartsSupplier SYSADMIN setProperty Value clob 4 In false 0 2097152 0 10 Nullable mmuuid:ac5beeb8-2d0d-48ff-a533-4237d53b67e8 <null> 23 +PartsSupplier SYSADMIN refreshMatViewRow ViewName string 1 In false 0 0 0 10 No Nulls mmuuid:ba635c44-a052-496d-9c35-ca010c0ebebe <null> 8 +PartsSupplier SYSADMIN refreshMatView ViewName string 1 In false 0 0 0 10 No Nulls mmuuid:e0c28e00-d987-48e4-8c60-5f637f10bf33 <null> 11 +PartsSupplier SYSADMIN setTableStats cardinality integer 2 In false 0 0 0 10 No Nulls mmuuid:0aba7849-7fd3-4bc6-a3d3-dfe433bc67a4 <null> 25 +PartsSupplier SYSADMIN setColumnStats columnName string 2 In false 0 0 0 10 No Nulls mmuuid:76553706-632f-4e60-8489-9d0361f58541 <null> 15 +PartsSupplier SYSADMIN isLoggable context string 3 In false 0 0 0 10 No Nulls mmuuid:d62e3ceb-8e58-4c22-96b7-d76ee923e180 <null> 3 +PartsSupplier SYSADMIN logMsg context string 3 In false 0 0 0 10 No Nulls mmuuid:c3f22b88-7f80-4ae3-8e60-6953722b8c38 <null> 6 +PartsSupplier SYSADMIN setColumnStats distinctCount integer 3 In false 0 0 0 10 Nullable mmuuid:2c61976e-abb5-4c74-bdae-278681b82aa3 <null> 16 +PartsSupplier SYS getXMLSchemas document string 1 In false 0 0 0 10 No Nulls mmuuid:85b88af5-f0b8-401f-b35a-ccee56155492 <null> 26 +PartsSupplier SYSADMIN isLoggable level string 2 In false 0 0 0 10 No Nulls mmuuid:995ab23a-3fd8-4ce0-aedd-6dcf99a65be1 <null> 2 +PartsSupplier SYSADMIN logMsg level string 2 In false 0 0 0 10 No Nulls mmuuid:ce0fd267-0038-49d5-ab1c-d8166d556b72 <null> 5 +PartsSupplier SYSADMIN isLoggable loggable boolean 1 ReturnValue false 0 0 0 10 No Nulls mmuuid:589773e4-2f8c-4972-ac0d-d694e317f154 <null> 1 +PartsSupplier SYSADMIN logMsg logged boolean 1 ReturnValue false 0 0 0 10 No Nulls mmuuid:3086a5d9-ae1a-4c99-a649-ad9b8d3db8da <null> 4 +PartsSupplier SYSADMIN setColumnStats max string 5 In false 0 0 0 10 Nullable mmuuid:8f42e701-3609-413d-8c10-77e32cd816f2 <null> 18 +PartsSupplier SYSADMIN setColumnStats min string 6 In false 0 0 0 10 Nullable mmuuid:4511ea3f-f2d2-4abf-b363-afb5186bc2d2 <null> 19 +PartsSupplier SYSADMIN logMsg msg object 4 In false 0 0 0 10 No Nulls mmuuid:81b921cc-9417-4655-898b-3d587ad3af16 <null> 7 +PartsSupplier SYSADMIN setColumnStats nullCount integer 4 In false 0 0 0 10 Nullable mmuuid:44b8c83c-9fcd-4bd2-a730-76e401205536 <null> 17 +PartsSupplier SYS getXMLSchemas schema xml 1 ResultSet false 0 0 0 10 Nullable mmuuid:003980bb-38bb-41ad-b8c2-c87ca47aa554 <null> 27 +PartsSupplier SYSADMIN setColumnStats tableName string 1 In false 0 0 0 10 No Nulls mmuuid:4dcab018-ca4a-467b-96cc-7f28734c840e <null> 14 +PartsSupplier SYSADMIN setTableStats tableName string 1 In false 0 0 0 10 No Nulls mmuuid:28d8ad4a-e091-4934-afd9-7d27310bd370 <null> 24 +Row Count : 27 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String VDBName string SYS ProcedureParams 255 255 0 false false false false 0 true true false false SchemaName 12 PartsSupplier java.lang.String SchemaName string SYS ProcedureParams 255 255 0 false true false true 1 false true true true Modified: branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected =================================================================== --- branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected 2011-06-13 17:35:41 UTC (rev 3249) @@ -1,12 +1,14 @@ string string string string boolean string string integer VDBName SchemaName Name NameInSource ReturnsResults UID Description OID -PartsSupplier SYS getXMLSchemas <null> true mmuuid:68497bd9-30f5-461b-bf13-6b26aeb2fc4f <null> 6 -PartsSupplier SYSADMIN refreshMatView <null> false mmuuid:52178344-dca8-4c76-8549-00a4515c7044 <null> 2 -PartsSupplier SYSADMIN refreshMatViewRow <null> false mmuuid:1674912b-af56-465a-a1b9-d1de8b761f10 <null> 1 -PartsSupplier SYSADMIN setColumnStats <null> false mmuuid:49c367be-918f-43be-8b9e-99e275179859 <null> 3 -PartsSupplier SYSADMIN setProperty <null> false mmuuid:8db9b08e-3d6e-415a-9ceb-3fef726f424c <null> 4 -PartsSupplier SYSADMIN setTableStats <null> false mmuuid:6d167c35-04d1-41f6-83ff-888c39423823 <null> 5 -Row Count : 6 +PartsSupplier SYS getXMLSchemas <null> true mmuuid:68497bd9-30f5-461b-bf13-6b26aeb2fc4f <null> 8 +PartsSupplier SYSADMIN isLoggable <null> false mmuuid:36769e93-4cc3-417b-853e-5ee5e6653d01 <null> 1 +PartsSupplier SYSADMIN logMsg <null> false mmuuid:9a754e95-853b-40b2-a085-56d57f45953d <null> 2 +PartsSupplier SYSADMIN refreshMatView <null> false mmuuid:52178344-dca8-4c76-8549-00a4515c7044 <null> 4 +PartsSupplier SYSADMIN refreshMatViewRow <null> false mmuuid:1674912b-af56-465a-a1b9-d1de8b761f10 <null> 3 +PartsSupplier SYSADMIN setColumnStats <null> false mmuuid:49c367be-918f-43be-8b9e-99e275179859 <null> 5 +PartsSupplier SYSADMIN setProperty <null> false mmuuid:8db9b08e-3d6e-415a-9ceb-3fef726f424c <null> 6 +PartsSupplier SYSADMIN setTableStats <null> false mmuuid:6d167c35-04d1-41f6-83ff-888c39423823 <null> 7 +Row Count : 8 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String VDBName string SYS Procedures 255 255 0 false false false false 0 true true false false SchemaName 12 PartsSupplier java.lang.String SchemaName string SYS Procedures 255 255 0 false true false true 1 false true true true Modified: branches/7.4.x/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java =================================================================== --- branches/7.4.x/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java 2011-06-13 17:03:50 UTC (rev 3248) +++ branches/7.4.x/test-integration/db/src/test/java/org/teiid/dynamicvdb/TestVDBLessExecution.java 2011-06-13 17:35:41 UTC (rev 3249) @@ -40,7 +40,7 @@ private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/vdbless/dqp.properties;user=test"; //$NON-NLS-1$ private static final String VDB = "VDBLess"; //$NON-NLS-1$ - @Test public void testExecution() { + @Test public void testExecution() throws Exception { getConnection(VDB, DQP_PROP_FILE); executeAndAssertResults("select * from Example", new String[] { //$NON-NLS-1$ "TRADEID[string] NOTIONAL[integer]", //$NON-NLS-1$ @@ -51,7 +51,7 @@ closeConnection(); } - @Test public void testIntegrationExecution() { + @Test public void testIntegrationExecution() throws Exception { getConnection(VDB, DQP_PROP_FILE); executeAndAssertResults("select * from Example, Smalla where notional = intkey", new String[] { //$NON-NLS-1$ "TRADEID[string] NOTIONAL[integer] INTKEY[integer] STRINGKEY[string] INTNUM[integer] STRINGNUM[string] FLOATNUM[float] LONGNUM[long] DOUBLENUM[double] BYTENUM[short] DATEVALUE[date] TIMEVALUE[time] TIMESTAMPVALUE[timestamp] BOOLEANVALUE[short] CHARVALUE[string] SHORTVALUE[short] BIGINTEGERVALUE[long] BIGDECIMALVALUE[bigdecimal] OBJECTVALUE[string]", //$NON-NLS-1$ @@ -64,7 +64,7 @@ /** * We have no results to assert here since derby does not provide procedure resultset columns in their metadata. */ - @Test public void testProcedureExecution() { + @Test public void testProcedureExecution() throws Exception { getConnection(VDB, DQP_PROP_FILE); execute("exec Derby.SQLUDTS(null, null, null, null, null)"); //$NON-NLS-1$ closeConnection();