Author: shawkins Date: 2009-03-18 16:09:16 -0400 (Wed, 18 Mar 2009) New Revision: 583 Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java Log: TEIID-346 adding in a compatibility layer with 5.5 connectors. Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-03-18 20:09:16 UTC (rev 583) @@ -35,19 +35,19 @@ import org.teiid.connector.language.ICommand; import org.teiid.connector.language.ILanguageObject; import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl; +import org.teiid.dqp.internal.datamgr.impl.FakeExecutionContextImpl; +import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory; +import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl; +import org.teiid.dqp.internal.datamgr.language.TestInsertImpl; +import org.teiid.dqp.internal.datamgr.language.TestProcedureImpl; +import org.teiid.dqp.internal.datamgr.language.TestSelectImpl; +import org.teiid.dqp.internal.datamgr.language.TestUpdateImpl; +import org.teiid.dqp.internal.datamgr.language.TstLanguageBridgeFactory; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; -import com.metamatrix.dqp.internal.datamgr.language.TestDeleteImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestInsertImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestProcedureImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSelectImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl; -import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFactory; import com.metamatrix.metadata.runtime.VDBMetadataFactory; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.resolver.QueryResolver; Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java 2009-03-18 20:09:16 UTC (rev 583) @@ -33,15 +33,15 @@ import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.language.ICommand; import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl; +import org.teiid.dqp.internal.datamgr.impl.FakeExecutionContextImpl; +import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.unittest.FakeMetadataFacade; import com.metamatrix.query.unittest.FakeMetadataFactory; Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java 2009-03-18 20:09:16 UTC (rev 583) @@ -32,12 +32,12 @@ import org.teiid.connector.jdbc.JDBCQueryExecution; import org.teiid.connector.language.IQuery; import org.teiid.connector.language.ISelect; +import org.teiid.dqp.internal.datamgr.language.LiteralImpl; +import org.teiid.dqp.internal.datamgr.language.QueryImpl; +import org.teiid.dqp.internal.datamgr.language.SelectImpl; +import org.teiid.dqp.internal.datamgr.language.SelectSymbolImpl; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.dqp.internal.datamgr.language.LiteralImpl; -import com.metamatrix.dqp.internal.datamgr.language.QueryImpl; -import com.metamatrix.dqp.internal.datamgr.language.SelectImpl; -import com.metamatrix.dqp.internal.datamgr.language.SelectSymbolImpl; public class TestJDBCExecutionHelper extends TestCase{ Modified: trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java 2009-03-18 20:09:16 UTC (rev 583) @@ -29,12 +29,12 @@ import org.teiid.connector.language.ICriteria; import org.teiid.connector.language.IQuery; import org.teiid.connector.language.LanguageUtil; +import org.teiid.dqp.internal.datamgr.language.LanguageFactoryImpl; import junit.framework.TestCase; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl; /** */ Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java 2009-03-18 20:09:16 UTC (rev 583) @@ -27,8 +27,8 @@ import org.teiid.connector.language.*; import org.teiid.connector.language.ICompareCriteria.Operator; import org.teiid.connector.visitor.util.CollectorVisitor; +import org.teiid.dqp.internal.datamgr.language.*; -import com.metamatrix.dqp.internal.datamgr.language.*; import junit.framework.TestCase; Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java 2009-03-18 20:09:16 UTC (rev 583) @@ -37,45 +37,45 @@ import org.teiid.connector.metadata.runtime.RuntimeMetadata; import org.teiid.connector.visitor.util.SQLReservedWords; import org.teiid.connector.visitor.util.SQLStringVisitor; +import org.teiid.dqp.internal.datamgr.language.AggregateImpl; +import org.teiid.dqp.internal.datamgr.language.ElementImpl; +import org.teiid.dqp.internal.datamgr.language.FunctionImpl; +import org.teiid.dqp.internal.datamgr.language.GroupImpl; +import org.teiid.dqp.internal.datamgr.language.LiteralImpl; +import org.teiid.dqp.internal.datamgr.language.TestAggregateImpl; +import org.teiid.dqp.internal.datamgr.language.TestCompareCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl; +import org.teiid.dqp.internal.datamgr.language.TestElementImpl; +import org.teiid.dqp.internal.datamgr.language.TestExistsCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestFromImpl; +import org.teiid.dqp.internal.datamgr.language.TestFunctionImpl; +import org.teiid.dqp.internal.datamgr.language.TestGroupByImpl; +import org.teiid.dqp.internal.datamgr.language.TestGroupImpl; +import org.teiid.dqp.internal.datamgr.language.TestInCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestInsertImpl; +import org.teiid.dqp.internal.datamgr.language.TestIsNullCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestJoinImpl; +import org.teiid.dqp.internal.datamgr.language.TestLikeCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestLiteralImpl; +import org.teiid.dqp.internal.datamgr.language.TestNotCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestOrderByImpl; +import org.teiid.dqp.internal.datamgr.language.TestProcedureImpl; +import org.teiid.dqp.internal.datamgr.language.TestQueryImpl; +import org.teiid.dqp.internal.datamgr.language.TestScalarSubqueryImpl; +import org.teiid.dqp.internal.datamgr.language.TestSearchedCaseExpressionImpl; +import org.teiid.dqp.internal.datamgr.language.TestSelectImpl; +import org.teiid.dqp.internal.datamgr.language.TestSelectSymbolImpl; +import org.teiid.dqp.internal.datamgr.language.TestSetQueryImpl; +import org.teiid.dqp.internal.datamgr.language.TestSubqueryCompareCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestSubqueryInCriteriaImpl; +import org.teiid.dqp.internal.datamgr.language.TestUpdateImpl; +import org.teiid.dqp.internal.datamgr.language.TstLanguageBridgeFactory; +import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import junit.framework.TestCase; import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.dqp.internal.datamgr.language.AggregateImpl; -import com.metamatrix.dqp.internal.datamgr.language.ElementImpl; -import com.metamatrix.dqp.internal.datamgr.language.FunctionImpl; -import com.metamatrix.dqp.internal.datamgr.language.GroupImpl; -import com.metamatrix.dqp.internal.datamgr.language.LiteralImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestAggregateImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestCompareCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestDeleteImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestElementImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestExistsCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestFromImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestFunctionImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestGroupByImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestGroupImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestInCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestInsertImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestIsNullCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestJoinImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestLikeCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestLiteralImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestNotCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestOrderByImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestProcedureImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestQueryImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestScalarSubqueryImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSearchedCaseExpressionImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSelectImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSelectSymbolImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSetQueryImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSubqueryCompareCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSubqueryInCriteriaImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl; -import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFactory; -import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.sql.ReservedWords; import com.metamatrix.query.sql.lang.CompareCriteria; Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java 2009-03-18 20:09:16 UTC (rev 583) @@ -27,9 +27,9 @@ import org.teiid.connector.jdbc.oracle.OracleCapabilities; import org.teiid.connector.jdbc.sqlserver.SqlServerCapabilities; +import org.teiid.dqp.internal.datamgr.CapabilitiesConverter; import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.dqp.internal.datamgr.CapabilitiesConverter; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.optimizer.TestOptimizer; import com.metamatrix.query.optimizer.capabilities.FakeCapabilitiesFinder; Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java 2009-03-18 20:09:13 UTC (rev 582) +++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java 2009-03-18 20:09:16 UTC (rev 583) @@ -29,9 +29,9 @@ import java.util.Set; import org.teiid.connector.jdbc.oracle.OracleCapabilities; +import org.teiid.dqp.internal.datamgr.CapabilitiesConverter; import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.dqp.internal.datamgr.CapabilitiesConverter; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.optimizer.capabilities.FakeCapabilitiesFinder; import com.metamatrix.query.processor.HardcodedDataManager;