[teiid-commits] teiid SVN: r2119 - in trunk: connector-api/src/main/java/org/teiid and 105 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Wed May 12 11:27:33 EDT 2010
Author: shawkins
Date: 2010-05-12 11:27:10 -0400 (Wed, 12 May 2010)
New Revision: 2119
Added:
trunk/connector-api/src/main/java/org/teiid/language/
trunk/connector-api/src/main/java/org/teiid/language/AggregateFunction.java
trunk/connector-api/src/main/java/org/teiid/language/AndOr.java
trunk/connector-api/src/main/java/org/teiid/language/Argument.java
trunk/connector-api/src/main/java/org/teiid/language/BaseInCondition.java
trunk/connector-api/src/main/java/org/teiid/language/BaseLanguageObject.java
trunk/connector-api/src/main/java/org/teiid/language/BatchedUpdates.java
trunk/connector-api/src/main/java/org/teiid/language/Call.java
trunk/connector-api/src/main/java/org/teiid/language/ColumnReference.java
trunk/connector-api/src/main/java/org/teiid/language/Command.java
trunk/connector-api/src/main/java/org/teiid/language/Comparison.java
trunk/connector-api/src/main/java/org/teiid/language/Condition.java
trunk/connector-api/src/main/java/org/teiid/language/Delete.java
trunk/connector-api/src/main/java/org/teiid/language/DerivedColumn.java
trunk/connector-api/src/main/java/org/teiid/language/DerivedTable.java
trunk/connector-api/src/main/java/org/teiid/language/Exists.java
trunk/connector-api/src/main/java/org/teiid/language/Expression.java
trunk/connector-api/src/main/java/org/teiid/language/ExpressionValueSource.java
trunk/connector-api/src/main/java/org/teiid/language/Function.java
trunk/connector-api/src/main/java/org/teiid/language/GroupBy.java
trunk/connector-api/src/main/java/org/teiid/language/In.java
trunk/connector-api/src/main/java/org/teiid/language/Insert.java
trunk/connector-api/src/main/java/org/teiid/language/InsertValueSource.java
trunk/connector-api/src/main/java/org/teiid/language/IsNull.java
trunk/connector-api/src/main/java/org/teiid/language/Join.java
trunk/connector-api/src/main/java/org/teiid/language/LanguageFactory.java
trunk/connector-api/src/main/java/org/teiid/language/LanguageObject.java
trunk/connector-api/src/main/java/org/teiid/language/LanguageUtil.java
trunk/connector-api/src/main/java/org/teiid/language/Like.java
trunk/connector-api/src/main/java/org/teiid/language/Limit.java
trunk/connector-api/src/main/java/org/teiid/language/Literal.java
trunk/connector-api/src/main/java/org/teiid/language/MetadataReference.java
trunk/connector-api/src/main/java/org/teiid/language/NamedTable.java
trunk/connector-api/src/main/java/org/teiid/language/Not.java
trunk/connector-api/src/main/java/org/teiid/language/OrderBy.java
trunk/connector-api/src/main/java/org/teiid/language/Predicate.java
trunk/connector-api/src/main/java/org/teiid/language/QueryExpression.java
trunk/connector-api/src/main/java/org/teiid/language/SQLReservedWords.java
trunk/connector-api/src/main/java/org/teiid/language/ScalarSubquery.java
trunk/connector-api/src/main/java/org/teiid/language/SearchedCase.java
trunk/connector-api/src/main/java/org/teiid/language/SearchedWhenClause.java
trunk/connector-api/src/main/java/org/teiid/language/Select.java
trunk/connector-api/src/main/java/org/teiid/language/SetClause.java
trunk/connector-api/src/main/java/org/teiid/language/SetQuery.java
trunk/connector-api/src/main/java/org/teiid/language/SortSpecification.java
trunk/connector-api/src/main/java/org/teiid/language/SubqueryComparison.java
trunk/connector-api/src/main/java/org/teiid/language/SubqueryContainer.java
trunk/connector-api/src/main/java/org/teiid/language/SubqueryIn.java
trunk/connector-api/src/main/java/org/teiid/language/TableReference.java
trunk/connector-api/src/main/java/org/teiid/language/Update.java
trunk/connector-api/src/main/java/org/teiid/language/visitor/
trunk/connector-api/src/main/java/org/teiid/language/visitor/CollectorVisitor.java
trunk/connector-api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java
trunk/connector-api/src/main/java/org/teiid/metadata/
trunk/connector-api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java
trunk/connector-api/src/main/java/org/teiid/metadata/MetadataFactory.java
trunk/connector-api/src/main/java/org/teiid/translator/
trunk/connector-api/src/main/java/org/teiid/translator/BasicConnectorCapabilities.java
trunk/connector-api/src/main/java/org/teiid/translator/BasicExecution.java
trunk/connector-api/src/main/java/org/teiid/translator/BasicExecutionFactory.java
trunk/connector-api/src/main/java/org/teiid/translator/ConnectorException.java
trunk/connector-api/src/main/java/org/teiid/translator/FileConnection.java
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/
trunk/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/
trunk/connectors/translator-ldap/src/main/resources/org/teiid/translator/
Removed:
trunk/common-core/src/main/java/com/
trunk/connector-api/src/main/java/org/teiid/connector/language/
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/
trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/
trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/
trunk/connector-api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java
trunk/connector-api/src/main/java/org/teiid/metadata/MetadataFactory.java
trunk/connector-api/src/main/java/org/teiid/resource/ConnectorException.java
trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicConnectorCapabilities.java
trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecution.java
trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecutionFactory.java
trunk/connector-api/src/main/java/org/teiid/resource/adapter/FileConnection.java
trunk/connector-api/src/main/java/org/teiid/resource/cci/
trunk/connectors/connector-ldap/src/main/java/com/
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/cci/ldap/
trunk/connectors/connector-ldap/src/main/resources/org/teiid/resource/cci/
trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/
trunk/connectors/translator-ldap/src/main/resources/org/teiid/resource/
Modified:
trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java
trunk/connector-api/src/main/java/org/teiid/language/visitor/AbstractLanguageVisitor.java
trunk/connector-api/src/main/java/org/teiid/language/visitor/DelegatingHierarchyVisitor.java
trunk/connector-api/src/main/java/org/teiid/language/visitor/HierarchyVisitor.java
trunk/connector-api/src/main/java/org/teiid/language/visitor/LanguageObjectVisitor.java
trunk/connector-api/src/main/java/org/teiid/logging/CommandLogMessage.java
trunk/connector-api/src/main/java/org/teiid/metadata/BaseColumn.java
trunk/connector-api/src/main/java/org/teiid/metadata/Column.java
trunk/connector-api/src/main/java/org/teiid/metadata/ColumnSet.java
trunk/connector-api/src/main/java/org/teiid/metadata/Datatype.java
trunk/connector-api/src/main/java/org/teiid/metadata/ForeignKey.java
trunk/connector-api/src/main/java/org/teiid/metadata/KeyRecord.java
trunk/connector-api/src/main/java/org/teiid/metadata/MetadataStore.java
trunk/connector-api/src/main/java/org/teiid/metadata/Procedure.java
trunk/connector-api/src/main/java/org/teiid/metadata/ProcedureParameter.java
trunk/connector-api/src/main/java/org/teiid/metadata/RuntimeMetadata.java
trunk/connector-api/src/main/java/org/teiid/metadata/Schema.java
trunk/connector-api/src/main/java/org/teiid/metadata/Table.java
trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnection.java
trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java
trunk/connector-api/src/main/java/org/teiid/translator/CacheScope.java
trunk/connector-api/src/main/java/org/teiid/translator/ConnectorCapabilities.java
trunk/connector-api/src/main/java/org/teiid/translator/DataNotAvailableException.java
trunk/connector-api/src/main/java/org/teiid/translator/Execution.java
trunk/connector-api/src/main/java/org/teiid/translator/ExecutionContext.java
trunk/connector-api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/connector-api/src/main/java/org/teiid/translator/MetadataProvider.java
trunk/connector-api/src/main/java/org/teiid/translator/ProcedureExecution.java
trunk/connector-api/src/main/java/org/teiid/translator/ResultSetExecution.java
trunk/connector-api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
trunk/connector-api/src/main/java/org/teiid/translator/TranslatorProperty.java
trunk/connector-api/src/main/java/org/teiid/translator/TypeFacility.java
trunk/connector-api/src/main/java/org/teiid/translator/UpdateExecution.java
trunk/connector-api/src/test/java/org/teiid/connector/TestBasicExecutionFactory.java
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectionImpl.java
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPManagedConnectionFactory.java
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPPlugin.java
trunk/connectors/connector-ldap/src/test/java/org/teiid/resource/cci/ldap/TestLDAPConnection.java
trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/cci/salesforce/SalesforceConnectionImpl.java
trunk/connectors/connector-text/src/main/java/org/teiid/resource/adapter/file/FileConnectionImpl.java
trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/TickerCollectorVisitor.java
trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooCapabilities.java
trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecution.java
trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecutionFactory.java
trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/resource/adapter/yahoo/TestYahooTranslation.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCBaseExecution.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionException.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCMetdataProcessor.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCProcedureExecution.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCQueryExecution.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCUpdateExecution.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/SimpleCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/AliasModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ExtractFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ModFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/Translator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/access/AccessSQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2Capabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2SQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbySQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Capabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Translator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/AddDiffModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/informix/InformixSQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/BitFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Capabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Translator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/ConcatFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/DayWeekQuarterFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/LeftOrRightFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/Log10FunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/MonthOrDayNameFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSpatialFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/LocateFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerSQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SubstringFunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseCapabilities.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseSQLTranslator.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidCapabilities.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestExtractFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestLocateFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestModFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2ConvertModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/TestH2Translator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQL5Translator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQLTranslator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLeftOrRightFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLog10FunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleConvertModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestSubstringFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/IQueryToLdapSearchParser.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPConnectorCapabilities.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPConnectorConstants.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPExecutionFactory.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPPlugin.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSearchDetails.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPUpdateExecution.java
trunk/connectors/translator-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestIQueryToLdapSearchParser.java
trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackCapabilities.java
trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecution.java
trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecutionFactory.java
trunk/connectors/translator-loopback/src/test/java/org/teiid/resource/adaptor/loopback/TestLoopbackExecution.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/MetadataProcessor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/NameUtil.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceExecutionFactory.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceCapabilities.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnection.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/Util.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/AbstractUpdateExecution.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/DeleteExecutionImpl.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetDeletedExecutionImpl.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetUpdatedExecutionImpl.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/InsertExecutionImpl.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParent.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParentImpl.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/QueryExecutionImpl.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/SalesforceProcedureExecution.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/UpdateExecutionImpl.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/CriteriaVisitor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/DeleteVisitor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/ICriteriaVisitor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/IQueryProvidingVisitor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/InsertVisitor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/JoinQueryVisitor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/SelectVisitor.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/UpdateVisitor.java
trunk/connectors/translator-salesforce/src/test/java/org/teiid/resource/adapter/salesforce/execution/visitors/TestVisitors.java
trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextCapabilities.java
trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextConnectionImpl.java
trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextExecutionFactory.java
trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextSynchExecution.java
trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestMultiFileTextSynchExecution.java
trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestRowHeaderTextSynchExecution.java
trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestTextConnector.java
trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/Util.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/CapabilitiesConverter.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWork.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ProcedureBatchHandler.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/TranslatorRepository.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/language/LanguageBridgeFactory.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
trunk/engine/src/main/java/org/teiid/metadata/CompositeMetadataStore.java
trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
trunk/engine/src/main/java/org/teiid/query/function/source/SystemSource.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java
trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
trunk/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java
trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java
trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java
trunk/engine/src/main/java/org/teiid/query/sql/lang/Option.java
trunk/engine/src/main/java/org/teiid/query/sql/proc/RaiseErrorStatement.java
trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java
trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
trunk/engine/src/main/java/org/teiid/query/validator/AggregateValidationVisitor.java
trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeConnector.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeExecutionContextImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeProcedureExecution.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManager.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestTypeFacilityImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestAggregateImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestDeleteImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestElementImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestExistsCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestFunctionImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupByImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInlineViewImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInsertImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestIsNullCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestJoinImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLiteralImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestNotCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestOrderByImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestParameterImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestProcedureImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestQueryImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSearchedCaseExpressionImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSelectSymbolImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSetQueryImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryInCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestUpdateImpl.java
trunk/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java
trunk/engine/src/test/java/org/teiid/metadata/TestTransformationMetadata.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestCapabilitiesUtil.java
trunk/engine/src/test/java/org/teiid/query/sql/lang/TestJDBCExecutionHelper.java
trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java
trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java
trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java
trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java
trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java
trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java
trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java
trunk/metadata/src/test/java/com/metamatrix/cdk/api/ConnectorHost.java
trunk/metadata/src/test/java/com/metamatrix/cdk/api/TranslationUtility.java
trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
trunk/runtime/src/main/java/org/teiid/deployers/ManagedPropertyUtil.java
trunk/runtime/src/main/java/org/teiid/deployers/MetadataStoreGroup.java
trunk/runtime/src/main/java/org/teiid/deployers/TranslatorDeployer.java
trunk/runtime/src/main/java/org/teiid/deployers/TranslatorPropertyUtil.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfo.java
trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfoFactory.java
trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java
trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java
trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/MockConnector.java
trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java
trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java
trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java
trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java
trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java
trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestCollectorVisitor.java
trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
Log:
TEIID-918 updating connector language/metadata package names and changing ldap translator/resource adapter package names
Modified: trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,7 +28,7 @@
public class DataPlugin { // extends Plugin {
- public static final String PLUGIN_ID = "org.teiid.connector" ; //$NON-NLS-1$
+ public static final String PLUGIN_ID = DataPlugin.class.getPackage().getName();
public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,
PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$
Copied: trunk/connector-api/src/main/java/org/teiid/language/AggregateFunction.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/AggregateFunction.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/AggregateFunction.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/AggregateFunction.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,131 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents an aggregate function.
+ */
+public class AggregateFunction extends BaseLanguageObject implements Expression {
+
+ public static final String COUNT = "COUNT"; //$NON-NLS-1$
+ public static final String AVG = "AVG"; //$NON-NLS-1$
+ public static final String SUM = "SUM"; //$NON-NLS-1$
+ public static final String MIN = "MIN"; //$NON-NLS-1$
+ public static final String MAX = "MAX"; //$NON-NLS-1$
+
+ private Expression expression;
+ private String aggName;
+ private boolean isDistinct;
+ private Class<?> type;
+
+ public AggregateFunction(String aggName, boolean isDistinct, Expression exp, Class<?> type) {
+ this.expression = exp;
+ this.aggName = aggName;
+ this.isDistinct = isDistinct;
+ this.type = type;
+ }
+
+ /**
+ * Get the name of the aggregate function. This will be one of the constants defined
+ * in this class.
+ * @see #COUNT
+ * @see #AVG
+ * @see #SUM
+ * @see #MIN
+ * @see #MAX
+ */
+ public String getName() {
+ return this.aggName;
+ }
+
+ /**
+ * Determine whether this function was executed with DISTINCT. Executing
+ * with DISTINCT will remove all duplicate values in a group when evaluating
+ * the aggregate function.
+ * @return True if DISTINCT mode is used
+ */
+ public boolean isDistinct() {
+ return this.isDistinct;
+ }
+
+ /**
+ * Get the expression within the aggregate function. The expression will be
+ * null for the special case COUNT(*). This is the only case where the
+ * expression will be null
+ * @return The expression or null for COUNT(*)
+ */
+ public Expression getExpression() {
+ return this.expression;
+ }
+
+ /**
+ * @see org.teiid.language.LanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ */
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ /**
+ * Set the name of the aggregate function. This will be one of the constants defined
+ * in this class.
+ * @param name New aggregate function name
+ * @see #COUNT
+ * @see #AVG
+ * @see #SUM
+ * @see #MIN
+ * @see #MAX
+ */
+ public void setName(String name) {
+ this.aggName = name;
+ }
+
+ /**
+ * Set whether this function was executed with DISTINCT. Executing
+ * with DISTINCT will remove all duplicate values in a group when evaluating
+ * the aggregate function.
+ * @param isDistinct True if DISTINCT mode should be used
+ */
+ public void setDistinct(boolean isDistinct) {
+ this.isDistinct = isDistinct;
+ }
+
+ /**
+ * Set the expression within the aggregate function. The expression will be
+ * null for the special case COUNT(*).
+ * @param expression The new expression
+ */
+ public void setExpression(Expression expression) {
+ this.expression = expression;
+ }
+
+ public Class<?> getType() {
+ return this.type;
+ }
+
+ public void setType(Class<?> type) {
+ this.type = type;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/AndOr.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/AndOr.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/AndOr.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/AndOr.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a logical criteria such as AND, OR, or NOT.
+ */
+public class AndOr extends Condition {
+
+ public enum Operator {
+ AND,
+ OR,
+ }
+
+ private Condition leftCondition;
+ private Condition rightCondition;
+ private Operator operator = Operator.AND;
+
+ public AndOr(Condition left, Condition right, Operator operator) {
+ this.leftCondition = left;
+ this.rightCondition = right;
+ this.operator = operator;
+ }
+
+ /**
+ * Get operator used to connect these criteria.
+ * @return Operator constant
+ */
+ public Operator getOperator() {
+ return this.operator;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ /**
+ * Set operator used to connect these criteria.
+ * @param operator Operator constant
+ */
+ public void setOperator(Operator operator) {
+ this.operator = operator;
+ }
+
+ public Condition getLeftCondition() {
+ return leftCondition;
+ }
+
+ public Condition getRightCondition() {
+ return rightCondition;
+ }
+
+ public void setLeftCondition(Condition left) {
+ this.leftCondition = left;
+ }
+
+ public void setRightCondition(Condition right) {
+ this.rightCondition = right;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Argument.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Argument.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Argument.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Argument.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+import org.teiid.metadata.ProcedureParameter;
+
+public class Argument extends BaseLanguageObject implements MetadataReference<ProcedureParameter> {
+
+ public enum Direction {
+ IN,
+ OUT,
+ INOUT,
+ }
+
+ private Direction direction;
+ private Literal argumentValue;
+ private ProcedureParameter metadataObject;
+ private Class<?> type;
+
+ public Argument(Direction direction, Literal value, Class<?> type, ProcedureParameter metadataObject) {
+ this.direction = direction;
+ this.argumentValue = value;
+ this.metadataObject = metadataObject;
+ this.type = type;
+ }
+
+ public Direction getDirection() {
+ return this.direction;
+ }
+
+ /**
+ * Get the argument value
+ * @return the value or null if this is an out parameter
+ */
+ public Literal getArgumentValue() {
+ return this.argumentValue;
+ }
+
+ public Class<?> getType() {
+ return type;
+ }
+
+ public void setType(Class<?> type) {
+ this.type = type;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setDirection(Direction direction) {
+ this.direction = direction;
+ }
+
+ public void setArgumentValue(Literal value) {
+ this.argumentValue = value;
+ }
+
+ @Override
+ public ProcedureParameter getMetadataObject() {
+ return this.metadataObject;
+ }
+
+ public void setMetadataObject(ProcedureParameter metadataObject) {
+ this.metadataObject = metadataObject;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/BaseInCondition.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/BaseInCondition.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/BaseInCondition.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/BaseInCondition.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+public abstract class BaseInCondition extends Condition implements Predicate {
+
+ private Expression leftExpression;
+ private boolean negated;
+
+ public BaseInCondition(Expression leftExpression, boolean negated) {
+ this.leftExpression = leftExpression;
+ this.negated = negated;
+ }
+
+ /**
+ * Get left expression of IN criteria
+ * @return Left expression
+ */
+ public Expression getLeftExpression() {
+ return leftExpression;
+ }
+
+ /**
+ * Set left expression of IN criteria
+ */
+ public void setLeftExpression(Expression leftExpression) {
+ this.leftExpression = leftExpression;
+ }
+
+ /**
+ * Returns whether this criteria is negated.
+ * @return flag indicating whether this criteria contains a NOT
+ */
+ public boolean isNegated() {
+ return negated;
+ }
+
+ /**
+ * Sets whether this criteria is negated.
+ * @param negated Flag indicating whether this criteria contains a NOT
+ */
+ public void setNegated(boolean negated) {
+ this.negated = negated;
+ }
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/BaseLanguageObject.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/BaseLanguageObject.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/BaseLanguageObject.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/BaseLanguageObject.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.SQLStringVisitor;
+
+public abstract class BaseLanguageObject implements LanguageObject {
+
+ public String toString() {
+ return SQLStringVisitor.getSQLString(this);
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/BatchedUpdates.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/BatchedUpdates.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/BatchedUpdates.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/BatchedUpdates.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a batch of INSERT, UPDATE and DELETE commands to be executed together.
+ */
+public class BatchedUpdates extends BaseLanguageObject implements Command {
+
+ private List<Command> updateCommands;
+
+ public BatchedUpdates(List<Command> updateCommands) {
+ this.updateCommands = updateCommands;
+ }
+
+ /**
+ * @return a list of IInsert, IUpdate and IDelete commands in this batched update.
+ */
+ public List<Command> getUpdateCommands() {
+ return updateCommands;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Call.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Call.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Call.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Call.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.ColumnSet;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.ProcedureParameter.Type;
+
+/**
+ * Represents a procedural execution (such as a stored procedure).
+ */
+public class Call extends BaseLanguageObject implements Command, MetadataReference<Procedure> {
+
+ private String name;
+ private List<Argument> arguments;
+ private Procedure metadataObject;
+ private Class<?> returnType;
+
+ public Call(String name, List<Argument> parameters, Procedure metadataObject) {
+ this.name = name;
+ this.arguments = parameters;
+ this.metadataObject = metadataObject;
+ }
+
+ /**
+ * Get the return type
+ * @return the return parameter type or null if not expecting a return value
+ */
+ public Class<?> getReturnType() {
+ return returnType;
+ }
+
+ public void setReturnType(Class<?> returnType) {
+ this.returnType = returnType;
+ }
+
+ public String getProcedureName() {
+ return this.name;
+ }
+
+ public List<Argument> getArguments() {
+ return arguments;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setProcedureName(String name) {
+ this.name = name;
+ }
+
+ public void setArguments(List<Argument> parameters) {
+ this.arguments = parameters;
+ }
+
+ @Override
+ public Procedure getMetadataObject() {
+ return this.metadataObject;
+ }
+
+ public ProcedureParameter getReturnParameter() {
+ for (ProcedureParameter param : this.metadataObject.getParameters()) {
+ if (param.getType() == Type.ReturnValue) {
+ return param;
+ }
+ }
+ return null;
+ }
+
+ public Class<?>[] getResultSetColumnTypes() {
+ ColumnSet<Procedure> resultSet = this.metadataObject.getResultSet();
+ if (resultSet == null) {
+ return new Class[0];
+ }
+ List<Column> columnMetadata = resultSet.getColumns();
+ int size = columnMetadata.size();
+ Class<?>[] coulmnDTs = new Class[size];
+ for(int i =0; i<size; i++ ){
+ coulmnDTs[i] = columnMetadata.get(i).getJavaType();
+ }
+ return coulmnDTs;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/ColumnReference.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/ColumnReference.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/ColumnReference.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/ColumnReference.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+import org.teiid.metadata.Column;
+
+/**
+ * Represents an element in the language. An example of an element
+ * would be a column reference in a SELECT clause.
+ */
+public class ColumnReference extends BaseLanguageObject implements MetadataReference<Column>, Expression {
+
+ private NamedTable table;
+ private String name;
+ private Column metadataObject;
+ private Class<?> type;
+
+ public ColumnReference(NamedTable group, String name, Column metadataObject, Class<?> type) {
+ this.table = group;
+ this.name = name;
+ this.metadataObject = metadataObject;
+ this.type = type;
+ }
+
+ /**
+ * Gets the name of the element.
+ * @return the name of the element
+ */
+ public String getName() {
+ return this.name;
+ }
+
+ /**
+ * Return the table that contains this column. May be null.
+ * @return The group reference
+ */
+ public NamedTable getTable() {
+ return table;
+ }
+
+ @Override
+ public Column getMetadataObject() {
+ return this.metadataObject;
+ }
+
+ public void setMetadataObject(Column metadataObject) {
+ this.metadataObject = metadataObject;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+
+ public void setTable(NamedTable group) {
+ this.table = group;
+ }
+
+ public Class<?> getType() {
+ return this.type;
+ }
+
+ /**
+ * Sets the name of the element.
+ * @param name The name of the element
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setType(Class<?> type) {
+ this.type = type;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Command.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Command.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Command.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Command.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+/**
+ * Represents a command in the language objects. A command is an instruction of
+ * something to execute sent to the connector. Typical commands perform
+ * SELECT, INSERT, UPDATE, DELETE, etc type operations.
+ */
+public interface Command extends LanguageObject {
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Comparison.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Comparison.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Comparison.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Comparison.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,117 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.SQLReservedWords.Tokens;
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a comparison between two expressions connected with
+ * one of the following operators: =, <>, <, <=, >, >=.
+ */
+public class Comparison extends Condition implements Predicate {
+
+ public enum Operator {
+ EQ(Tokens.EQ),
+ NE(Tokens.NE),
+ LT(Tokens.LT),
+ LE(Tokens.LE),
+ GT(Tokens.GT),
+ GE(Tokens.GE);
+
+ private String toString;
+ Operator(String toString) {
+ this.toString = toString;
+ }
+ @Override
+ public String toString() {
+ return toString;
+ }
+ }
+
+ private Expression leftExpression;
+ private Expression rightExpression;
+ private Operator operator;
+
+ public Comparison(Expression left, Expression right, Operator operator) {
+ leftExpression = left;
+ rightExpression = right;
+ this.operator = operator;
+ }
+
+ /**
+ * Get left expression.
+ * @return Left expression
+ */
+ public Expression getLeftExpression() {
+ return leftExpression;
+ }
+
+ /**
+ * Get right expression.
+ * @return Right expression
+ */
+ public Expression getRightExpression() {
+ return rightExpression;
+ }
+
+ /**
+ * Get the operator
+ * @return Operator constant
+ * @see Operator
+ */
+ public Operator getOperator() {
+ return this.operator;
+ }
+
+ /**
+ * Set left expression of criteria
+ */
+ public void setLeftExpression(Expression expression) {
+ this.leftExpression = expression;
+ }
+
+ /**
+ * Set right expression of criteria
+ */
+ public void setRightExpression(Expression expression) {
+ this.rightExpression = expression;
+ }
+
+ /**
+ * Set the operator
+ * @see Operator
+ */
+ public void setOperator(Operator operator) {
+ this.operator = operator;
+ }
+
+ /**
+ * @see org.teiid.language.LanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ */
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Condition.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Condition.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Condition.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Condition.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.translator.TypeFacility;
+
+/**
+ * Represents criteria, which is also a boolean expression
+ */
+public abstract class Condition extends BaseLanguageObject implements Expression {
+
+ @Override
+ public Class<?> getType() {
+ return TypeFacility.RUNTIME_TYPES.BOOLEAN;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Delete.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Delete.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Delete.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Delete.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a DELETE command.
+ */
+public class Delete extends BaseLanguageObject implements Command {
+
+ private NamedTable table;
+ private Condition where;
+
+ public Delete(NamedTable group, Condition criteria) {
+ this.table = group;
+ this.where = criteria;
+ }
+
+ /**
+ * Get group that is being deleted from.
+ * @return Insert group
+ */
+ public NamedTable getTable() {
+ return table;
+ }
+
+ /**
+ * Get criteria that is being used with the delete - may be null
+ * @return Criteria, may be null
+ */
+ public Condition getWhere() {
+ return where;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ /**
+ * Set group that is being deleted from.
+ * @param group Insert group
+ */
+ public void setTable(NamedTable group) {
+ this.table = group;
+ }
+
+ /**
+ * Set criteria that is being used with the delete - may be null
+ * @param criteria Criteria, may be null
+ */
+ public void setWhere(Condition criteria) {
+ this.where = criteria;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/DerivedColumn.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/DerivedColumn.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/DerivedColumn.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/DerivedColumn.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class DerivedColumn extends BaseLanguageObject {
+
+ private String alias;
+ private Expression expression;
+
+ public DerivedColumn(String name, Expression expression) {
+ this.alias = name;
+ this.expression = expression;
+ }
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public Expression getExpression() {
+ return expression;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setAlias(String name) {
+ this.alias = name;
+ }
+
+ public void setExpression(Expression expression) {
+ this.expression = expression;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/DerivedTable.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/DerivedTable.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/DerivedTable.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/DerivedTable.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a derived table or inline view in the from clause.
+ */
+public class DerivedTable extends BaseLanguageObject implements TableReference {
+
+ private String correlationName;
+ private QueryExpression query;
+
+ public DerivedTable(QueryExpression query, String name) {
+ this.query = query;
+ this.correlationName = name;
+ }
+
+ public String getCorrelationName() {
+ return this.correlationName;
+ }
+
+ public void setCorrelationName(String name) {
+ this.correlationName = name;
+ }
+
+ public QueryExpression getQuery() {
+ return this.query;
+ }
+
+ public void setQuery(QueryExpression query) {
+ this.query = query;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Exists.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Exists.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Exists.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Exists.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents an EXISTS criteria that checks whether any results would be
+ * returned from a subquery.
+ */
+public class Exists extends Condition implements Predicate, SubqueryContainer {
+
+ private QueryExpression query;
+
+ public Exists(QueryExpression query) {
+ this.query = query;
+ }
+
+ public QueryExpression getSubquery() {
+ return query;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setSubquery(QueryExpression query) {
+ this.query = query;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Expression.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Expression.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Expression.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Expression.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+/**
+ * Represents an expression in the language. Subinterfaces define specific
+ * types of expressions, such as literal values, element references, and
+ * functions.
+ */
+public interface Expression extends LanguageObject {
+
+ /**
+ * Determine the type returned by this expression.
+ *
+ * @return The type, as defined by a Java class
+ */
+ Class<?> getType();
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/ExpressionValueSource.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/ExpressionValueSource.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/ExpressionValueSource.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/ExpressionValueSource.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class ExpressionValueSource extends BaseLanguageObject implements InsertValueSource {
+
+ private List<Expression> values;
+
+ public ExpressionValueSource(List<Expression> values) {
+ this.values = values;
+ }
+
+ public List<Expression> getValues() {
+ return values;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/language/ExpressionValueSource.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/connector-api/src/main/java/org/teiid/language/Function.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Function.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Function.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Function.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a function. A function has a name and 0..n
+ * Expressions that are parameters.
+ */
+public class Function extends BaseLanguageObject implements Expression {
+
+ private String name;
+ private List<Expression> parameters;
+ private Class<?> type;
+
+ public Function(String name, List<? extends Expression> params, Class<?> type) {
+ this.name = name;
+ if (params == null) {
+ this.parameters = new ArrayList<Expression>(0);
+ } else {
+ this.parameters = new ArrayList<Expression>(params);
+ }
+ this.type = type;
+ }
+
+ /**
+ * Get name of the function
+ * @return Function name
+ */
+ public String getName() {
+ return this.name;
+ }
+
+ /**
+ * Get the parameters used in this function.
+ * @return Array of IExpressions defining the parameters
+ */
+ public List<Expression> getParameters() {
+ return parameters;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ /**
+ * Set name of the function
+ * @param name Function name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Class<?> getType() {
+ return this.type;
+ }
+
+ public void setType(Class<?> type) {
+ this.type = type;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/GroupBy.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/GroupBy.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/GroupBy.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/GroupBy.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a GROUP BY clause in a query.
+ */
+public class GroupBy extends BaseLanguageObject {
+
+ private List<Expression> elements;
+
+ public GroupBy(List<Expression> elements) {
+ this.elements = elements;
+ }
+
+ /**
+ * Get list of IExpression that the GROUP BY should be grouped on.
+ * @return List of IExpression
+ */
+ public List<Expression> getElements() {
+ return elements;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setElements(List<Expression> elements) {
+ this.elements = elements;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/In.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/In.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/In.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/In.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class In extends BaseInCondition {
+
+ private List<Expression> rightExpressions;
+
+ public In(Expression left, List<Expression> right, boolean negated) {
+ super(left, negated);
+ rightExpressions = right;
+ }
+
+ /**
+ * Get List of IExpression in the set on the right side of the criteria.
+ * @return List of IExpression
+ */
+ public List<Expression> getRightExpressions() {
+ return rightExpressions;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setRightExpressions(List<Expression> expressions) {
+ this.rightExpressions = expressions;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Insert.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Insert.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Insert.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Insert.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+
+public class Insert extends BaseLanguageObject implements Command {
+
+ private NamedTable table;
+ private List<ColumnReference> columns;
+ private InsertValueSource valueSource;
+
+ public Insert(NamedTable group, List<ColumnReference> elements, InsertValueSource valueSource) {
+ this.table = group;
+ this.columns = elements;
+ this.valueSource = valueSource;
+ }
+
+ public NamedTable getTable() {
+ return table;
+ }
+
+ public List<ColumnReference> getColumns() {
+ return columns;
+ }
+
+ public InsertValueSource getValueSource() {
+ return valueSource;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setTable(NamedTable group) {
+ this.table = group;
+ }
+
+ public void setColumns(List<ColumnReference> elements) {
+ this.columns = elements;
+ }
+
+ public void setValueSource(InsertValueSource values) {
+ this.valueSource = values;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/InsertValueSource.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/InsertValueSource.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/InsertValueSource.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/InsertValueSource.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+public interface InsertValueSource extends LanguageObject {
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/language/InsertValueSource.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/connector-api/src/main/java/org/teiid/language/IsNull.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/IsNull.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/IsNull.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/IsNull.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents an IS NULL predicate.
+ */
+public class IsNull extends Condition implements Predicate {
+
+ private Expression expression;
+ private boolean negated;
+
+ public IsNull(Expression expr, boolean isNegated) {
+ expression = expr;
+ this.negated = isNegated;
+ }
+
+ public Expression getExpression() {
+ return expression;
+ }
+
+ public boolean isNegated() {
+ return this.negated;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setExpression(Expression expression) {
+ this.expression = expression;
+ }
+
+ public void setNegated(boolean negated) {
+ this.negated = negated;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Join.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Join.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Join.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Join.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class Join extends BaseLanguageObject implements TableReference {
+
+ public enum JoinType {
+ INNER_JOIN,
+ CROSS_JOIN,
+ LEFT_OUTER_JOIN,
+ RIGHT_OUTER_JOIN,
+ FULL_OUTER_JOIN
+ }
+
+ private TableReference leftItem;
+ private TableReference rightItem;
+ private JoinType joinType;
+ private Condition condition;
+
+ public Join(TableReference left, TableReference right, JoinType joinType, Condition criteria) {
+ this.leftItem = left;
+ this.rightItem = right;
+ this.joinType = joinType;
+ this.condition = criteria;
+ }
+
+ public TableReference getLeftItem() {
+ return leftItem;
+ }
+
+ public TableReference getRightItem() {
+ return rightItem;
+ }
+
+ public JoinType getJoinType() {
+ return this.joinType;
+ }
+
+ public Condition getCondition() {
+ return condition;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setLeftItem(TableReference item) {
+ this.leftItem = item;
+ }
+
+ public void setRightItem(TableReference item) {
+ this.rightItem = item;
+ }
+
+ public void setJoinType(JoinType type) {
+ this.joinType = type;
+ }
+
+ public void setCondition(Condition criteria) {
+ this.condition = criteria;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/LanguageFactory.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/LanguageFactory.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/LanguageFactory.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/LanguageFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,206 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.teiid.language.SortSpecification.Ordering;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Table;
+
+/**
+ * Factory for the construction of language objects that implement the language interfaces.
+ * This factory is provided by the connector environment and can be used in modifying the language
+ * interfaces if needed.
+ */
+public class LanguageFactory {
+
+ /**
+ * Public instance, holds no state so can be shared by everyone.
+ */
+ public static final LanguageFactory INSTANCE = new LanguageFactory();
+
+ public AggregateFunction createAggregate(String name, boolean isDistinct, Expression expression, Class<?> type) {
+ return new AggregateFunction(name, isDistinct, expression, type);
+ }
+
+ public Comparison createCompareCriteria(
+ Comparison.Operator operator,
+ Expression leftExpression,
+ Expression rightExpression) {
+ return new Comparison(leftExpression, rightExpression, operator);
+ }
+
+ public AndOr createAndOr(AndOr.Operator operator, Condition left, Condition right) {
+ return new AndOr(left, right, operator);
+ }
+
+ public Delete createDelete(NamedTable group, Condition where) {
+ return new Delete(group, where);
+ }
+
+ public ColumnReference createColumnReference(String name, NamedTable group, Column metadataReference, Class<?> type) {
+ return new ColumnReference(group, name, metadataReference, type);
+ }
+
+ public Exists createExists(Select query) {
+ return new Exists(query);
+ }
+
+ public Function createFunction(String functionName, Expression[] args, Class<?> type) {
+ return new Function(functionName, Arrays.asList(args), type);
+ }
+
+ public Function createFunction(String functionName, List<? extends Expression> args, Class<?> type) {
+ return new Function(functionName, args, type);
+ }
+
+ public NamedTable createNamedTable(String name, String correlationName, Table metadataReference) {
+ return new NamedTable(name, correlationName, metadataReference);
+ }
+
+ public GroupBy createGroupBy(List<Expression> items) {
+ return new GroupBy(items);
+ }
+
+ public In createIn(Expression leftExpression, List<Expression> rightExpressions, boolean isNegated) {
+ return new In(leftExpression, rightExpressions, isNegated);
+ }
+
+ public Insert createInsert(NamedTable group, List<ColumnReference> columns, InsertValueSource valueSource) {
+ return new Insert(group, columns, valueSource);
+ }
+
+ public ExpressionValueSource createInsertExpressionValueSource(List<Expression> values) {
+ return new ExpressionValueSource(values);
+ }
+
+ public IsNull createIsNullCriteria(Expression expression, boolean isNegated) {
+ return new IsNull(expression, isNegated);
+ }
+
+ public Join createJoin(Join.JoinType joinType, TableReference leftItem, TableReference rightItem, Condition condition) {
+ return new Join(leftItem, rightItem, joinType, condition);
+ }
+
+ public Like createLikeCriteria(
+ Expression leftExpression,
+ Expression rightExpression,
+ Character escapeCharacter,
+ boolean isNegated) {
+ return new Like(leftExpression, rightExpression, escapeCharacter, isNegated);
+ }
+
+ public Literal createLiteral(Object value, Class<?> type) {
+ return new Literal(value, type);
+ }
+
+ public Not createNot(Condition criteria) {
+ return new Not(criteria);
+ }
+
+ public OrderBy createOrderBy(List<SortSpecification> items) {
+ return new OrderBy(items);
+ }
+
+ public SortSpecification createOrderByItem(ColumnReference element, Ordering direction) {
+ return new SortSpecification(direction, element);
+ }
+
+ public Argument createArgument(Argument.Direction direction, Literal value, Class<?> type, ProcedureParameter metadataReference) {
+ return new Argument(direction, value, type, metadataReference);
+ }
+
+ public Call createCall(String name, List<Argument> parameters, Procedure metadataReference) {
+ return new Call(name, parameters, metadataReference);
+ }
+
+ public Select createQuery(
+ List<DerivedColumn> select,
+ boolean isDistinct,
+ List<TableReference> from,
+ Condition where,
+ GroupBy groupBy,
+ Condition having,
+ OrderBy orderBy) {
+ return new Select(select, isDistinct, from, where, groupBy, having, orderBy);
+ }
+
+ public ScalarSubquery createScalarSubquery(Select query) {
+ return new ScalarSubquery(query);
+ }
+
+ public SearchedCase createSearchedCaseExpression(
+ List<SearchedWhenClause> cases,
+ Expression elseExpression,
+ Class<?> type) {
+ return new SearchedCase(cases, elseExpression, type);
+ }
+
+ public SearchedWhenClause createSearchedWhenCondition(Condition condition, Expression result) {
+ return new SearchedWhenClause(condition, result);
+ }
+
+ public DerivedColumn createSelectSymbol(String name, Expression expression) {
+ return new DerivedColumn(name, expression);
+ }
+
+ public SubqueryComparison createSubqueryCompareCriteria(
+ Expression leftExpression,
+ Comparison.Operator operator,
+ SubqueryComparison.Quantifier quantifier,
+ Select subquery) {
+ return new SubqueryComparison(leftExpression, operator, quantifier, subquery);
+ }
+
+ public SubqueryIn createSubqueryInCriteria(Expression expression, Select subquery, boolean isNegated) {
+ return new SubqueryIn(expression, isNegated, subquery);
+ }
+
+ public Update createUpdate(NamedTable group, List<SetClause> updates, Condition criteria) {
+ return new Update(group, updates, criteria);
+ }
+
+ public DerivedTable createInlineView(QueryExpression query, String name) {
+ return new DerivedTable(query, name);
+ }
+
+ public SetQuery createSetOp(SetQuery.Operation operation, boolean all, QueryExpression leftQuery, QueryExpression rightQuery, OrderBy orderBy, Limit limit) {
+ SetQuery queryImpl = new SetQuery();
+ queryImpl.setOperation(operation);
+ queryImpl.setAll(all);
+ queryImpl.setLeftQuery(leftQuery);
+ queryImpl.setRightQuery(rightQuery);
+ queryImpl.setOrderBy(orderBy);
+ queryImpl.setLimit(limit);
+ return queryImpl;
+ }
+
+ public SetClause createSetClause(ColumnReference symbol, Expression value) {
+ return new SetClause(symbol, value);
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/LanguageObject.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/LanguageObject.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/LanguageObject.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/LanguageObject.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Root interface for all language object interfaces.
+ */
+public interface LanguageObject {
+
+ void acceptVisitor(LanguageObjectVisitor visitor);
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/LanguageUtil.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/LanguageUtil.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/LanguageUtil.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/LanguageUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.*;
+
+import org.teiid.language.AndOr.Operator;
+
+
+/**
+ * Helpful utility methods to work with language interfaces.
+ */
+public final class LanguageUtil {
+
+ /**
+ * Can't construct - this contains only static utility methods
+ */
+ private LanguageUtil() {
+ }
+
+ /**
+ * Take a criteria, which may be null, a single IPredicateCriteria or a
+ * complex criteria built using ICompoundCriteria and breaks it apart
+ * at ANDs such that a List of ICriteria conjuncts are returned. For
+ * example, ((a=1 OR b=2) AND (c=3 AND d=4)) would return the list
+ * (a=1 OR b=2), c=3, d=4. If criteria is null, an empty list is
+ * returned.
+ * @param criteria Criteria to break, may be null
+ * @return List of ICriteria, never null
+ */
+ public static final List<Condition> separateCriteriaByAnd(Condition criteria) {
+ if(criteria == null) {
+ return Collections.emptyList();
+ }
+
+ List<Condition> parts = new ArrayList<Condition>();
+ separateCriteria(criteria, parts);
+ return parts;
+ }
+
+ /**
+ * Helper method for {@link #separateCriteriaByAnd(Condition)} that
+ * can be called recursively to collect parts.
+ * @param crit Crit to break apart
+ * @param parts List to add parts to
+ */
+ private static void separateCriteria(Condition crit, List<Condition> parts) {
+ if(crit instanceof AndOr) {
+ AndOr compCrit = (AndOr) crit;
+ if(compCrit.getOperator() == Operator.AND) {
+ separateCriteria(compCrit.getLeftCondition(), parts);
+ separateCriteria(compCrit.getRightCondition(), parts);
+ } else {
+ parts.add(crit);
+ }
+ } else {
+ parts.add(crit);
+ }
+ }
+
+ /**
+ * This utility method can be used to combine two criteria using an AND.
+ * If both criteria are null, then null will be returned. If either is null,
+ * then the other will be returned.
+ * @param primaryCrit Primary criteria - may be modified
+ * @param additionalCrit Won't be modified, but will likely be attached to the returned crit
+ * @param languageFactory Will be used to construct new ICompoundCriteria if necessary
+ * @return Combined criteria
+ */
+ public static Condition combineCriteria(Condition primaryCrit, Condition additionalCrit, LanguageFactory languageFactory) {
+ if(primaryCrit == null) {
+ return additionalCrit;
+ } else if(additionalCrit == null) {
+ return primaryCrit;
+ } else {
+ return languageFactory.createAndOr(Operator.AND, primaryCrit, additionalCrit);
+ }
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Like.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Like.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Like.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Like.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class Like extends Condition implements Predicate {
+
+ private Expression leftExpression;
+ private Expression rightExpression;
+ private Character escapeCharacter;
+ private boolean isNegated;
+
+ public Like(Expression left, Expression right, Character escapeCharacter, boolean negated) {
+ leftExpression = left;
+ rightExpression = right;
+ this.escapeCharacter = escapeCharacter;
+ this.isNegated = negated;
+
+ }
+
+ public Expression getLeftExpression() {
+ return leftExpression;
+ }
+
+ public Expression getRightExpression() {
+ return rightExpression;
+ }
+
+ public Character getEscapeCharacter() {
+ return this.escapeCharacter;
+ }
+
+ public boolean isNegated() {
+ return this.isNegated;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setLeftExpression(Expression expression) {
+ this.leftExpression = expression;
+ }
+
+ public void setRightExpression(Expression expression) {
+ this.rightExpression = expression;
+ }
+
+ public void setEscapeCharacter(Character character) {
+ this.escapeCharacter = character;
+ }
+
+ public void setNegated(boolean negated) {
+ this.isNegated = negated;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Limit.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Limit.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Limit.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Limit.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a LIMIT clause with row offset and row limit values to bound the resulting rows
+ */
+public class Limit extends BaseLanguageObject {
+
+ private int rowOffset;
+ private int rowLimit;
+
+ public Limit(int offset, int rowLimit) {
+ this.rowOffset = offset;
+ this.rowLimit = rowLimit;
+ }
+
+ /**
+ * Get the max number of rows returned.
+ */
+ public int getRowLimit() {
+ return rowLimit;
+ }
+
+ /**
+ * Get the row offset at which to begin returning rows.
+ */
+ public int getRowOffset() {
+ return rowOffset;
+ }
+
+ public void setRowLimit(int rowLimit) {
+ this.rowLimit = rowLimit;
+ }
+
+ public void setRowOffset(int rowOffset) {
+ this.rowOffset = rowOffset;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Literal.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Literal.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Literal.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Literal.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a literal value that is used in
+ * an expression. The value can be obtained and should match
+ * the type specified by {@link #getType()}
+ */
+public class Literal extends BaseLanguageObject implements Expression {
+
+ private Object value;
+ private Class<?> type;
+ private boolean bindValue;
+ private boolean multiValued;
+
+ public Literal(Object value, Class<?> type) {
+ this.value = value;
+ this.type = type;
+ }
+
+ public Object getValue() {
+ return this.value;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public Class<?> getType() {
+ return this.type;
+ }
+
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ public boolean isBindValue() {
+ return bindValue;
+ }
+
+ public void setBindValue(boolean bindValue) {
+ this.bindValue = bindValue;
+ }
+
+ public boolean isMultiValued() {
+ return multiValued;
+ }
+
+ public void setMultiValued(boolean multiValued) {
+ this.multiValued = multiValued;
+ }
+
+ public void setType(Class<?> type) {
+ this.type = type;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/MetadataReference.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/MetadataReference.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/MetadataReference.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/MetadataReference.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.metadata.AbstractMetadataRecord;
+
+
+/**
+ * This interface is used to mark language objects as having a
+ * reference to a MetadataID.
+ */
+public interface MetadataReference<T extends AbstractMetadataRecord> {
+
+ T getMetadataObject();
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/NamedTable.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/NamedTable.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/NamedTable.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/NamedTable.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+import org.teiid.metadata.Table;
+
+/**
+ * Represents a table in the language objects. An example would
+ * be a table reference in the FROM clause.
+ */
+public class NamedTable extends BaseLanguageObject implements MetadataReference<Table>, TableReference {
+
+ private String correlationName;
+ private String name;
+ private Table metadataObject;
+
+ public NamedTable(String name, String correlationName, Table group) {
+ this.name = name;
+ this.correlationName = correlationName;
+ this.metadataObject = group;
+ }
+
+ public String getCorrelationName() {
+ return correlationName;
+ }
+
+ /**
+ * Gets the name of the table. Will typically match the name in the metadata.
+ * @return
+ */
+ public String getName() {
+ return this.name;
+ }
+
+ @Override
+ public Table getMetadataObject() {
+ return this.metadataObject;
+ }
+
+ public void setMetadataObject(Table metadataObject) {
+ this.metadataObject = metadataObject;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setName(String definition) {
+ this.name = definition;
+ }
+
+ public void setCorrelationName(String context) {
+ this.correlationName = context;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Not.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Not.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Not.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Not.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class Not extends Condition {
+
+ private Condition criteria;
+
+ public Not(Condition criteria) {
+ this.criteria = criteria;
+ }
+
+ public Condition getCriteria() {
+ return criteria;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setCriteria(Condition criteria) {
+ this.criteria = criteria;
+ }
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/language/Not.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/connector-api/src/main/java/org/teiid/language/OrderBy.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/OrderBy.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/OrderBy.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/OrderBy.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents an ORDER BY clause in a command.
+ */
+public class OrderBy extends BaseLanguageObject {
+
+ private List<SortSpecification> sortSpecifications;
+
+ public OrderBy(List<SortSpecification> items) {
+ this.sortSpecifications = items;
+ }
+
+ public List<SortSpecification> getSortSpecifications() {
+ return sortSpecifications;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setSortSpecifications(List<SortSpecification> items) {
+ this.sortSpecifications = items;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Predicate.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Predicate.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Predicate.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Predicate.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+/**
+ * Represents a criteria that can occur at the leaf of a tree of
+ * criteria.
+ */
+public interface Predicate {
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/QueryExpression.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/QueryExpression.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/QueryExpression.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/QueryExpression.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+public abstract class QueryExpression extends BaseLanguageObject implements Command, InsertValueSource {
+
+ private OrderBy orderBy;
+ private Limit limit;
+
+ public abstract Select getProjectedQuery();
+
+ /**
+ * Get ORDER BY clause, may be null.
+ * @return An ORDER BY object
+ */
+ public OrderBy getOrderBy() {
+ return orderBy;
+ }
+
+ /**
+ * Get LIMIT clause, may be null.
+ * @return A LIMIT object
+ */
+ public Limit getLimit() {
+ return limit;
+ }
+
+ /**
+ * Get the derived column names. Note this only reports alias names.
+ * Any other names may not be consistent throughout the translation process.
+ * @return a String[] containing the column names
+ * @since 4.3
+ */
+ public String[] getColumnNames() {
+ List<DerivedColumn> selectSymbols = getProjectedQuery().getDerivedColumns();
+ String[] columnNames = new String[selectSymbols.size()];
+ int symbolIndex = 0;
+ for (DerivedColumn column : selectSymbols) {
+ columnNames[symbolIndex++] = column.getAlias();
+ }
+ return columnNames;
+ }
+
+ /**
+ * Get the column types of the output columns for this query
+ * @return a Class[] containing the column names
+ * @since 4.3
+ */
+ public Class<?>[] getColumnTypes() {
+ List<DerivedColumn> selectSymbols = getProjectedQuery().getDerivedColumns();
+ Class<?>[] columnTypes = new Class[selectSymbols.size()];
+ int symbolIndex = 0;
+ for (DerivedColumn column : selectSymbols) {
+ columnTypes[symbolIndex++] = column.getExpression().getType();
+ }
+ return columnTypes;
+ }
+
+ /**
+ * Set ORDER BY clause, may be null.
+ * @param orderBy An ORDER BY object
+ */
+ public void setOrderBy(OrderBy orderBy) {
+ this.orderBy = orderBy;
+ }
+
+ /**
+ * Set LIMIT clause, may be null.
+ * @param limit A LIMIT object
+ */
+ public void setLimit(Limit limit) {
+ this.limit = limit;
+ }
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SQLReservedWords.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SQLReservedWords.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SQLReservedWords.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SQLReservedWords.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,354 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.lang.reflect.Field;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * Reserved words for Teiid.
+ */
+public class SQLReservedWords {
+
+ public interface Tokens {
+ public static final String ALL_COLS = "*"; //$NON-NLS-1$
+ public static final String SPACE = " "; //$NON-NLS-1$
+ public static final String COMMA = ","; //$NON-NLS-1$
+ public static final String DOT = "."; //$NON-NLS-1$
+ public static final String QUOTE = "'"; //$NON-NLS-1$
+ public static final String EQ = "="; //$NON-NLS-1$
+ public static final String NE = "<>"; //$NON-NLS-1$
+ public static final String LT = "<"; //$NON-NLS-1$
+ public static final String GT = ">"; //$NON-NLS-1$
+ public static final String LE = "<="; //$NON-NLS-1$
+ public static final String GE = ">="; //$NON-NLS-1$
+ public static final String LPAREN = "("; //$NON-NLS-1$
+ public static final String RPAREN = ")"; //$NON-NLS-1$
+ }
+
+ //Teiid specific
+ public static final String BIGDECIMAL = "BIGDECIMAL"; //$NON-NLS-1$
+ public static final String BIGINTEGER = "BIGINTEGER"; //$NON-NLS-1$
+ public static final String BREAK = "BREAK"; //$NON-NLS-1$
+ public static final String BYTE = "BYTE"; //$NON-NLS-1$
+ public static final String CRITERIA = "CRITERIA"; //$NON-NLS-1$
+ public static final String ERROR = "ERROR"; //$NON-NLS-1$
+ public static final String FN = "FN"; //$NON-NLS-1$
+ public static final String LIMIT = "LIMIT"; //$NON-NLS-1$
+ public static final String LONG = "LONG"; //$NON-NLS-1$
+ public static final String LOOP = "LOOP"; //$NON-NLS-1$
+ public static final String MAKEDEP = "MAKEDEP"; //$NON-NLS-1$
+ public static final String MAKENOTDEP = "MAKENOTDEP"; //$NON-NLS-1$
+ public static final String NOCACHE = "NOCACHE"; //$NON-NLS-1$
+ public static final String OJ = "OJ"; //$NON-NLS-1$
+ public static final String SQL_TSI_FRAC_SECOND = "SQL_TSI_FRAC_SECOND"; //$NON-NLS-1$
+ public static final String SQL_TSI_SECOND = "SQL_TSI_SECOND"; //$NON-NLS-1$
+ public static final String SQL_TSI_MINUTE = "SQL_TSI_MINUTE"; //$NON-NLS-1$
+ public static final String SQL_TSI_HOUR = "SQL_TSI_HOUR"; //$NON-NLS-1$
+ public static final String SQL_TSI_DAY = "SQL_TSI_DAY"; //$NON-NLS-1$
+ public static final String SQL_TSI_WEEK = "SQL_TSI_WEEK"; //$NON-NLS-1$
+ public static final String SQL_TSI_MONTH = "SQL_TSI_MONTH"; //$NON-NLS-1$
+ public static final String SQL_TSI_QUARTER = "SQL_TSI_QUARTER"; //$NON-NLS-1$
+ public static final String SQL_TSI_YEAR = "SQL_TSI_YEAR"; //$NON-NLS-1$
+ public static final String STRING = "STRING"; //$NON-NLS-1$
+ public static final String TIMESTAMPADD = "TIMESTAMPADD"; //$NON-NLS-1$
+ public static final String TIMESTAMPDIFF = "TIMESTAMPDIFF"; //$NON-NLS-1$
+ public static final String VIRTUAL = "VIRTUAL"; //$NON-NLS-1$
+ public static final String WHILE = "WHILE"; //$NON-NLS-1$
+
+ //SQL2003 keywords
+ public static final String ADD = "ADD"; //$NON-NLS-1$
+ public static final String ANY = "ANY"; //$NON-NLS-1$
+ public static final String ALL = "ALL"; //$NON-NLS-1$
+ public static final String ALTER = "ALTER"; //$NON-NLS-1$
+ public static final String AND = "AND"; //$NON-NLS-1$
+ public static final String ARRAY = "ARRAY"; //$NON-NLS-1$s
+ public static final String AS = "AS"; //$NON-NLS-1$
+ public static final String ASC = "ASC"; //$NON-NLS-1$
+ public static final String ATOMIC = "ATOMIC"; //$NON-NLS-1$
+ public static final String AUTHORIZATION = "AUTHORIZATION"; //$NON-NLS-1$
+ public static final String AVG = "AVG"; //$NON-NLS-1$
+ public static final String BEGIN = "BEGIN"; //$NON-NLS-1$
+ public static final String BETWEEN = "BETWEEN"; //$NON-NLS-1$
+ public static final String BIGINT = "BIGINT"; //$NON-NLS-1$
+ public static final String BINARY = "BINARY"; //$NON-NLS-1$
+ public static final String BLOB = "BLOB"; //$NON-NLS-1$
+ public static final String BOTH = "BOTH"; //$NON-NLS-1$
+ public static final String BY = "BY"; //$NON-NLS-1$
+ public static final String CALL = "CALL"; //$NON-NLS-1$
+ public static final String CALLED = "CALLED"; //$NON-NLS-1$
+ public static final String CASE = "CASE"; //$NON-NLS-1$
+ public static final String CAST = "CAST"; //$NON-NLS-1$
+ public static final String CASCADED = "CASCADED"; //$NON-NLS-1$
+ public static final String CHAR = "CHAR"; //$NON-NLS-1$
+ public static final String CHARACTER = "CHARACTER"; //$NON-NLS-1$
+ public static final String CHECK = "CHECK"; //$NON-NLS-1$
+ public static final String CLOB = "CLOB"; //$NON-NLS-1$
+ public static final String CLOSE = "CLOSE"; //$NON-NLS-1$
+ public static final String COLLATE = "COLLATE"; //$NON-NLS-1$
+ public static final String COLUMN = "COLUMN"; //$NON-NLS-1$
+ public static final String COMMIT = "COMMIT"; //$NON-NLS-1$
+ public static final String CONNECT = "CONNECT"; //$NON-NLS-1$
+ public static final String CONVERT = "CONVERT"; //$NON-NLS-1$
+ public static final String CONSTRAINT = "CONSTRAINT"; //$NON-NLS-1$
+ public static final String CONTINUE = "CONTINUE"; //$NON-NLS-1$
+ public static final String COUNT = "COUNT"; //$NON-NLS-1$
+ public static final String CORRESPONDING = "CORRESPONDING"; //$NON-NLS-1$
+ public static final String CREATE = "CREATE"; //$NON-NLS-1$
+ public static final String CROSS = "CROSS"; //$NON-NLS-1$
+ public static final String CURRENT_DATE = "CURRENT_DATE"; //$NON-NLS-1$
+ public static final String CURRENT_TIME = "CURRENT_TIME"; //$NON-NLS-1$
+ public static final String CURRENT_TIMESTAMP = "CURRENT_TIMESTAMP"; //$NON-NLS-1$
+ public static final String CURRENT_USER = "CURRENT_USER"; //$NON-NLS-1$
+ public static final String CURSOR = "CURSOR"; //$NON-NLS-1$
+ public static final String DATE = "DATE"; //$NON-NLS-1$
+ public static final String DAY = "DAY"; //$NON-NLS-1$
+ public static final String DEALLOCATE = "DEALLOCATE"; //$NON-NLS-1$
+ public static final String DECIMAL = "DECIMAL"; //$NON-NLS-1$
+ public static final String DECLARE = "DECLARE"; //$NON-NLS-1$
+ public static final String DEFAULT = "DEFAULT"; //$NON-NLS-1$
+ public static final String DELETE = "DELETE"; //$NON-NLS-1$
+ public static final String DESC = "DESC"; //$NON-NLS-1$
+ public static final String DESCRIBE = "DESCRIBE"; //$NON-NLS-1$
+ public static final String DETERMINISTIC = "DETERMINISTIC"; //$NON-NLS-1$
+ public static final String DISCONNECT = "DISCONNECT"; //$NON-NLS-1$
+ public static final String DISTINCT = "DISTINCT"; //$NON-NLS-1$
+ public static final String DOUBLE = "DOUBLE"; //$NON-NLS-1$
+ public static final String DROP = "DROP"; //$NON-NLS-1$
+ public static final String EACH = "EACH"; //$NON-NLS-1$
+ public static final String ELSE = "ELSE"; //$NON-NLS-1$
+ public static final String END = "END"; //$NON-NLS-1$
+ public static final String ESCAPE = "ESCAPE"; //$NON-NLS-1$
+ public static final String EXCEPT = "EXCEPT"; //$NON-NLS-1$
+ public static final String EXEC = "EXEC"; //$NON-NLS-1$
+ public static final String EXECUTE = "EXECUTE"; //$NON-NLS-1$
+ public static final String EXISTS = "EXISTS"; //$NON-NLS-1$
+ public static final String EXTERNAL = "EXTERNAL"; //$NON-NLS-1$
+ public static final String FALSE = "FALSE"; //$NON-NLS-1$
+ public static final String FETCH = "FETCH"; //$NON-NLS-1$
+ public static final String FILTER = "FILTER"; //$NON-NLS-1$
+ public static final String FLOAT = "FLOAT"; //$NON-NLS-1$
+ public static final String FOR = "FOR"; //$NON-NLS-1$
+ public static final String FOREIGN = "FOREIGN"; //$NON-NLS-1$
+ public static final String FROM = "FROM"; //$NON-NLS-1$
+ public static final String FULL = "FULL"; //$NON-NLS-1$
+ public static final String FUNCTION = "FUNCTION"; //$NON-NLS-1$
+ public static final String GET = "GET"; //$NON-NLS-1$
+ public static final String GLOBAL = "GLOBAL"; //$NON-NLS-1$
+ public static final String GRANT = "GRANT"; //$NON-NLS-1$
+ public static final String GROUP = "GROUP"; //$NON-NLS-1$
+ public static final String GROUPING = "GROUPING"; //$NON-NLS-1$
+ public static final String HAS = "HAS"; //$NON-NLS-1$
+ public static final String HAVING = "HAVING"; //$NON-NLS-1$
+ public static final String HOLD = "HOLD"; //$NON-NLS-1$
+ public static final String HOUR = "HOUR"; //$NON-NLS-1$
+ public static final String IDENTITY = "IDENTITY"; //$NON-NLS-1$
+ public static final String INDICATOR = "INDICATOR"; //$NON-NLS-1$
+ public static final String IF = "IF"; //$NON-NLS-1$
+ public static final String IMMEDIATE = "IMMEDIATE"; //$NON-NLS-1$
+ public static final String IN = "IN"; //$NON-NLS-1$
+ public static final String INOUT = "INOUT"; //$NON-NLS-1$
+ public static final String INNER = "INNER"; //$NON-NLS-1$
+ public static final String INPUT = "INPUT"; //$NON-NLS-1$
+ public static final String INSENSITIVE = "INSENSITIVE"; //$NON-NLS-1$
+ public static final String INSERT = "INSERT"; //$NON-NLS-1$
+ public static final String INTEGER = "INTEGER"; //$NON-NLS-1$
+ public static final String INTERSECT = "INTERSECT"; //$NON-NLS-1$
+ public static final String INTERVAL = "INTERVAL"; //$NON-NLS-1$
+ public static final String INTO = "INTO"; //$NON-NLS-1$
+ public static final String IS = "IS"; //$NON-NLS-1$
+ public static final String ISOLATION = "ISOLATION"; //$NON-NLS-1$
+ public static final String JOIN = "JOIN"; //$NON-NLS-1$
+ public static final String LANGUAGE = "LANGUAGE"; //$NON-NLS-1$
+ public static final String LARGE = "LARGE"; //$NON-NLS-1$
+ public static final String LEADING = "LEADING"; //$NON-NLS-1$
+ public static final String LEFT = "LEFT"; //$NON-NLS-1$
+ public static final String LIKE = "LIKE"; //$NON-NLS-1$
+ public static final String LOCAL = "LOCAL"; //$NON-NLS-1$
+ public static final String MATCH = "MATCH"; //$NON-NLS-1$
+ public static final String MAX = "MAX"; //$NON-NLS-1$
+ public static final String MIN = "MIN"; //$NON-NLS-1$
+ public static final String MERGE = "MERGE"; //$NON-NLS-1$
+ public static final String METHOD = "METHOD"; //$NON-NLS-1$
+ public static final String MINUTE = "MINUTE"; //$NON-NLS-1$
+ public static final String MODIFIES = "MODIFIES"; //$NON-NLS-1$
+ public static final String MODULE = "MODULE"; //$NON-NLS-1$
+ public static final String MONTH = "MONTH"; //$NON-NLS-1$
+ public static final String NATURAL = "NATURAL"; //$NON-NLS-1$
+ public static final String NEW = "NEW"; //$NON-NLS-1$
+ public static final String NO = "NO"; //$NON-NLS-1$
+ public static final String NONE = "NONE"; //$NON-NLS-1$
+ public static final String NOT = "NOT"; //$NON-NLS-1$
+ public static final String NULL = "NULL"; //$NON-NLS-1$
+ public static final String OBJECT = "OBJECT"; //$NON-NLS-1$
+ public static final String OF = "OF"; //$NON-NLS-1$
+ public static final String OLD = "OLD"; //$NON-NLS-1$
+ public static final String ON = "ON"; //$NON-NLS-1$
+ public static final String ONLY = "ONLY"; //$NON-NLS-1$
+ public static final String OPEN = "OPEN"; //$NON-NLS-1$
+ public static final String OR = "OR"; //$NON-NLS-1$
+ public static final String ORDER = "ORDER"; //$NON-NLS-1$
+ public static final String OUT = "OUT"; //$NON-NLS-1$
+ public static final String OUTER = "OUTER"; //$NON-NLS-1$
+ public static final String OUTPUT = "OUTPUT"; //$NON-NLS-1$
+ public static final String OPTION = "OPTION"; //$NON-NLS-1$
+ public static final String OVER = "OVER"; //$NON-NLS-1$
+ public static final String OVERLAPS = "OVERLAPS"; //$NON-NLS-1$
+ public static final String PARAMETER = "PARAMETER"; //$NON-NLS-1$
+ public static final String PARTITION = "PARTITION"; //$NON-NLS-1$
+ public static final String PRECISION = "PRECISION"; //$NON-NLS-1$
+ public static final String PREPARE = "PREPARE"; //$NON-NLS-1$
+ public static final String PRIMARY = "PRIMARY"; //$NON-NLS-1$
+ public static final String PROCEDURE = "PROCEDURE"; //$NON-NLS-1$
+ public static final String RANGE = "RANGE"; //$NON-NLS-1$
+ public static final String READS = "READS"; //$NON-NLS-1$
+ public static final String REAL = "REAL"; //$NON-NLS-1$
+ public static final String RECURSIVE = "RECURSIVE"; //$NON-NLS-1$
+ public static final String REFERENCES = "REFERENCES"; //$NON-NLS-1$
+ public static final String REFERENCING = "REFERENCING"; //$NON-NLS-1$
+ public static final String RETURN = "RETURN"; //$NON-NLS-1$
+ public static final String RETURNS = "RETURNS"; //$NON-NLS-1$
+ public static final String REVOKE = "REVOKE"; //$NON-NLS-1$
+ public static final String RIGHT = "RIGHT"; //$NON-NLS-1$
+ public static final String ROLLBACK = "ROLLBACK"; //$NON-NLS-1$
+ public static final String ROLLUP = "ROLLUP"; //$NON-NLS-1$
+ public static final String ROW = "ROW"; //$NON-NLS-1$
+ public static final String ROWS = "ROWS"; //$NON-NLS-1$
+ public static final String SAVEPOINT = "ROWS"; //$NON-NLS-1$
+ public static final String SCROLL = "ROWS"; //$NON-NLS-1$
+ public static final String SEARCH = "ROWS"; //$NON-NLS-1$
+ public static final String SECOND = "ROWS"; //$NON-NLS-1$
+ public static final String SELECT = "SELECT"; //$NON-NLS-1$
+ public static final String SENSITIVE = "ROWS"; //$NON-NLS-1$
+ public static final String SESSION_USER = "SESSION_USER"; //$NON-NLS-1$
+ public static final String SET = "SET"; //$NON-NLS-1$
+ public static final String SHORT = "SHORT"; //$NON-NLS-1$
+ public static final String SIILAR = "ROWS"; //$NON-NLS-1$
+ public static final String SMALLINT = "ROWS"; //$NON-NLS-1$
+ public static final String SOME = "SOME"; //$NON-NLS-1$
+ public static final String SPECIFIC = "ROWS"; //$NON-NLS-1$
+ public static final String SQL = "ROWS"; //$NON-NLS-1$
+ public static final String SQLEXCEPTION = "SQLEXCEPTION"; //$NON-NLS-1$
+ public static final String SQLSTATE = "SQLSTATE"; //$NON-NLS-1$
+ public static final String SQLWARNING = "SQLWARNING"; //$NON-NLS-1$
+ public static final String START = "START"; //$NON-NLS-1$
+ public static final String STATIC = "STATIC"; //$NON-NLS-1$
+ public static final String SYSTEM = "SYSTEM"; //$NON-NLS-1$
+ public static final String SYSTEM_USER = "SYSTEM_USER"; //$NON-NLS-1$
+ public static final String SUM = "SUM"; //$NON-NLS-1$
+ public static final String TABLE = "TABLE"; //$NON-NLS-1$
+ public static final String TEMPORARY = "TEMPORARY"; //$NON-NLS-1$
+ public static final String THEN = "THEN"; //$NON-NLS-1$
+ public static final String TIME = "TIME"; //$NON-NLS-1$
+ public static final String TIMESTAMP = "TIMESTAMP"; //$NON-NLS-1$
+ public static final String TIMEZONE_HOUR = "TIMEZONE_HOUR"; //$NON-NLS-1$
+ public static final String TIMEZONE_MINUTE = "TIMEZONE_MINUTE"; //$NON-NLS-1$
+ public static final String TO = "TO"; //$NON-NLS-1$
+ public static final String TRAILING = "TRAILING"; //$NON-NLS-1$
+ public static final String TRANSLATE = "TRANSLATE"; //$NON-NLS-1$
+ public static final String TRIGGER = "TRIGGER"; //$NON-NLS-1$
+ public static final String TRUE = "TRUE"; //$NON-NLS-1$
+ public static final String UNION = "UNION"; //$NON-NLS-1$
+ public static final String UNIQUE = "UNIQUE"; //$NON-NLS-1$
+ public static final String UNKNOWN = "UNKNOWN"; //$NON-NLS-1$
+ public static final String UPDATE = "UPDATE"; //$NON-NLS-1$
+ public static final String USER = "USER"; //$NON-NLS-1$
+ public static final String USING = "USING"; //$NON-NLS-1$
+ public static final String VALUE = "VALUE"; //$NON-NLS-1$
+ public static final String VALUES = "VALUES"; //$NON-NLS-1$
+ public static final String VARCHAR = "VARCHAR"; //$NON-NLS-1$
+ public static final String WHEN = "WHEN"; //$NON-NLS-1$
+ public static final String WHENEVER = "WHENEVER"; //$NON-NLS-1$
+ public static final String WHERE = "WHERE"; //$NON-NLS-1$
+ public static final String WINDOW = "WINDOW"; //$NON-NLS-1$
+ public static final String WITH = "WITH"; //$NON-NLS-1$
+ public static final String WITHIN = "WITHIN"; //$NON-NLS-1$
+ public static final String WITHOUT = "WITHOUT"; //$NON-NLS-1$
+ public static final String YEAR = "YEAR"; //$NON-NLS-1$
+
+ //SQL/XML
+
+ public static final String XML = "XML"; //$NON-NLS-1$
+ public static final String XMLAGG = "XMLAGG"; //$NON-NLS-1$
+ public static final String XMLATTRIBUTES = "XMLATTRIBUTES"; //$NON-NLS-1$
+ public static final String XMLBINARY = "XMLBINARY"; //$NON-NLS-1$
+ public static final String XMLCONCAT = "XMLCONCAT"; //$NON-NLS-1$
+ public static final String XMLCOMMENT = "XMLCOMMENT"; //$NON-NLS-1$
+ public static final String XMLELEMENT = "XMLELEMENT"; //$NON-NLS-1$
+ public static final String XMLFOREST = "XMLFOREST"; //$NON-NLS-1$
+ public static final String XMLNAMESPACES = "XMLNAMESPACES"; //$NON-NLS-1$
+ public static final String XMLPARSE = "XMLPARSE"; //$NON-NLS-1$
+ public static final String XMLPI = "XMLPI"; //$NON-NLS-1$
+ public static final String XMLROOT = "XMLROOT"; //$NON-NLS-1$
+ public static final String XMLSERIALIZE = "XMLSERIALIZE"; //$NON-NLS-1$
+
+ //SQL/MED
+
+ public static final String DATALINK = "DATALINK"; //$NON-NLS-1$
+ public static final String DLNEWCOPY = "DLNEWCOPY"; //$NON-NLS-1$
+ public static final String DLPREVIOUSCOPY = "DLPREVIOUSCOPY"; //$NON-NLS-1$
+ public static final String DLURLCOMPLETE = "DLURLCOMPLETE"; //$NON-NLS-1$
+ public static final String DLURLCOMPLETEWRITE = "DLURELCOMPLETEWRITE"; //$NON-NLS-1$
+ public static final String DLURLCOMPLETEONLY = "DLURLCOMPLETEONLY"; //$NON-NLS-1$
+ public static final String DLURLPATH = "DLURLPATH"; //$NON-NLS-1$
+ public static final String DLURLPATHWRITE = "DLURLPATHWRITE"; //$NON-NLS-1$
+ public static final String DLURLPATHONLY = "DLURLPATHONLY"; //$NON-NLS-1$
+ public static final String DLURLSCHEME = "DLURLSCHEME"; //$NON-NLS-1$
+ public static final String DLURLSERVER = "DLURLSEVER"; //$NON-NLS-1$
+ public static final String DLVALUE = "DLVALUE"; //$NON-NLS-1$
+ public static final String IMPORT = "XMLPI"; //$NON-NLS-1$
+
+ /**
+ * Set of CAPITALIZED reserved words for checking whether a string is a reserved word.
+ */
+ private static final Set<String> RESERVED_WORDS = new HashSet<String>();
+
+ // Initialize RESERVED_WORDS set - This is a poor man's enum. To much legacy code expects the constants to be Strings.
+ static {
+ Field[] fields = SQLReservedWords.class.getDeclaredFields();
+ for (Field field : fields) {
+ if (field.getType() == String.class) {
+ try {
+ RESERVED_WORDS.add((String)field.get(null));
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+ /** Can't construct */
+ private SQLReservedWords() {}
+
+ /**
+ * Check whether a string is a reserved word.
+ * @param str String to check
+ * @return True if reserved word, false if not or null
+ */
+ public static final boolean isReservedWord(String str) {
+ if(str == null) {
+ return false;
+ }
+ return RESERVED_WORDS.contains(str.toUpperCase());
+ }
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/ScalarSubquery.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/ScalarSubquery.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/ScalarSubquery.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/ScalarSubquery.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a scalar subquery. That is, a query that is evaluated as a scalar
+ * expression and returns a single value. The inner subquery must return exactly
+ * 1 column as well.
+ */
+public class ScalarSubquery extends BaseLanguageObject implements Expression, SubqueryContainer {
+
+ private QueryExpression query;
+
+ public ScalarSubquery(QueryExpression query) {
+ this.query = query;
+ }
+
+ @Override
+ public QueryExpression getSubquery() {
+ return this.query;
+ }
+
+ @Override
+ public void setSubquery(QueryExpression query) {
+ this.query = query;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ @Override
+ public Class<?> getType() {
+ return query.getProjectedQuery().getDerivedColumns().get(0).getExpression().getType();
+ }
+
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SearchedCase.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SearchedCase.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SearchedCase.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SearchedCase.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a searched CASE expression:
+ * <br/> CASE WHEN criteria THEN expression ... END
+ */
+public class SearchedCase extends BaseLanguageObject implements Expression {
+
+ private List<SearchedWhenClause> cases;
+ private Expression elseExpression;
+ private Class<?> type;
+
+ public SearchedCase(List<SearchedWhenClause> cases, Expression elseExpression, Class<?> type) {
+ this.cases = cases;
+ this.elseExpression = elseExpression;
+ this.type = type;
+ }
+
+ public Expression getElseExpression() {
+ return elseExpression;
+ }
+
+ public List<SearchedWhenClause> getCases() {
+ return cases;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setElseExpression(Expression expression) {
+ this.elseExpression = expression;
+ }
+
+ public Class<?> getType() {
+ return this.type;
+ }
+
+ public void setType(Class<?> type) {
+ this.type = type;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SearchedWhenClause.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SearchedWhenClause.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SearchedWhenClause.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SearchedWhenClause.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class SearchedWhenClause extends BaseLanguageObject {
+
+ private Condition condition;
+ private Expression result;
+
+ public SearchedWhenClause(Condition condition, Expression result) {
+ this.condition = condition;
+ this.result = result;
+ }
+
+ public Condition getCondition() {
+ return condition;
+ }
+
+ public Expression getResult() {
+ return result;
+ }
+
+ public void setCondition(Condition symbol) {
+ this.condition = symbol;
+ }
+
+ public void setResult(Expression value) {
+ this.result = value;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/language/SearchedWhenClause.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/connector-api/src/main/java/org/teiid/language/Select.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Select.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Select.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Select.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,139 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a simple SELECT query.
+ */
+public class Select extends QueryExpression {
+
+ private List<DerivedColumn> derivedColumns;
+ private boolean isDistinct;
+ private List<TableReference> from;
+ private Condition where;
+ private GroupBy groupBy;
+ private Condition having;
+
+ public Select(List<DerivedColumn> derivedColumns, boolean distinct, List<TableReference> from, Condition where,
+ GroupBy groupBy, Condition having, OrderBy orderBy) {
+ this.derivedColumns = derivedColumns;
+ this.isDistinct = distinct;
+ this.from = from;
+ this.where = where;
+ this.groupBy = groupBy;
+ this.having = having;
+ this.setOrderBy(orderBy);
+ }
+
+ public List<DerivedColumn> getDerivedColumns() {
+ return derivedColumns;
+ }
+
+ public boolean isDistinct() {
+ return this.isDistinct;
+ }
+
+ public void setDerivedColumns(List<DerivedColumn> symbols) {
+ this.derivedColumns = symbols;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.isDistinct = distinct;
+ }
+
+ /**
+ * Get FROM clause, should never be null.
+ * @return From clause object
+ */
+ public List<TableReference> getFrom() {
+ return from;
+ }
+
+ /**
+ * Get WHERE clause, may be null.
+ * @return A criteria object
+ */
+ public Condition getWhere() {
+ return where;
+ }
+
+ /**
+ * Get GROUP BY clause, may be null.
+ * @return A group by object
+ */
+ public GroupBy getGroupBy() {
+ return groupBy;
+ }
+
+ /**
+ * Get HAVING clause, may be null.
+ * @return A criteria object
+ */
+ public Condition getHaving() {
+ return having;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ /**
+ * Set FROM clause, should never be null.
+ * @param from From clause object
+ */
+ public void setFrom(List<TableReference> from) {
+ this.from = from;
+ }
+
+ /**
+ * Set WHERE clause, may be null.
+ * @param criteria A criteria object
+ */
+ public void setWhere(Condition criteria) {
+ this.where = criteria;
+ }
+
+ /**
+ * Set GROUP BY clause, may be null.
+ * @param groupBy A group by object
+ */
+ public void setGroupBy(GroupBy groupBy) {
+ this.groupBy = groupBy;
+ }
+
+ /**
+ * Set HAVING clause, may be null.
+ * @param criteria A criteria object
+ */
+ public void setHaving(Condition criteria) {
+ this.having = criteria;
+ }
+
+ public Select getProjectedQuery() {
+ return this;
+ }
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SetClause.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SetClause.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SetClause.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SetClause.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class SetClause extends BaseLanguageObject {
+
+ private ColumnReference symbol;
+ private Expression value;
+
+ public SetClause(ColumnReference symbol, Expression value) {
+ this.symbol = symbol;
+ this.value = value;
+ }
+
+ public ColumnReference getSymbol() {
+ return symbol;
+ }
+
+ public Expression getValue() {
+ return value;
+ }
+
+ public void setSymbol(ColumnReference symbol) {
+ this.symbol = symbol;
+ }
+
+ public void setValue(Expression value) {
+ this.value = value;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/language/SetClause.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/connector-api/src/main/java/org/teiid/language/SetQuery.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SetQuery.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SetQuery.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SetQuery.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class SetQuery extends QueryExpression {
+
+ public enum Operation {
+ /** Represents UNION of two queries */
+ UNION,
+ /** Represents intersection of two queries */
+ INTERSECT,
+ /** Represents set difference of two queries */
+ EXCEPT
+ }
+
+ private boolean all;
+ private QueryExpression leftQuery;
+ private QueryExpression rightQuery;
+ private Operation operation;
+
+ /**
+ * @see org.teiid.language.QueryExpression#getProjectedQuery()
+ */
+ public Select getProjectedQuery() {
+ if (leftQuery instanceof Select) {
+ return (Select)leftQuery;
+ }
+ return leftQuery.getProjectedQuery();
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#getLeftQuery()
+ */
+ public QueryExpression getLeftQuery() {
+ return leftQuery;
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#getOperation()
+ */
+ public Operation getOperation() {
+ return operation;
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#getRightQuery()
+ */
+ public QueryExpression getRightQuery() {
+ return rightQuery;
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#isAll()
+ */
+ public boolean isAll() {
+ return all;
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#setAll(boolean)
+ */
+ public void setAll(boolean all) {
+ this.all = all;
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#setLeftQuery(org.teiid.language.QueryExpression)
+ */
+ public void setLeftQuery(QueryExpression leftQuery) {
+ this.leftQuery = leftQuery;
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#setOperation(org.teiid.language.SetQuery.Operation)
+ */
+ public void setOperation(Operation operation) {
+ this.operation = operation;
+ }
+
+ /**
+ * @see org.teiid.language.SetQuery#setRightQuery(org.teiid.language.QueryExpression)
+ */
+ public void setRightQuery(QueryExpression rightQuery) {
+ this.rightQuery = rightQuery;
+ }
+
+ /**
+ * @see org.teiid.language.LanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ */
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SortSpecification.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SortSpecification.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SortSpecification.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SortSpecification.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+public class SortSpecification extends BaseLanguageObject {
+
+ public enum Ordering {
+ ASC,
+ DESC
+ }
+
+ private Ordering ordering;
+ private Expression expression;
+
+ public SortSpecification(Ordering direction, Expression expression) {
+ this.ordering = direction;
+ this.expression = expression;
+ }
+
+ public Ordering getOrdering() {
+ return ordering;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setOrdering(Ordering direction) {
+ this.ordering = direction;
+ }
+
+ public Expression getExpression() {
+ return this.expression;
+ }
+
+ public void setExpression(Expression expression) {
+ this.expression = expression;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SubqueryComparison.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SubqueryComparison.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SubqueryComparison.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SubqueryComparison.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.Comparison.Operator;
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents a quantified comparison criteria. This criteria has an expression on the left,
+ * a comparison operator (such as =, <, etc), a quantification operator (ALL, ANY),
+ * and a subquery.
+ */
+public class SubqueryComparison extends Condition implements Predicate, SubqueryContainer {
+
+ public enum Quantifier {
+ SOME,
+ ALL
+ }
+
+ private Expression leftExpr;
+ private Operator operator;
+ private Quantifier quantifier;
+ private QueryExpression query;
+
+ /**
+ *
+ */
+ public SubqueryComparison(Expression leftExpr, Operator operator, Quantifier quantifier, QueryExpression query) {
+ this.leftExpr = leftExpr;
+ this.operator = operator;
+ this.quantifier = quantifier;
+ this.query = query;
+ }
+
+ public Expression getLeftExpression() {
+ return this.leftExpr;
+ }
+
+ public Operator getOperator() {
+ return this.operator;
+ }
+
+ public Quantifier getQuantifier() {
+ return this.quantifier;
+ }
+
+ public QueryExpression getSubquery() {
+ return this.query;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setLeftExpression(Expression expression) {
+ this.leftExpr = expression;
+ }
+
+ public void setOperator(Operator operator) {
+ this.operator = operator;
+ }
+
+ public void setQuantifier(Quantifier quantifier) {
+ this.quantifier = quantifier;
+ }
+
+ public void setSubquery(QueryExpression query) {
+ this.query = query;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SubqueryContainer.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SubqueryContainer.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SubqueryContainer.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SubqueryContainer.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+/**
+ * This is a marker interface for language interfaces that contain a subquery.
+ */
+public interface SubqueryContainer {
+
+ /**
+ * Get the inner subquery
+ * @return Subquery
+ */
+ QueryExpression getSubquery();
+
+ /**
+ * Set the inner subquery
+ * @param query Subquery
+ */
+ void setSubquery(QueryExpression query);
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/SubqueryIn.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/SubqueryIn.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/SubqueryIn.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/SubqueryIn.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents an IN criteria that uses a subquery on the right side rather than a
+ * list of values.
+ */
+public class SubqueryIn extends BaseInCondition implements SubqueryContainer {
+
+ private QueryExpression rightQuery;
+
+ public SubqueryIn(Expression leftExpr, boolean isNegated, QueryExpression rightQuery) {
+ super(leftExpr, isNegated);
+ this.rightQuery = rightQuery;
+ }
+
+ public QueryExpression getSubquery() {
+ return this.rightQuery;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setSubquery(QueryExpression query) {
+ this.rightQuery = query;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/TableReference.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/TableReference.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/TableReference.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/TableReference.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+/**
+ * Represents an item in the FROM clause
+ */
+public interface TableReference extends LanguageObject {
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/Update.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/language/Update.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/Update.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/Update.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language;
+
+import java.util.List;
+
+import org.teiid.language.visitor.LanguageObjectVisitor;
+
+/**
+ * Represents an UPDATE command in the language objects.
+ */
+public class Update extends BaseLanguageObject implements Command {
+
+ private NamedTable table;
+ private List<SetClause> changes;
+ private Condition where;
+
+ public Update(NamedTable group, List<SetClause> changes, Condition criteria) {
+ this.table = group;
+ this.changes = changes;
+ this.where = criteria;
+ }
+
+ public NamedTable getTable() {
+ return table;
+ }
+
+ public List<SetClause> getChanges() {
+ return changes;
+ }
+
+ public Condition getWhere() {
+ return where;
+ }
+
+ public void acceptVisitor(LanguageObjectVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void setTable(NamedTable group) {
+ this.table = group;
+ }
+
+ public void setChanges(List<SetClause> changes) {
+ this.changes = changes;
+ }
+
+ public void setWhere(Condition criteria) {
+ this.where = criteria;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/language/visitor (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework)
Modified: trunk/connector-api/src/main/java/org/teiid/language/visitor/AbstractLanguageVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/AbstractLanguageVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/language/visitor/AbstractLanguageVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,45 +20,45 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.visitor.framework;
+package org.teiid.language.visitor;
import java.util.Collection;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.AndOr;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.DerivedTable;
-import org.teiid.connector.language.Exists;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.GroupBy;
-import org.teiid.connector.language.In;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.IsNull;
-import org.teiid.connector.language.Join;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.Like;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Not;
-import org.teiid.connector.language.OrderBy;
-import org.teiid.connector.language.ScalarSubquery;
-import org.teiid.connector.language.SearchedCase;
-import org.teiid.connector.language.SearchedWhenClause;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.SetClause;
-import org.teiid.connector.language.SetQuery;
-import org.teiid.connector.language.SortSpecification;
-import org.teiid.connector.language.SubqueryComparison;
-import org.teiid.connector.language.SubqueryIn;
-import org.teiid.connector.language.Update;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.AndOr;
+import org.teiid.language.Argument;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Call;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Comparison;
+import org.teiid.language.Delete;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.DerivedTable;
+import org.teiid.language.Exists;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Function;
+import org.teiid.language.GroupBy;
+import org.teiid.language.In;
+import org.teiid.language.Insert;
+import org.teiid.language.IsNull;
+import org.teiid.language.Join;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Like;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Not;
+import org.teiid.language.OrderBy;
+import org.teiid.language.ScalarSubquery;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.SearchedWhenClause;
+import org.teiid.language.Select;
+import org.teiid.language.SetClause;
+import org.teiid.language.SetQuery;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.SubqueryComparison;
+import org.teiid.language.SubqueryIn;
+import org.teiid.language.Update;
/**
Copied: trunk/connector-api/src/main/java/org/teiid/language/visitor/CollectorVisitor.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/CollectorVisitor.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/visitor/CollectorVisitor.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/visitor/CollectorVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,284 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language.visitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.AndOr;
+import org.teiid.language.Argument;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Call;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Comparison;
+import org.teiid.language.Delete;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.DerivedTable;
+import org.teiid.language.Exists;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Function;
+import org.teiid.language.GroupBy;
+import org.teiid.language.In;
+import org.teiid.language.Insert;
+import org.teiid.language.IsNull;
+import org.teiid.language.Join;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Like;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Not;
+import org.teiid.language.OrderBy;
+import org.teiid.language.ScalarSubquery;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.SearchedWhenClause;
+import org.teiid.language.Select;
+import org.teiid.language.SetClause;
+import org.teiid.language.SetQuery;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.SubqueryComparison;
+import org.teiid.language.SubqueryIn;
+import org.teiid.language.Update;
+
+
+/**
+ * This visitor can be used to collect all objects of a certain type in a language
+ * tree. Each visit method does an instanceof method to check whether the object
+ * is of the expected type.
+ */
+public class CollectorVisitor<T> implements LanguageObjectVisitor {
+
+ private Class<T> type;
+ private Collection<T> objects = new ArrayList<T>();
+
+ public CollectorVisitor(Class<T> type) {
+ this.type = type;
+ }
+
+ @SuppressWarnings("unchecked")
+ private void checkInstance(LanguageObject obj) {
+ if(type.isInstance(obj)) {
+ this.objects.add((T)obj);
+ }
+ }
+
+ public Collection<T> getCollectedObjects() {
+ return this.objects;
+ }
+
+ public void visit(AggregateFunction obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(BatchedUpdates obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Comparison obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(AndOr obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Delete obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(ColumnReference obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Exists obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Function obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(NamedTable obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(GroupBy obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(In obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(DerivedTable obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Insert obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(ExpressionValueSource obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(IsNull obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Join obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Like obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Limit obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Literal obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Not obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(OrderBy obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(SortSpecification obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Argument obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Call obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Select obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(ScalarSubquery obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(SearchedCase obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(DerivedColumn obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(SubqueryComparison obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(SubqueryIn obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(Update obj) {
+ checkInstance(obj);
+ }
+
+ public void visit(SetQuery obj) {
+ checkInstance(obj);
+ }
+
+ @Override
+ public void visit(SetClause obj) {
+ checkInstance(obj);
+ }
+
+ @Override
+ public void visit(SearchedWhenClause obj) {
+ checkInstance(obj);
+ }
+
+ /**
+ * This is a utility method to instantiate and run the visitor in conjunction
+ * with a HierarchyVisitor to collect all objects of the specified type
+ * of the specified tree in the language object tree.
+ * @param type Language object type to look for
+ * @param object Root of the language object tree
+ * @return Collection of ILanguageObject of the specified type
+ */
+ public static <T> Collection<T> collectObjects(Class<T> type, LanguageObject object) {
+ CollectorVisitor<T> visitor = new CollectorVisitor<T>(type);
+ DelegatingHierarchyVisitor hierarchyVisitor = new DelegatingHierarchyVisitor(visitor, null);
+ object.acceptVisitor(hierarchyVisitor);
+ return visitor.getCollectedObjects();
+ }
+
+ /**
+ * This is a utility method for a common use of this visitor, which is to collect
+ * all elements in an object tree.
+ * @param type Language object type to look for
+ * @param object Root of the language object tree
+ * @return Collection of IElement of the specified type
+ */
+ public static Collection<ColumnReference> collectElements(LanguageObject object) {
+ return CollectorVisitor.collectObjects(ColumnReference.class, object);
+ }
+
+ /**
+ * This is a utility method for a common use of this visitor, which is to collect
+ * all groups in an object tree.
+ * @param type Language object type to look for
+ * @param object Root of the language object tree
+ * @return Collection of IGroup of the specified type
+ */
+ public static Collection<NamedTable> collectGroups(LanguageObject object) {
+ return CollectorVisitor.collectObjects(NamedTable.class, object);
+ }
+
+ /**
+ * This is a utility method for a common use of this visitor, which is to collect
+ * all groups used by all elements in an object tree.
+ * @param type Language object type to look for
+ * @param object Root of the language object tree
+ * @return Set of IGroup
+ */
+ public static Set<NamedTable> collectGroupsUsedByElements(LanguageObject object) {
+ Set<NamedTable> groups = new HashSet<NamedTable>();
+ for (ColumnReference element : CollectorVisitor.collectElements(object)) {
+ if(element.getTable() != null) {
+ groups.add(element.getTable());
+ }
+ }
+ return groups;
+ }
+
+}
Modified: trunk/connector-api/src/main/java/org/teiid/language/visitor/DelegatingHierarchyVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/DelegatingHierarchyVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/language/visitor/DelegatingHierarchyVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,43 +20,43 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.visitor.framework;
+package org.teiid.language.visitor;
import org.teiid.connector.DataPlugin;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.AndOr;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.DerivedTable;
-import org.teiid.connector.language.Exists;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.GroupBy;
-import org.teiid.connector.language.In;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.IsNull;
-import org.teiid.connector.language.Join;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.Like;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Not;
-import org.teiid.connector.language.OrderBy;
-import org.teiid.connector.language.ScalarSubquery;
-import org.teiid.connector.language.SearchedCase;
-import org.teiid.connector.language.SearchedWhenClause;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.SetClause;
-import org.teiid.connector.language.SetQuery;
-import org.teiid.connector.language.SortSpecification;
-import org.teiid.connector.language.SubqueryComparison;
-import org.teiid.connector.language.SubqueryIn;
-import org.teiid.connector.language.Update;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.AndOr;
+import org.teiid.language.Argument;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Call;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Comparison;
+import org.teiid.language.Delete;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.DerivedTable;
+import org.teiid.language.Exists;
+import org.teiid.language.Function;
+import org.teiid.language.GroupBy;
+import org.teiid.language.In;
+import org.teiid.language.Insert;
+import org.teiid.language.IsNull;
+import org.teiid.language.Join;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Like;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Not;
+import org.teiid.language.OrderBy;
+import org.teiid.language.ScalarSubquery;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.SearchedWhenClause;
+import org.teiid.language.Select;
+import org.teiid.language.SetClause;
+import org.teiid.language.SetQuery;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.SubqueryComparison;
+import org.teiid.language.SubqueryIn;
+import org.teiid.language.Update;
/**
* Delegates pre- and post-processing for each node in the hierarchy to
Modified: trunk/connector-api/src/main/java/org/teiid/language/visitor/HierarchyVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/language/visitor/HierarchyVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,37 +20,37 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.visitor.framework;
+package org.teiid.language.visitor;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.AndOr;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.DerivedTable;
-import org.teiid.connector.language.Exists;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.GroupBy;
-import org.teiid.connector.language.In;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.IsNull;
-import org.teiid.connector.language.Join;
-import org.teiid.connector.language.Like;
-import org.teiid.connector.language.Not;
-import org.teiid.connector.language.OrderBy;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.ScalarSubquery;
-import org.teiid.connector.language.SearchedCase;
-import org.teiid.connector.language.SearchedWhenClause;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.SetClause;
-import org.teiid.connector.language.SetQuery;
-import org.teiid.connector.language.SubqueryComparison;
-import org.teiid.connector.language.SubqueryIn;
-import org.teiid.connector.language.Update;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.AndOr;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Call;
+import org.teiid.language.Comparison;
+import org.teiid.language.Delete;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.DerivedTable;
+import org.teiid.language.Exists;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Function;
+import org.teiid.language.GroupBy;
+import org.teiid.language.In;
+import org.teiid.language.Insert;
+import org.teiid.language.IsNull;
+import org.teiid.language.Join;
+import org.teiid.language.Like;
+import org.teiid.language.Not;
+import org.teiid.language.OrderBy;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.ScalarSubquery;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.SearchedWhenClause;
+import org.teiid.language.Select;
+import org.teiid.language.SetClause;
+import org.teiid.language.SetQuery;
+import org.teiid.language.SubqueryComparison;
+import org.teiid.language.SubqueryIn;
+import org.teiid.language.Update;
/**
* Visits each node in a hierarchy of ILanguageObjects. The default
Modified: trunk/connector-api/src/main/java/org/teiid/language/visitor/LanguageObjectVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/LanguageObjectVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/language/visitor/LanguageObjectVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.visitor.framework;
+package org.teiid.language.visitor;
-import org.teiid.connector.language.*;
+import org.teiid.language.*;
/**
*/
Copied: trunk/connector-api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,903 @@
+/*
+ * 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.
+ */
+
+package org.teiid.language.visitor;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.util.StringUtil;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.AndOr;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Command;
+import org.teiid.language.Comparison;
+import org.teiid.language.Condition;
+import org.teiid.language.Delete;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.DerivedTable;
+import org.teiid.language.Exists;
+import org.teiid.language.Expression;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Function;
+import org.teiid.language.GroupBy;
+import org.teiid.language.In;
+import org.teiid.language.Insert;
+import org.teiid.language.IsNull;
+import org.teiid.language.Join;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Like;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Not;
+import org.teiid.language.OrderBy;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.SQLReservedWords;
+import org.teiid.language.ScalarSubquery;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.SearchedWhenClause;
+import org.teiid.language.Select;
+import org.teiid.language.SetClause;
+import org.teiid.language.SetQuery;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.SubqueryComparison;
+import org.teiid.language.SubqueryIn;
+import org.teiid.language.TableReference;
+import org.teiid.language.Update;
+import org.teiid.language.Argument.Direction;
+import org.teiid.language.SQLReservedWords.Tokens;
+import org.teiid.language.SortSpecification.Ordering;
+import org.teiid.metadata.AbstractMetadataRecord;
+
+
+/**
+ * Creates a SQL string for a LanguageObject subtree. Instances of this class
+ * are not reusable, and are not thread-safe.
+ */
+public class SQLStringVisitor extends AbstractLanguageVisitor {
+
+ private Set<String> infixFunctions = new HashSet<String>(Arrays.asList("%", "+", "-", "*", "+", "/", "||", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+ "&", "|", "^", "#")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+ protected static final String UNDEFINED = "<undefined>"; //$NON-NLS-1$
+ protected static final String UNDEFINED_PARAM = "?"; //$NON-NLS-1$
+
+ protected StringBuilder buffer = new StringBuilder();
+
+ /**
+ * Gets the name of a group or element from the RuntimeMetadata
+ * @param id the id of the group or element
+ * @return the name of that element or group as defined in the source
+ */
+ protected String getName(AbstractMetadataRecord object) {
+ String nameInSource = object.getNameInSource();
+ if(nameInSource != null && nameInSource.length() > 0) {
+ return nameInSource;
+ }
+ return object.getName();
+ }
+
+ /**
+ * Appends the string form of the ILanguageObject to the current buffer.
+ * @param obj the language object instance
+ */
+ public void append(LanguageObject obj) {
+ if (obj == null) {
+ buffer.append(UNDEFINED);
+ } else {
+ visitNode(obj);
+ }
+ }
+
+ /**
+ * Simple utility to append a list of language objects to the current buffer
+ * by creating a comma-separated list.
+ * @param items a list of ILanguageObjects
+ */
+ protected void append(List<? extends LanguageObject> items) {
+ if (items != null && items.size() != 0) {
+ append(items.get(0));
+ for (int i = 1; i < items.size(); i++) {
+ buffer.append(Tokens.COMMA)
+ .append(Tokens.SPACE);
+ append(items.get(i));
+ }
+ }
+ }
+
+ /**
+ * Simple utility to append an array of language objects to the current buffer
+ * by creating a comma-separated list.
+ * @param items an array of ILanguageObjects
+ */
+ protected void append(LanguageObject[] items) {
+ if (items != null && items.length != 0) {
+ append(items[0]);
+ for (int i = 1; i < items.length; i++) {
+ buffer.append(Tokens.COMMA)
+ .append(Tokens.SPACE);
+ append(items[i]);
+ }
+ }
+ }
+
+ /**
+ * Creates a SQL-safe string. Simply replaces all occurrences of ' with ''
+ * @param str the input string
+ * @return a SQL-safe string
+ */
+ protected String escapeString(String str, String quote) {
+ return StringUtil.replaceAll(str, quote, quote + quote);
+ }
+
+ public String toString() {
+ return buffer.toString();
+ }
+
+ public void visit(AggregateFunction obj) {
+ buffer.append(obj.getName())
+ .append(Tokens.LPAREN);
+
+ if ( obj.isDistinct()) {
+ buffer.append(SQLReservedWords.DISTINCT)
+ .append(Tokens.SPACE);
+ }
+
+ if (obj.getExpression() == null) {
+ buffer.append(Tokens.ALL_COLS);
+ } else {
+ append(obj.getExpression());
+ }
+ buffer.append(Tokens.RPAREN);
+ }
+
+ public void visit(Comparison obj) {
+ append(obj.getLeftExpression());
+ buffer.append(Tokens.SPACE);
+ buffer.append(obj.getOperator());
+ buffer.append(Tokens.SPACE);
+ append(obj.getRightExpression());
+ }
+
+ public void visit(AndOr obj) {
+ String opString = obj.getOperator().toString();
+
+ appendNestedCondition(obj, obj.getLeftCondition());
+ buffer.append(Tokens.SPACE)
+ .append(opString)
+ .append(Tokens.SPACE);
+ appendNestedCondition(obj, obj.getRightCondition());
+ }
+
+ protected void appendNestedCondition(AndOr parent, Condition condition) {
+ if (condition instanceof AndOr) {
+ AndOr nested = (AndOr)condition;
+ if (nested.getOperator() != parent.getOperator()) {
+ buffer.append(Tokens.LPAREN);
+ append(condition);
+ buffer.append(Tokens.RPAREN);
+ return;
+ }
+ }
+ append(condition);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.Delete)
+ */
+ public void visit(Delete obj) {
+ buffer.append(SQLReservedWords.DELETE)
+ .append(Tokens.SPACE);
+ buffer.append(getSourceComment(obj));
+ buffer.append(SQLReservedWords.FROM)
+ .append(Tokens.SPACE);
+ append(obj.getTable());
+ if (obj.getWhere() != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.WHERE)
+ .append(Tokens.SPACE);
+ append(obj.getWhere());
+ }
+ }
+
+ /**
+ * Take the specified derived group and element short names and determine a
+ * replacement element name to use instead. Most commonly, this is used to strip
+ * the group name if the group is a pseudo-group (DUAL) or the element is a pseudo-group
+ * (ROWNUM). It may also be used to strip special information out of the name in source
+ * value in some specialized cases.
+ *
+ * By default, this method returns null, indicating that the normal group and element
+ * name logic should be used (group + "." + element). Subclasses should override and
+ * implement this method if desired.
+ *
+ * @param group Group name, may be null
+ * @param element Element name, never null
+ * @return Replacement element name to be used as is (no modification will occur)
+ * @since 5.0
+ */
+ protected String replaceElementName(String group, String element) {
+ return null;
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.ColumnReference)
+ */
+ public void visit(ColumnReference obj) {
+ buffer.append(getElementName(obj, true));
+ }
+
+ private String getElementName(ColumnReference obj, boolean qualify) {
+ String groupName = null;
+ NamedTable group = obj.getTable();
+ if (group != null && qualify) {
+ if(group.getCorrelationName() != null) {
+ groupName = group.getCorrelationName();
+ } else {
+ AbstractMetadataRecord groupID = group.getMetadataObject();
+ if(groupID != null) {
+ groupName = getName(groupID);
+ } else {
+ groupName = group.getName();
+ }
+ }
+ }
+
+ String elemShortName = null;
+ AbstractMetadataRecord elementID = obj.getMetadataObject();
+ if(elementID != null) {
+ elemShortName = getName(elementID);
+ } else {
+ String elementName = obj.getName();
+ elemShortName = getShortName(elementName);
+ }
+
+ // Check whether a subclass wants to replace the element name to use in special circumstances
+ String replacementElement = replaceElementName(groupName, elemShortName);
+ if(replacementElement != null) {
+ // If so, use it as is
+ return replacementElement;
+ }
+ StringBuffer elementName = new StringBuffer(elemShortName.length());
+ // If not, do normal logic: [group + "."] + element
+ if(groupName != null) {
+ elementName.append(groupName);
+ elementName.append(Tokens.DOT);
+ }
+ elementName.append(elemShortName);
+ return elementName.toString();
+ }
+
+ /**
+ * @param elementName
+ * @return
+ * @since 4.3
+ */
+ public static String getShortName(String elementName) {
+ int lastDot = elementName.lastIndexOf("."); //$NON-NLS-1$
+ if(lastDot >= 0) {
+ elementName = elementName.substring(lastDot+1);
+ }
+ return elementName;
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExecute)
+ */
+ public void visit(Call obj) {
+ buffer.append(SQLReservedWords.EXEC)
+ .append(Tokens.SPACE);
+
+ if(obj.getMetadataObject() != null) {
+ buffer.append(getName(obj.getMetadataObject()));
+ } else {
+ buffer.append(obj.getProcedureName());
+ }
+
+ buffer.append(Tokens.LPAREN);
+ final List<Argument> params = obj.getArguments();
+ if (params != null && params.size() != 0) {
+ Argument param = null;
+ for (int i = 0; i < params.size(); i++) {
+ param = params.get(i);
+ if (param.getDirection() == Direction.IN || param.getDirection() == Direction.INOUT) {
+ if (i != 0) {
+ buffer.append(Tokens.COMMA)
+ .append(Tokens.SPACE);
+ }
+ append(param);
+ }
+ }
+ }
+ buffer.append(Tokens.RPAREN);
+ }
+
+ /*
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExistsCriteria)
+ */
+ public void visit(Exists obj) {
+ buffer.append(SQLReservedWords.EXISTS)
+ .append(Tokens.SPACE)
+ .append(Tokens.LPAREN);
+ append(obj.getSubquery());
+ buffer.append(Tokens.RPAREN);
+ }
+
+ protected boolean isInfixFunction(String function) {
+ return infixFunctions.contains(function);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.Function)
+ */
+ public void visit(Function obj) {
+
+ String name = obj.getName();
+ List<Expression> args = obj.getParameters();
+ if(name.equalsIgnoreCase(SQLReservedWords.CONVERT) || name.equalsIgnoreCase(SQLReservedWords.CAST)) {
+
+ Object typeValue = ((Literal)args.get(1)).getValue();
+
+ buffer.append(name);
+ buffer.append(Tokens.LPAREN);
+
+ append(args.get(0));
+
+ if(name.equalsIgnoreCase(SQLReservedWords.CONVERT)) {
+ buffer.append(Tokens.COMMA);
+ buffer.append(Tokens.SPACE);
+ } else {
+ buffer.append(Tokens.SPACE);
+ buffer.append(SQLReservedWords.AS);
+ buffer.append(Tokens.SPACE);
+ }
+ buffer.append(typeValue);
+ buffer.append(Tokens.RPAREN);
+ } else if(isInfixFunction(name)) {
+ buffer.append(Tokens.LPAREN);
+
+ if(args != null) {
+ for(int i=0; i<args.size(); i++) {
+ append(args.get(i));
+ if(i < (args.size()-1)) {
+ buffer.append(Tokens.SPACE);
+ buffer.append(name);
+ buffer.append(Tokens.SPACE);
+ }
+ }
+ }
+ buffer.append(Tokens.RPAREN);
+
+ } else if(name.equalsIgnoreCase(SQLReservedWords.TIMESTAMPADD) || name.equalsIgnoreCase(SQLReservedWords.TIMESTAMPDIFF)) {
+ buffer.append(name);
+ buffer.append(Tokens.LPAREN);
+
+ if(args != null && args.size() > 0) {
+ buffer.append(((Literal)args.get(0)).getValue());
+
+ for(int i=1; i<args.size(); i++) {
+ buffer.append(Tokens.COMMA);
+ buffer.append(Tokens.SPACE);
+ append(args.get(i));
+ }
+ }
+ buffer.append(Tokens.RPAREN);
+
+ } else {
+
+ buffer.append(obj.getName())
+ .append(Tokens.LPAREN);
+ append(obj.getParameters());
+ buffer.append(Tokens.RPAREN);
+ }
+ }
+
+ public void visit(NamedTable obj) {
+ AbstractMetadataRecord groupID = obj.getMetadataObject();
+ if(groupID != null) {
+ buffer.append(getName(groupID));
+ } else {
+ buffer.append(obj.getName());
+ }
+
+ if (obj.getCorrelationName() != null) {
+ buffer.append(Tokens.SPACE);
+ if (useAsInGroupAlias()){
+ buffer.append(SQLReservedWords.AS)
+ .append(Tokens.SPACE);
+ }
+ buffer.append(obj.getCorrelationName());
+ }
+ }
+
+ /**
+ * Indicates whether group alias should be of the form
+ * "...FROM groupA AS X" or "...FROM groupA X". Certain
+ * data sources (such as Oracle) may not support the first
+ * form.
+ * @return boolean
+ */
+ protected boolean useAsInGroupAlias(){
+ return true;
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.GroupBy)
+ */
+ public void visit(GroupBy obj) {
+ buffer.append(SQLReservedWords.GROUP)
+ .append(Tokens.SPACE)
+ .append(SQLReservedWords.BY)
+ .append(Tokens.SPACE);
+ append(obj.getElements());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.In)
+ */
+ public void visit(In obj) {
+ append(obj.getLeftExpression());
+ if (obj.isNegated()) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.NOT);
+ }
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.IN)
+ .append(Tokens.SPACE)
+ .append(Tokens.LPAREN);
+ append(obj.getRightExpressions());
+ buffer.append(Tokens.RPAREN);
+ }
+
+ public void visit(DerivedTable obj) {
+ buffer.append(Tokens.LPAREN);
+ append(obj.getQuery());
+ buffer.append(Tokens.RPAREN);
+ buffer.append(Tokens.SPACE);
+ if(useAsInGroupAlias()) {
+ buffer.append(SQLReservedWords.AS);
+ buffer.append(Tokens.SPACE);
+ }
+ buffer.append(obj.getCorrelationName());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.Insert)
+ */
+ public void visit(Insert obj) {
+ buffer.append(SQLReservedWords.INSERT).append(Tokens.SPACE);
+ buffer.append(getSourceComment(obj));
+ buffer.append(SQLReservedWords.INTO).append(Tokens.SPACE);
+ append(obj.getTable());
+ buffer.append(Tokens.SPACE).append(Tokens.LPAREN);
+
+ int elementCount = obj.getColumns().size();
+ for (int i = 0; i < elementCount; i++) {
+ buffer.append(getElementName(obj.getColumns().get(i), false));
+ if (i < elementCount - 1) {
+ buffer.append(Tokens.COMMA);
+ buffer.append(Tokens.SPACE);
+ }
+ }
+
+ buffer.append(Tokens.RPAREN);
+ buffer.append(Tokens.SPACE);
+ append(obj.getValueSource());
+ }
+
+ @Override
+ public void visit(ExpressionValueSource obj) {
+ buffer.append(SQLReservedWords.VALUES).append(Tokens.SPACE).append(Tokens.LPAREN);
+ append(obj.getValues());
+ buffer.append(Tokens.RPAREN);
+ }
+
+ public void visit(IsNull obj) {
+ append(obj.getExpression());
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.IS)
+ .append(Tokens.SPACE);
+ if (obj.isNegated()) {
+ buffer.append(SQLReservedWords.NOT)
+ .append(Tokens.SPACE);
+ }
+ buffer.append(SQLReservedWords.NULL);
+ }
+
+ public void visit(Join obj) {
+ TableReference leftItem = obj.getLeftItem();
+ if(useParensForJoins() && leftItem instanceof Join) {
+ buffer.append(Tokens.LPAREN);
+ append(leftItem);
+ buffer.append(Tokens.RPAREN);
+ } else {
+ append(leftItem);
+ }
+ buffer.append(Tokens.SPACE);
+
+ switch(obj.getJoinType()) {
+ case CROSS_JOIN:
+ buffer.append(SQLReservedWords.CROSS);
+ break;
+ case FULL_OUTER_JOIN:
+ buffer.append(SQLReservedWords.FULL)
+ .append(Tokens.SPACE)
+ .append(SQLReservedWords.OUTER);
+ break;
+ case INNER_JOIN:
+ buffer.append(SQLReservedWords.INNER);
+ break;
+ case LEFT_OUTER_JOIN:
+ buffer.append(SQLReservedWords.LEFT)
+ .append(Tokens.SPACE)
+ .append(SQLReservedWords.OUTER);
+ break;
+ case RIGHT_OUTER_JOIN:
+ buffer.append(SQLReservedWords.RIGHT)
+ .append(Tokens.SPACE)
+ .append(SQLReservedWords.OUTER);
+ break;
+ default: buffer.append(UNDEFINED);
+ }
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.JOIN)
+ .append(Tokens.SPACE);
+
+ TableReference rightItem = obj.getRightItem();
+ if(rightItem instanceof Join && (useParensForJoins() || obj.getJoinType() == Join.JoinType.CROSS_JOIN)) {
+ buffer.append(Tokens.LPAREN);
+ append(rightItem);
+ buffer.append(Tokens.RPAREN);
+ } else {
+ append(rightItem);
+ }
+
+ final Condition condition = obj.getCondition();
+ if (condition != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.ON)
+ .append(Tokens.SPACE);
+ append(condition);
+ }
+ }
+
+ public void visit(Like obj) {
+ append(obj.getLeftExpression());
+ if (obj.isNegated()) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.NOT);
+ }
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.LIKE)
+ .append(Tokens.SPACE);
+ append(obj.getRightExpression());
+ if (obj.getEscapeCharacter() != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.ESCAPE)
+ .append(Tokens.SPACE)
+ .append(Tokens.QUOTE)
+ .append(obj.getEscapeCharacter().toString())
+ .append(Tokens.QUOTE);
+ }
+
+ }
+
+ public void visit(Limit obj) {
+ buffer.append(SQLReservedWords.LIMIT)
+ .append(Tokens.SPACE);
+ if (obj.getRowOffset() > 0) {
+ buffer.append(obj.getRowOffset())
+ .append(Tokens.COMMA)
+ .append(Tokens.SPACE);
+ }
+ buffer.append(obj.getRowLimit());
+ }
+
+ public void visit(Literal obj) {
+ if (obj.isBindValue()) {
+ buffer.append("?"); //$NON-NLS-1$
+ } else if (obj.getValue() == null) {
+ buffer.append(SQLReservedWords.NULL);
+ } else {
+ Class<?> type = obj.getType();
+ String val = obj.getValue().toString();
+ if(Number.class.isAssignableFrom(type)) {
+ buffer.append(val);
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.BOOLEAN)) {
+ buffer.append("{b '") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.TIMESTAMP)) {
+ buffer.append("{ts '") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.TIME)) {
+ buffer.append("{t '") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.DATE)) {
+ buffer.append("{d '") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else {
+ buffer.append(Tokens.QUOTE)
+ .append(escapeString(val, Tokens.QUOTE))
+ .append(Tokens.QUOTE);
+ }
+ }
+ }
+
+ public void visit(Not obj) {
+ buffer.append(SQLReservedWords.NOT)
+ .append(Tokens.SPACE)
+ .append(Tokens.LPAREN);
+ append(obj.getCriteria());
+ buffer.append(Tokens.RPAREN);
+ }
+
+ public void visit(OrderBy obj) {
+ buffer.append(SQLReservedWords.ORDER)
+ .append(Tokens.SPACE)
+ .append(SQLReservedWords.BY)
+ .append(Tokens.SPACE);
+ append(obj.getSortSpecifications());
+ }
+
+ public void visit(SortSpecification obj) {
+ append(obj.getExpression());
+ if (obj.getOrdering() == Ordering.DESC) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.DESC);
+ } // Don't print default "ASC"
+ }
+
+ public void visit(Argument obj) {
+ buffer.append(obj.getArgumentValue());
+ }
+
+ public void visit(Select obj) {
+ buffer.append(SQLReservedWords.SELECT).append(Tokens.SPACE);
+ buffer.append(getSourceComment(obj));
+ if (obj.isDistinct()) {
+ buffer.append(SQLReservedWords.DISTINCT).append(Tokens.SPACE);
+ }
+ if (useSelectLimit() && obj.getLimit() != null) {
+ append(obj.getLimit());
+ buffer.append(Tokens.SPACE);
+ }
+ append(obj.getDerivedColumns());
+ if (obj.getFrom() != null && !obj.getFrom().isEmpty()) {
+ buffer.append(Tokens.SPACE).append(SQLReservedWords.FROM).append(Tokens.SPACE);
+ append(obj.getFrom());
+ }
+ if (obj.getWhere() != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.WHERE)
+ .append(Tokens.SPACE);
+ append(obj.getWhere());
+ }
+ if (obj.getGroupBy() != null) {
+ buffer.append(Tokens.SPACE);
+ append(obj.getGroupBy());
+ }
+ if (obj.getHaving() != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.HAVING)
+ .append(Tokens.SPACE);
+ append(obj.getHaving());
+ }
+ if (obj.getOrderBy() != null) {
+ buffer.append(Tokens.SPACE);
+ append(obj.getOrderBy());
+ }
+ if (!useSelectLimit() && obj.getLimit() != null) {
+ buffer.append(Tokens.SPACE);
+ append(obj.getLimit());
+ }
+ }
+
+ public void visit(SearchedCase obj) {
+ buffer.append(SQLReservedWords.CASE);
+ for (SearchedWhenClause swc : obj.getCases()) {
+ append(swc);
+ }
+ if (obj.getElseExpression() != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.ELSE)
+ .append(Tokens.SPACE);
+ append(obj.getElseExpression());
+ }
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.END);
+ }
+
+ @Override
+ public void visit(SearchedWhenClause obj) {
+ buffer.append(Tokens.SPACE).append(SQLReservedWords.WHEN)
+ .append(Tokens.SPACE);
+ append(obj.getCondition());
+ buffer.append(Tokens.SPACE).append(SQLReservedWords.THEN)
+ .append(Tokens.SPACE);
+ append(obj.getResult());
+ }
+
+ protected String getSourceComment(Command command) {
+ return ""; //$NON-NLS-1$
+ }
+
+ public void visit(ScalarSubquery obj) {
+ buffer.append(Tokens.LPAREN);
+ append(obj.getSubquery());
+ buffer.append(Tokens.RPAREN);
+ }
+
+ public void visit(DerivedColumn obj) {
+ append(obj.getExpression());
+ if (obj.getAlias() != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.AS)
+ .append(Tokens.SPACE)
+ .append(obj.getAlias());
+ }
+ }
+
+ public void visit(SubqueryComparison obj) {
+ append(obj.getLeftExpression());
+ buffer.append(Tokens.SPACE);
+
+ switch(obj.getOperator()) {
+ case EQ: buffer.append(Tokens.EQ); break;
+ case GE: buffer.append(Tokens.GE); break;
+ case GT: buffer.append(Tokens.GT); break;
+ case LE: buffer.append(Tokens.LE); break;
+ case LT: buffer.append(Tokens.LT); break;
+ case NE: buffer.append(Tokens.NE); break;
+ default: buffer.append(UNDEFINED);
+ }
+ buffer.append(Tokens.SPACE);
+ switch(obj.getQuantifier()) {
+ case ALL: buffer.append(SQLReservedWords.ALL); break;
+ case SOME: buffer.append(SQLReservedWords.SOME); break;
+ default: buffer.append(UNDEFINED);
+ }
+ buffer.append(Tokens.SPACE);
+ buffer.append(Tokens.LPAREN);
+ append(obj.getSubquery());
+ buffer.append(Tokens.RPAREN);
+ }
+
+ public void visit(SubqueryIn obj) {
+ append(obj.getLeftExpression());
+ if (obj.isNegated()) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.NOT);
+ }
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.IN)
+ .append(Tokens.SPACE)
+ .append(Tokens.LPAREN);
+ append(obj.getSubquery());
+ buffer.append(Tokens.RPAREN);
+ }
+
+ public void visit(Update obj) {
+ buffer.append(SQLReservedWords.UPDATE)
+ .append(Tokens.SPACE);
+ buffer.append(getSourceComment(obj));
+ append(obj.getTable());
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.SET)
+ .append(Tokens.SPACE);
+ append(obj.getChanges());
+ if (obj.getWhere() != null) {
+ buffer.append(Tokens.SPACE)
+ .append(SQLReservedWords.WHERE)
+ .append(Tokens.SPACE);
+ append(obj.getWhere());
+ }
+ }
+
+ public void visit(SetClause clause) {
+ buffer.append(getElementName(clause.getSymbol(), false));
+ buffer.append(Tokens.SPACE).append(Tokens.EQ).append(Tokens.SPACE);
+ append(clause.getValue());
+ }
+
+ public void visit(SetQuery obj) {
+ appendSetQuery(obj, obj.getLeftQuery(), false);
+
+ buffer.append(Tokens.SPACE);
+
+ appendSetOperation(obj.getOperation());
+
+ if(obj.isAll()) {
+ buffer.append(Tokens.SPACE);
+ buffer.append(SQLReservedWords.ALL);
+ }
+ buffer.append(Tokens.SPACE);
+
+ appendSetQuery(obj, obj.getRightQuery(), true);
+
+ OrderBy orderBy = obj.getOrderBy();
+ if(orderBy != null) {
+ buffer.append(Tokens.SPACE);
+ append(orderBy);
+ }
+
+ Limit limit = obj.getLimit();
+ if(limit != null) {
+ buffer.append(Tokens.SPACE);
+ append(limit);
+ }
+ }
+
+ protected void appendSetOperation(SetQuery.Operation operation) {
+ buffer.append(operation);
+ }
+
+ protected boolean useParensForSetQueries() {
+ return false;
+ }
+
+ protected void appendSetQuery(SetQuery parent, QueryExpression obj, boolean right) {
+ if((!(obj instanceof SetQuery) && useParensForSetQueries())
+ || (right && obj instanceof SetQuery
+ && ((parent.isAll() && !((SetQuery)obj).isAll())
+ || parent.getOperation() != ((SetQuery)obj).getOperation()))) {
+ buffer.append(Tokens.LPAREN);
+ append(obj);
+ buffer.append(Tokens.RPAREN);
+ } else {
+ if (!parent.isAll() && obj instanceof SetQuery) {
+ ((SetQuery)obj).setAll(false);
+ }
+ append(obj);
+ }
+ }
+
+ /**
+ * Gets the SQL string representation for a given ILanguageObject.
+ * @param obj the root of the ILanguageObject hierarchy that needs to be
+ * converted. This can be any subtree, and does not need to be a top-level
+ * command
+ * @return the SQL representation of that ILanguageObject hierarchy
+ */
+ public static String getSQLString(LanguageObject obj) {
+ SQLStringVisitor visitor = new SQLStringVisitor();
+ visitor.append(obj);
+ return visitor.toString();
+ }
+
+ protected boolean useParensForJoins() {
+ return false;
+ }
+
+ protected boolean useSelectLimit() {
+ return false;
+ }
+}
Modified: trunk/connector-api/src/main/java/org/teiid/logging/CommandLogMessage.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/logging/CommandLogMessage.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/logging/CommandLogMessage.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.text.DateFormat;
import java.util.Date;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ExecutionContext;
/**
* Log Message for source and user command events.
Copied: trunk/connector-api/src/main/java/org/teiid/metadata (from rev 2113, trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime)
Deleted: trunk/connector-api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/AbstractMetadataRecord.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,165 +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.
- */
-
-package org.teiid.connector.metadata.runtime;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-
-import com.metamatrix.core.util.EquivalenceUtil;
-
-/**
- * AbstractMetadataRecord
- */
-public abstract class AbstractMetadataRecord implements Serializable {
-
- private static final long serialVersionUID = 564092984812414058L;
-
- public final static char NAME_DELIM_CHAR = '.';
-
- private static AtomicLong UUID_SEQUENCE = new AtomicLong();
-
- private String uuid; //globally unique id
- private String name; //contextually unique name
-
- private String nameInSource;
-
- private LinkedHashMap<String, String> properties;
- private String annotation;
-
- public String getUUID() {
- if (uuid == null) {
- uuid = String.valueOf(UUID_SEQUENCE.getAndIncrement());
- }
- return uuid;
- }
-
- public void setUUID(String uuid) {
- this.uuid = uuid;
- }
-
- public String getNameInSource() {
- return nameInSource;
- }
-
- public void setNameInSource(String nameInSource) {
- this.nameInSource = nameInSource;
- }
-
- /**
- * WARNING - The name returned by this method may be ambiguous and
- * is not SQL safe - it may need quoted/escaped
- */
- public String getFullName() {
- AbstractMetadataRecord parent = getParent();
- if (parent != null) {
- return parent.getFullName() + NAME_DELIM_CHAR + getName();
- }
- return name;
- }
-
- public AbstractMetadataRecord getParent() {
- return null;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String toString() {
- StringBuffer sb = new StringBuffer(100);
- sb.append(getClass().getSimpleName());
- sb.append(" name="); //$NON-NLS-1$
- sb.append(getName());
- sb.append(", nameInSource="); //$NON-NLS-1$
- sb.append(getNameInSource());
- sb.append(", uuid="); //$NON-NLS-1$
- sb.append(getUUID());
- return sb.toString();
- }
-
- /**
- * Return the extension properties for this record - may be unmodifiable
- * if {@link #setProperties(LinkedHashMap)} or {@link #setProperty(String, String)}
- * has not been called.
- * @return
- */
- public Map<String, String> getProperties() {
- if (properties == null) {
- return Collections.emptyMap();
- }
- return properties;
- }
-
- /**
- * The preferred setter for extension properties.
- * @param key
- * @param value
- */
- public void setProperty(String key, String value) {
- if (this.properties == null) {
- this.properties = new LinkedHashMap<String, String>();
- }
- this.properties.put(key, value);
- }
-
- public void setProperties(LinkedHashMap<String, String> properties) {
- this.properties = properties;
- }
-
- public String getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(String annotation) {
- this.annotation = annotation;
- }
-
- /**
- * Compare two records for equality.
- */
- public boolean equals(Object obj) {
- if(obj == this) {
- return true;
- }
-
- if(obj.getClass() != this.getClass()) {
- return false;
- }
-
- AbstractMetadataRecord other = (AbstractMetadataRecord)obj;
-
- return EquivalenceUtil.areEqual(this.getUUID(), other.getUUID());
- }
-
- public int hashCode() {
- return getUUID().hashCode();
- }
-
-}
\ No newline at end of file
Copied: trunk/connector-api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java (from rev 2116, trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/AbstractMetadataRecord.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,166 @@
+/*
+ * 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.
+ */
+
+package org.teiid.metadata;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.teiid.core.util.EquivalenceUtil;
+
+
+/**
+ * AbstractMetadataRecord
+ */
+public abstract class AbstractMetadataRecord implements Serializable {
+
+ private static final long serialVersionUID = 564092984812414058L;
+
+ public final static char NAME_DELIM_CHAR = '.';
+
+ private static AtomicLong UUID_SEQUENCE = new AtomicLong();
+
+ private String uuid; //globally unique id
+ private String name; //contextually unique name
+
+ private String nameInSource;
+
+ private LinkedHashMap<String, String> properties;
+ private String annotation;
+
+ public String getUUID() {
+ if (uuid == null) {
+ uuid = String.valueOf(UUID_SEQUENCE.getAndIncrement());
+ }
+ return uuid;
+ }
+
+ public void setUUID(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public String getNameInSource() {
+ return nameInSource;
+ }
+
+ public void setNameInSource(String nameInSource) {
+ this.nameInSource = nameInSource;
+ }
+
+ /**
+ * WARNING - The name returned by this method may be ambiguous and
+ * is not SQL safe - it may need quoted/escaped
+ */
+ public String getFullName() {
+ AbstractMetadataRecord parent = getParent();
+ if (parent != null) {
+ return parent.getFullName() + NAME_DELIM_CHAR + getName();
+ }
+ return name;
+ }
+
+ public AbstractMetadataRecord getParent() {
+ return null;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer(100);
+ sb.append(getClass().getSimpleName());
+ sb.append(" name="); //$NON-NLS-1$
+ sb.append(getName());
+ sb.append(", nameInSource="); //$NON-NLS-1$
+ sb.append(getNameInSource());
+ sb.append(", uuid="); //$NON-NLS-1$
+ sb.append(getUUID());
+ return sb.toString();
+ }
+
+ /**
+ * Return the extension properties for this record - may be unmodifiable
+ * if {@link #setProperties(LinkedHashMap)} or {@link #setProperty(String, String)}
+ * has not been called.
+ * @return
+ */
+ public Map<String, String> getProperties() {
+ if (properties == null) {
+ return Collections.emptyMap();
+ }
+ return properties;
+ }
+
+ /**
+ * The preferred setter for extension properties.
+ * @param key
+ * @param value
+ */
+ public void setProperty(String key, String value) {
+ if (this.properties == null) {
+ this.properties = new LinkedHashMap<String, String>();
+ }
+ this.properties.put(key, value);
+ }
+
+ public void setProperties(LinkedHashMap<String, String> properties) {
+ this.properties = properties;
+ }
+
+ public String getAnnotation() {
+ return annotation;
+ }
+
+ public void setAnnotation(String annotation) {
+ this.annotation = annotation;
+ }
+
+ /**
+ * Compare two records for equality.
+ */
+ public boolean equals(Object obj) {
+ if(obj == this) {
+ return true;
+ }
+
+ if(obj.getClass() != this.getClass()) {
+ return false;
+ }
+
+ AbstractMetadataRecord other = (AbstractMetadataRecord)obj;
+
+ return EquivalenceUtil.areEqual(this.getUUID(), other.getUUID());
+ }
+
+ public int hashCode() {
+ return getUUID().hashCode();
+ }
+
+}
\ No newline at end of file
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/BaseColumn.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/BaseColumn.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/BaseColumn.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.TypeFacility;
public abstract class BaseColumn extends AbstractMetadataRecord {
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/Column.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Column.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/Column.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/ColumnSet.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ColumnSet.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/ColumnSet.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/Datatype.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Datatype.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/Datatype.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,10 +20,10 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.Column.SearchType;
public class Datatype extends AbstractMetadataRecord {
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/ForeignKey.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ForeignKey.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/ForeignKey.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
/**
* ForeignKeyRecordImpl
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/KeyRecord.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/KeyRecord.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/KeyRecord.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
public class KeyRecord extends ColumnSet<Table> {
Deleted: trunk/connector-api/src/main/java/org/teiid/metadata/MetadataFactory.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataFactory.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/MetadataFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,280 +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.
- */
-
-package org.teiid.connector.metadata.runtime;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.teiid.connector.DataPlugin;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.TypeFacility;
-
-import com.metamatrix.core.id.UUIDFactory;
-
-/**
- * Allows connectors to build metadata for use by the engine.
- *
- * TODO: add support for datatype import
- * TODO: add support for unique constraints
- */
-public class MetadataFactory {
-
- private Schema schema;
- private UUIDFactory factory = new UUIDFactory();
- private Map<String, Datatype> dataTypes;
- private Properties importProperties;
- private MetadataStore store = new MetadataStore();
-
- public MetadataFactory(String modelName, Map<String, Datatype> dataTypes, Properties importProperties) {
- this.dataTypes = dataTypes;
- schema = new Schema();
- schema.setName(modelName);
- setUUID(schema);
- store.addSchema(schema);
- this.importProperties = importProperties;
- }
-
- public MetadataStore getMetadataStore() {
- return store;
- }
-
- public Properties getImportProperties() {
- return importProperties;
- }
-
- private void setUUID(AbstractMetadataRecord record) {
- record.setUUID(factory.create().toString());
- }
-
- /**
- * Add a table with the given name to the model.
- * @param name
- * @return
- * @throws ConnectorException
- */
- public Table addTable(String name) throws ConnectorException {
- Table table = new Table();
- table.setTableType(Table.Type.Table);
- table.setName(name);
- setUUID(table);
- this.schema.addTable(table);
- return table;
- }
-
- /**
- * Adds a column to the table with the given name and type.
- * @param name
- * @param type should be one of {@link TypeFacility.RUNTIME_NAMES}
- * @param table
- * @return
- * @throws ConnectorException
- */
- public Column addColumn(String name, String type, ColumnSet<?> table) throws ConnectorException {
- if (name.indexOf(AbstractMetadataRecord.NAME_DELIM_CHAR) != -1) {
- throw new ConnectorException(DataPlugin.Util.getString("MetadataFactory.invalid_name", name)); //$NON-NLS-1$
- }
- Column column = new Column();
- column.setName(name);
- table.addColumn(column);
- column.setPosition(table.getColumns().size()); //1 based indexing
- Datatype datatype = setColumnType(type, column);
- column.setCaseSensitive(datatype.isCaseSensitive());
- column.setAutoIncremented(datatype.isAutoIncrement());
- column.setSigned(datatype.isSigned());
- setUUID(column);
- return column;
- }
-
- private Datatype setColumnType(String type,
- BaseColumn column) throws ConnectorException {
- Datatype datatype = dataTypes.get(type);
- if (datatype == null) {
- throw new ConnectorException(DataPlugin.Util.getString("MetadataFactory.unknown_datatype", type)); //$NON-NLS-1$
- }
- column.setDatatype(datatype);
- column.setDatatypeUUID(datatype.getUUID());
- column.setLength(datatype.getLength());
- column.setPrecision(datatype.getPrecisionLength());
- column.setRadix(datatype.getRadix());
- column.setRuntimeType(datatype.getRuntimeTypeName());
- return datatype;
- }
-
- /**
- * Adds a primary key to the given table. The column names should be in key order.
- * @param name
- * @param columnNames
- * @param table
- * @return
- * @throws ConnectorException
- */
- public KeyRecord addPrimaryKey(String name, List<String> columnNames, Table table) throws ConnectorException {
- KeyRecord primaryKey = new KeyRecord(KeyRecord.Type.Primary);
- primaryKey.setParent(table);
- primaryKey.setColumns(new ArrayList<Column>(columnNames.size()));
- primaryKey.setName(name);
- setUUID(primaryKey);
- assignColumns(columnNames, table, primaryKey);
- table.setPrimaryKey(primaryKey);
- return primaryKey;
- }
-
- /**
- * Adds an access pattern to the given table.
- * @param name
- * @param columnNames
- * @param table
- * @return
- * @throws ConnectorException
- */
- public KeyRecord addAccessPattern(String name, List<String> columnNames, Table table) throws ConnectorException {
- KeyRecord ap = new KeyRecord(KeyRecord.Type.AccessPattern);
- ap.setParent(table);
- ap.setColumns(new ArrayList<Column>(columnNames.size()));
- ap.setName(name);
- setUUID(ap);
- assignColumns(columnNames, table, ap);
- table.getAccessPatterns().add(ap);
- return ap;
- }
-
- /**
- * Adds an index to the given table.
- * @param name
- * @param nonUnique true indicates that an index is being added.
- * @param columnNames
- * @param table
- * @return
- * @throws ConnectorException
- */
- public KeyRecord addIndex(String name, boolean nonUnique, List<String> columnNames, Table table) throws ConnectorException {
- KeyRecord index = new KeyRecord(nonUnique?KeyRecord.Type.NonUnique:KeyRecord.Type.Index);
- index.setParent(table);
- index.setColumns(new ArrayList<Column>(columnNames.size()));
- index.setName(name);
- setUUID(index);
- assignColumns(columnNames, table, index);
- table.getIndexes().add(index);
- return index;
- }
-
- /**
- * Adds a foreign key to the given table. The column names should be in key order.
- * @param name
- * @param columnNames
- * @param pkTable
- * @param table
- * @return
- * @throws ConnectorException
- */
- public ForeignKey addForiegnKey(String name, List<String> columnNames, Table pkTable, Table table) throws ConnectorException {
- ForeignKey foreignKey = new ForeignKey();
- foreignKey.setParent(table);
- foreignKey.setColumns(new ArrayList<Column>(columnNames.size()));
- foreignKey.setName(name);
- setUUID(foreignKey);
- if (pkTable.getPrimaryKey() == null) {
- throw new ConnectorException("No primary key defined for table " + pkTable); //$NON-NLS-1$
- }
- foreignKey.setPrimaryKey(pkTable.getPrimaryKey());
- foreignKey.setUniqueKeyID(pkTable.getPrimaryKey().getUUID());
- assignColumns(columnNames, table, foreignKey);
- table.getForeignKeys().add(foreignKey);
- return foreignKey;
- }
-
- /**
- * Add a procedure with the given name to the model.
- * @param name
- * @return
- * @throws ConnectorException
- */
- public Procedure addProcedure(String name) throws ConnectorException {
- Procedure procedure = new Procedure();
- procedure.setName(name);
- setUUID(procedure);
- procedure.setParameters(new LinkedList<ProcedureParameter>());
- this.schema.addProcedure(procedure);
- return procedure;
- }
-
- /**
- * Add a procedure parameter.
- * @param name
- * @param type should be one of {@link TypeFacility.RUNTIME_NAMES}
- * @param parameterType should be one of {@link ProcedureParameter.Type}
- * @param procedure
- * @return
- * @throws ConnectorException
- */
- public ProcedureParameter addProcedureParameter(String name, String type, ProcedureParameter.Type parameterType, Procedure procedure) throws ConnectorException {
- ProcedureParameter param = new ProcedureParameter();
- param.setName(name);
- setUUID(param);
- param.setType(parameterType);
- param.setProcedure(procedure);
- setColumnType(type, param);
- procedure.getParameters().add(param);
- param.setPosition(procedure.getParameters().size()); //1 based indexing
- return param;
- }
-
- /**
- * Add a procedure resultset column to the given procedure.
- * @param name
- * @param type should be one of {@link TypeFacility.RUNTIME_NAMES}
- * @param procedure
- * @return
- * @throws ConnectorException
- */
- public Column addProcedureResultSetColumn(String name, String type, Procedure procedure) throws ConnectorException {
- if (procedure.getResultSet() == null) {
- ColumnSet<Procedure> resultSet = new ColumnSet<Procedure>();
- resultSet.setParent(procedure);
- resultSet.setName("RSParam"); //$NON-NLS-1$
- setUUID(resultSet);
- procedure.setResultSet(resultSet);
- }
- return addColumn(name, type, procedure.getResultSet());
- }
-
- private void assignColumns(List<String> columnNames, Table table,
- ColumnSet<?> columns) throws ConnectorException {
- for (String columnName : columnNames) {
- boolean match = false;
- for (Column column : table.getColumns()) {
- if (column.getName().equals(columnName)) {
- match = true;
- columns.getColumns().add(column);
- break;
- }
- }
- if (!match) {
- throw new ConnectorException(DataPlugin.Util.getString("MetadataFactory.no_column_found", columnName)); //$NON-NLS-1$
- }
- }
- }
-}
Copied: trunk/connector-api/src/main/java/org/teiid/metadata/MetadataFactory.java (from rev 2116, trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataFactory.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/metadata/MetadataFactory.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/MetadataFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,280 @@
+/*
+ * 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.
+ */
+
+package org.teiid.metadata;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.teiid.connector.DataPlugin;
+import org.teiid.core.id.UUIDFactory;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.TypeFacility;
+
+
+/**
+ * Allows connectors to build metadata for use by the engine.
+ *
+ * TODO: add support for datatype import
+ * TODO: add support for unique constraints
+ */
+public class MetadataFactory {
+
+ private Schema schema;
+ private UUIDFactory factory = new UUIDFactory();
+ private Map<String, Datatype> dataTypes;
+ private Properties importProperties;
+ private MetadataStore store = new MetadataStore();
+
+ public MetadataFactory(String modelName, Map<String, Datatype> dataTypes, Properties importProperties) {
+ this.dataTypes = dataTypes;
+ schema = new Schema();
+ schema.setName(modelName);
+ setUUID(schema);
+ store.addSchema(schema);
+ this.importProperties = importProperties;
+ }
+
+ public MetadataStore getMetadataStore() {
+ return store;
+ }
+
+ public Properties getImportProperties() {
+ return importProperties;
+ }
+
+ private void setUUID(AbstractMetadataRecord record) {
+ record.setUUID(factory.create().toString());
+ }
+
+ /**
+ * Add a table with the given name to the model.
+ * @param name
+ * @return
+ * @throws ConnectorException
+ */
+ public Table addTable(String name) throws ConnectorException {
+ Table table = new Table();
+ table.setTableType(Table.Type.Table);
+ table.setName(name);
+ setUUID(table);
+ this.schema.addTable(table);
+ return table;
+ }
+
+ /**
+ * Adds a column to the table with the given name and type.
+ * @param name
+ * @param type should be one of {@link TypeFacility.RUNTIME_NAMES}
+ * @param table
+ * @return
+ * @throws ConnectorException
+ */
+ public Column addColumn(String name, String type, ColumnSet<?> table) throws ConnectorException {
+ if (name.indexOf(AbstractMetadataRecord.NAME_DELIM_CHAR) != -1) {
+ throw new ConnectorException(DataPlugin.Util.getString("MetadataFactory.invalid_name", name)); //$NON-NLS-1$
+ }
+ Column column = new Column();
+ column.setName(name);
+ table.addColumn(column);
+ column.setPosition(table.getColumns().size()); //1 based indexing
+ Datatype datatype = setColumnType(type, column);
+ column.setCaseSensitive(datatype.isCaseSensitive());
+ column.setAutoIncremented(datatype.isAutoIncrement());
+ column.setSigned(datatype.isSigned());
+ setUUID(column);
+ return column;
+ }
+
+ private Datatype setColumnType(String type,
+ BaseColumn column) throws ConnectorException {
+ Datatype datatype = dataTypes.get(type);
+ if (datatype == null) {
+ throw new ConnectorException(DataPlugin.Util.getString("MetadataFactory.unknown_datatype", type)); //$NON-NLS-1$
+ }
+ column.setDatatype(datatype);
+ column.setDatatypeUUID(datatype.getUUID());
+ column.setLength(datatype.getLength());
+ column.setPrecision(datatype.getPrecisionLength());
+ column.setRadix(datatype.getRadix());
+ column.setRuntimeType(datatype.getRuntimeTypeName());
+ return datatype;
+ }
+
+ /**
+ * Adds a primary key to the given table. The column names should be in key order.
+ * @param name
+ * @param columnNames
+ * @param table
+ * @return
+ * @throws ConnectorException
+ */
+ public KeyRecord addPrimaryKey(String name, List<String> columnNames, Table table) throws ConnectorException {
+ KeyRecord primaryKey = new KeyRecord(KeyRecord.Type.Primary);
+ primaryKey.setParent(table);
+ primaryKey.setColumns(new ArrayList<Column>(columnNames.size()));
+ primaryKey.setName(name);
+ setUUID(primaryKey);
+ assignColumns(columnNames, table, primaryKey);
+ table.setPrimaryKey(primaryKey);
+ return primaryKey;
+ }
+
+ /**
+ * Adds an access pattern to the given table.
+ * @param name
+ * @param columnNames
+ * @param table
+ * @return
+ * @throws ConnectorException
+ */
+ public KeyRecord addAccessPattern(String name, List<String> columnNames, Table table) throws ConnectorException {
+ KeyRecord ap = new KeyRecord(KeyRecord.Type.AccessPattern);
+ ap.setParent(table);
+ ap.setColumns(new ArrayList<Column>(columnNames.size()));
+ ap.setName(name);
+ setUUID(ap);
+ assignColumns(columnNames, table, ap);
+ table.getAccessPatterns().add(ap);
+ return ap;
+ }
+
+ /**
+ * Adds an index to the given table.
+ * @param name
+ * @param nonUnique true indicates that an index is being added.
+ * @param columnNames
+ * @param table
+ * @return
+ * @throws ConnectorException
+ */
+ public KeyRecord addIndex(String name, boolean nonUnique, List<String> columnNames, Table table) throws ConnectorException {
+ KeyRecord index = new KeyRecord(nonUnique?KeyRecord.Type.NonUnique:KeyRecord.Type.Index);
+ index.setParent(table);
+ index.setColumns(new ArrayList<Column>(columnNames.size()));
+ index.setName(name);
+ setUUID(index);
+ assignColumns(columnNames, table, index);
+ table.getIndexes().add(index);
+ return index;
+ }
+
+ /**
+ * Adds a foreign key to the given table. The column names should be in key order.
+ * @param name
+ * @param columnNames
+ * @param pkTable
+ * @param table
+ * @return
+ * @throws ConnectorException
+ */
+ public ForeignKey addForiegnKey(String name, List<String> columnNames, Table pkTable, Table table) throws ConnectorException {
+ ForeignKey foreignKey = new ForeignKey();
+ foreignKey.setParent(table);
+ foreignKey.setColumns(new ArrayList<Column>(columnNames.size()));
+ foreignKey.setName(name);
+ setUUID(foreignKey);
+ if (pkTable.getPrimaryKey() == null) {
+ throw new ConnectorException("No primary key defined for table " + pkTable); //$NON-NLS-1$
+ }
+ foreignKey.setPrimaryKey(pkTable.getPrimaryKey());
+ foreignKey.setUniqueKeyID(pkTable.getPrimaryKey().getUUID());
+ assignColumns(columnNames, table, foreignKey);
+ table.getForeignKeys().add(foreignKey);
+ return foreignKey;
+ }
+
+ /**
+ * Add a procedure with the given name to the model.
+ * @param name
+ * @return
+ * @throws ConnectorException
+ */
+ public Procedure addProcedure(String name) throws ConnectorException {
+ Procedure procedure = new Procedure();
+ procedure.setName(name);
+ setUUID(procedure);
+ procedure.setParameters(new LinkedList<ProcedureParameter>());
+ this.schema.addProcedure(procedure);
+ return procedure;
+ }
+
+ /**
+ * Add a procedure parameter.
+ * @param name
+ * @param type should be one of {@link TypeFacility.RUNTIME_NAMES}
+ * @param parameterType should be one of {@link ProcedureParameter.Type}
+ * @param procedure
+ * @return
+ * @throws ConnectorException
+ */
+ public ProcedureParameter addProcedureParameter(String name, String type, ProcedureParameter.Type parameterType, Procedure procedure) throws ConnectorException {
+ ProcedureParameter param = new ProcedureParameter();
+ param.setName(name);
+ setUUID(param);
+ param.setType(parameterType);
+ param.setProcedure(procedure);
+ setColumnType(type, param);
+ procedure.getParameters().add(param);
+ param.setPosition(procedure.getParameters().size()); //1 based indexing
+ return param;
+ }
+
+ /**
+ * Add a procedure resultset column to the given procedure.
+ * @param name
+ * @param type should be one of {@link TypeFacility.RUNTIME_NAMES}
+ * @param procedure
+ * @return
+ * @throws ConnectorException
+ */
+ public Column addProcedureResultSetColumn(String name, String type, Procedure procedure) throws ConnectorException {
+ if (procedure.getResultSet() == null) {
+ ColumnSet<Procedure> resultSet = new ColumnSet<Procedure>();
+ resultSet.setParent(procedure);
+ resultSet.setName("RSParam"); //$NON-NLS-1$
+ setUUID(resultSet);
+ procedure.setResultSet(resultSet);
+ }
+ return addColumn(name, type, procedure.getResultSet());
+ }
+
+ private void assignColumns(List<String> columnNames, Table table,
+ ColumnSet<?> columns) throws ConnectorException {
+ for (String columnName : columnNames) {
+ boolean match = false;
+ for (Column column : table.getColumns()) {
+ if (column.getName().equals(columnName)) {
+ match = true;
+ columns.getColumns().add(column);
+ break;
+ }
+ }
+ if (!match) {
+ throw new ConnectorException(DataPlugin.Util.getString("MetadataFactory.no_column_found", columnName)); //$NON-NLS-1$
+ }
+ }
+ }
+}
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/MetadataStore.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataStore.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/MetadataStore.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
import java.io.Serializable;
import java.util.ArrayList;
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/Procedure.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Procedure.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/Procedure.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
import java.util.LinkedList;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/ProcedureParameter.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ProcedureParameter.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/ProcedureParameter.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
/**
* ProcedureParameterRecordImpl
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/RuntimeMetadata.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/RuntimeMetadata.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/RuntimeMetadata.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
/**
* Helper methods that can be used to access runtime metadata.
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/Schema.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Schema.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/Schema.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
import java.util.LinkedHashMap;
import java.util.Map;
Modified: trunk/connector-api/src/main/java/org/teiid/metadata/Table.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Table.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/connector-api/src/main/java/org/teiid/metadata/Table.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.connector.metadata.runtime;
+package org.teiid.metadata;
import java.util.Collection;
import java.util.LinkedList;
Deleted: trunk/connector-api/src/main/java/org/teiid/resource/ConnectorException.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/ConnectorException.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/resource/ConnectorException.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,79 +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.
- */
-
-package org.teiid.resource;
-
-import javax.resource.ResourceException;
-
-/**
- * An exception the connector writer can return in case of an
- * error while using the connector.
- */
-public class ConnectorException extends ResourceException{
-
- private static final long serialVersionUID = -5980862789340592219L;
-
- /**
- * No-arg constructor required by Externalizable semantics.
- */
- public ConnectorException() {
- super();
- }
-
- /**
- * Construct an instance with the message specified.
- *
- * @param message A message describing the exception
- */
- public ConnectorException( String message ) {
- super( message );
- }
-
- public ConnectorException( String errorCode, String message ) {
- super( message, errorCode);
- }
-
- public ConnectorException( int errorCode, String message ) {
- super(message, Integer.toString(errorCode));
- }
-
-
- /**
- * Construct an instance from a message and an exception to chain to this one.
- *
- * @param code A code denoting the exception
- * @param e An exception to nest within this one
- */
- public ConnectorException( Throwable e, String message ) {
- super(message,e);
- }
-
- /**
- * Construct an instance with a linked exception specified.
- *
- * @param e An exception to chain to this exception
- */
- public ConnectorException( Throwable e ) {
- super( e );
- }
-
-}
Deleted: trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicConnectorCapabilities.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicConnectorCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicConnectorCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,380 +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.
- */
-
-package org.teiid.resource.adapter;
-
-import java.util.List;
-
-import org.teiid.resource.cci.ConnectorCapabilities;
-
-
-/**
- * This class is a base implementation of the ConnectorCapabilities interface.
- * It is implemented to return false for all capabilities. Subclass this base
- * class and override any methods necessary to specify capabilities the
- * connector actually supports.
- */
-public class BasicConnectorCapabilities implements ConnectorCapabilities {
-
- /**
- * Construct the basic capabilities class.
- */
- public BasicConnectorCapabilities() {
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelectDistinct()
- */
- public boolean supportsSelectDistinct() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAliasedGroup()
- */
- public boolean supportsAliasedGroup() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelfJoins()
- */
- public boolean supportsSelfJoins() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOuterJoins()
- */
- public boolean supportsOuterJoins() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsFullOuterJoins()
- */
- public boolean supportsFullOuterJoins() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsBetweenCriteria()
- */
- public boolean supportsBetweenCriteria() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareCriteriaEquals()
- */
- public boolean supportsCompareCriteriaEquals() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCriteria()
- */
- public boolean supportsLikeCriteria() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCriteriaEscapeCharacter()
- */
- public boolean supportsLikeCriteriaEscapeCharacter() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriteria()
- */
- public boolean supportsInCriteria() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriteriaSubquery()
- */
- public boolean supportsInCriteriaSubquery() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsIsNullCriteria()
- */
- public boolean supportsIsNullCriteria() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrCriteria()
- */
- public boolean supportsOrCriteria() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsNotCriteria()
- */
- public boolean supportsNotCriteria() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsExistsCriteria()
- */
- public boolean supportsExistsCriteria() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifiedCompareCriteriaSome()
- */
- public boolean supportsQuantifiedCompareCriteriaSome() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifiedCompareCriteriaAll()
- */
- public boolean supportsQuantifiedCompareCriteriaAll() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrderBy()
- */
- public boolean supportsOrderBy() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesSum()
- */
- public boolean supportsAggregatesSum() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesAvg()
- */
- public boolean supportsAggregatesAvg() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesMin()
- */
- public boolean supportsAggregatesMin() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesMax()
- */
- public boolean supportsAggregatesMax() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesCount()
- */
- public boolean supportsAggregatesCount() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesCountStar()
- */
- public boolean supportsAggregatesCountStar() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesDistinct()
- */
- public boolean supportsAggregatesDistinct() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsScalarSubqueries()
- */
- public boolean supportsScalarSubqueries() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCorrelatedSubqueries()
- */
- public boolean supportsCorrelatedSubqueries() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCaseExpressions()
- */
- public boolean supportsCaseExpressions() {
- return false;
- }
-
- /*
- * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSearchedCaseExpressions()
- */
- public boolean supportsSearchedCaseExpressions() {
- return false;
- }
-
- /**
- * Return null to indicate no functions are supported.
- * @return null
- * @see org.teiid.resource.cci.ConnectorCapabilities#getSupportedFunctions()
- */
- public List<String> getSupportedFunctions() {
- return null;
- }
-
- public boolean supportsInlineViews() {
- return false;
- }
-
- /**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsUnions()
- * @since 4.2
- */
- public boolean supportsUnions() {
- return false;
- }
-
- /**
- * @see org.teiid.resource.cci.ConnectorCapabilities#getMaxInCriteriaSize()
- * @since 4.2
- */
- public int getMaxInCriteriaSize() {
- return -1;
- }
-
- /**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsFunctionsInGroupBy()
- * @since 5.0
- */
- public boolean supportsFunctionsInGroupBy() {
- return false;
- }
-
- public boolean supportsRowLimit() {
- return false;
- }
-
- public boolean supportsRowOffset() {
- return false;
- }
-
- /**
- * @see org.teiid.resource.cci.ConnectorCapabilities#getMaxFromGroups()
- */
- public int getMaxFromGroups() {
- return -1; //-1 indicates no max
- }
-
- /**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsExcept()
- */
- public boolean supportsExcept() {
- return false;
- }
-
- /**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsIntersect()
- */
- public boolean supportsIntersect() {
- return false;
- }
-
- /**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsSetQueryOrderBy()
- */
- public boolean supportsSetQueryOrderBy() {
- return false;
- }
-
- @Override
- public boolean useAnsiJoin() {
- return false;
- }
-
- @Override
- public boolean requiresCriteria() {
- return false;
- }
-
- @Override
- public boolean supportsBatchedUpdates() {
- return false;
- }
-
- @Override
- public boolean supportsGroupBy() {
- return false;
- }
-
- @Override
- public boolean supportsHaving() {
- return false;
- }
-
- @Override
- public boolean supportsInnerJoins() {
- return false;
- }
-
- @Override
- public boolean supportsSelectExpression() {
- return false;
- }
-
- @Override
- public SupportedJoinCriteria getSupportedJoinCriteria() {
- return SupportedJoinCriteria.ANY;
- }
-
- @Override
- public boolean supportsCompareCriteriaOrdered() {
- return false;
- }
-
- @Override
- public boolean supportsInsertWithQueryExpression() {
- return false;
- }
-
- @Override
- public boolean supportsBulkUpdate() {
- return false;
- }
-
- @Override
- public boolean supportsOrderByUnrelated() {
- return false;
- }
-
-}
Deleted: trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecution.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,29 +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.
- */
-
-package org.teiid.resource.adapter;
-
-import org.teiid.resource.cci.Execution;
-
-public abstract class BasicExecution implements Execution {
-
-}
Deleted: trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecutionFactory.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,218 +0,0 @@
-package org.teiid.resource.adapter;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
-import java.util.Properties;
-
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.core.TeiidException;
-import org.teiid.core.util.ReflectionHelper;
-import org.teiid.core.util.StringUtil;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.Execution;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ExecutionFactory;
-import org.teiid.resource.cci.ProcedureExecution;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.TypeFacility;
-import org.teiid.resource.cci.UpdateExecution;
-import org.teiid.resource.spi.BasicManagedConnectionFactory;
-
-
-public class BasicExecutionFactory implements ExecutionFactory {
-
- protected ConnectorCapabilities capabilities;
- private static final TypeFacility TYPE_FACILITY = new TypeFacility();
-
- private String capabilitiesClass;
- private boolean immutable = false;
- private boolean exceptionOnMaxRows = false;
- private int maxResultRows = -1;
- private boolean xaCapable;
- private String overrideCapabilitiesFile;
- private boolean sourceRequired = true;
-
- @Override
- public void start() throws ConnectorException {
- }
-
- public Class<? extends ConnectorCapabilities> getDefaultCapabilities() {
- return BasicConnectorCapabilities.class;
- }
-
- @Override
- public ConnectorCapabilities getCapabilities() throws ConnectorException {
- if (capabilities == null) {
- // create Capabilities
- capabilities = BasicManagedConnectionFactory.getInstance(ConnectorCapabilities.class, getCapabilitiesClass(), null, getDefaultCapabilities());
- }
-
- // capabilities overload
- Properties props = getOverrideCapabilities();
- if (this.capabilities != null && props != null) {
- this.capabilities = (ConnectorCapabilities) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] {ConnectorCapabilities.class}, new CapabilitesOverloader(this.capabilities, props));
- }
- return capabilities;
- }
-
- @Override
- public Execution createExecution(Command command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connectionFactory) throws ConnectorException {
- if (command instanceof QueryExpression) {
- return createResultSetExecution((QueryExpression)command, executionContext, metadata, connectionFactory);
- }
- if (command instanceof Call) {
- return createProcedureExecution((Call)command, executionContext, metadata, connectionFactory);
- }
- return createUpdateExecution(command, executionContext, metadata, connectionFactory);
- }
-
- public ResultSetExecution createResultSetExecution(QueryExpression command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connection) throws ConnectorException {
- throw new ConnectorException("Unsupported Execution"); //$NON-NLS-1$
- }
-
- public ProcedureExecution createProcedureExecution(Call command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connection) throws ConnectorException {
- throw new ConnectorException("Unsupported Execution");//$NON-NLS-1$
- }
-
- public UpdateExecution createUpdateExecution(Command command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connection) throws ConnectorException {
- throw new ConnectorException("Unsupported Execution");//$NON-NLS-1$
- }
-
- // derived
- private Properties overrideCapabilities;
-
-
- @Override
- public LanguageFactory getLanguageFactory() {
- return LanguageFactory.INSTANCE;
- }
-
- @Override
- public TypeFacility getTypeFacility() {
- return TYPE_FACILITY;
- }
-
- @Override
- public Properties getOverrideCapabilities() throws ConnectorException {
- if (this.overrideCapabilities == null && getOverrideCapabilitiesFile() != null) {
- try {
- this.overrideCapabilities = new Properties();
- this.overrideCapabilities.loadFromXML(this.getClass().getResourceAsStream(getOverrideCapabilitiesFile()));
- } catch (IOException e) {
- throw new ConnectorException(e);
- }
- }
- return this.overrideCapabilities;
- }
-
- public static <T> T getInstance(Class<T> expectedType, String className, Collection ctorObjs, Class defaultClass) throws ConnectorException {
- try {
- if (className == null) {
- if (defaultClass == null) {
- throw new ConnectorException("Neither class name or default class specified to create an instance"); //$NON-NLS-1$
- }
- return expectedType.cast(defaultClass.newInstance());
- }
- return expectedType.cast(ReflectionHelper.create(className, ctorObjs, Thread.currentThread().getContextClassLoader()));
- } catch (TeiidException e) {
- throw new ConnectorException(e);
- } catch (IllegalAccessException e) {
- throw new ConnectorException(e);
- } catch(InstantiationException e) {
- throw new ConnectorException(e);
- }
- }
- /**
- * Overloads the connector capabilities with one defined in the connector binding properties
- */
- static final class CapabilitesOverloader implements InvocationHandler {
- ConnectorCapabilities caps;
- Properties properties;
-
- CapabilitesOverloader(ConnectorCapabilities caps, Properties properties){
- this.caps = caps;
- this.properties = properties;
- }
-
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- String value = this.properties.getProperty(method.getName());
- if (value == null || value.trim().length() == 0 || (args != null && args.length != 0)) {
- return method.invoke(this.caps, args);
- }
- return StringUtil.valueOf(value, method.getReturnType());
- }
- }
-
- @Override
- public String getCapabilitiesClass() {
- return capabilitiesClass;
- }
-
- public void setCapabilitiesClass(String arg0) {
- this.capabilitiesClass = arg0;
- }
-
- @Override
- public boolean isImmutable() {
- return immutable;
- }
-
- public void setImmutable(boolean arg0) {
- this.immutable = arg0;
- }
-
- @Override
- public boolean isExceptionOnMaxRows() {
- return exceptionOnMaxRows;
- }
-
- public void setExceptionOnMaxRows(boolean arg0) {
- this.exceptionOnMaxRows = arg0;
- }
-
- @Override
- public int getMaxResultRows() {
- return maxResultRows;
- }
-
- public void setMaxResultRows(int arg0) {
- this.maxResultRows = arg0;
- }
-
- @Override
- public boolean isXaCapable() {
- return xaCapable;
- }
-
- public void setXaCapable(boolean arg0) {
- this.xaCapable = arg0;
- }
-
- @Override
- public String getOverrideCapabilitiesFile() throws ConnectorException {
- return this.overrideCapabilitiesFile;
- }
-
-
- public void setOverrideCapabilitiesFile(String overrideCapabilitiesFile) {
- this.overrideCapabilitiesFile = overrideCapabilitiesFile;
- }
-
- @Override
- public boolean isSourceRequired() {
- return sourceRequired;
- }
-
- public void setSourceRequired(boolean value) {
- this.sourceRequired = value;
- }
-}
Deleted: trunk/connector-api/src/main/java/org/teiid/resource/adapter/FileConnection.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/adapter/FileConnection.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/resource/adapter/FileConnection.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,32 +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.
- */
-package org.teiid.resource.adapter;
-
-import java.io.File;
-
-import javax.resource.cci.Connection;
-
-public interface FileConnection extends Connection {
-
- File[] getFiles(String path);
-
-}
Modified: trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnection.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnection.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnection.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -38,7 +38,7 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public class BasicManagedConnection implements ManagedConnection {
protected PrintWriter log;
Modified: trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/resource/spi/BasicManagedConnectionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -38,7 +38,7 @@
import org.teiid.core.TeiidException;
import org.teiid.core.util.ReflectionHelper;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public abstract class BasicManagedConnectionFactory implements ManagedConnectionFactory, ResourceAdapterAssociation, ValidatingManagedConnectionFactory {
Copied: trunk/connector-api/src/main/java/org/teiid/translator (from rev 2118, trunk/connector-api/src/main/java/org/teiid/resource/cci)
Copied: trunk/connector-api/src/main/java/org/teiid/translator/BasicConnectorCapabilities.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicConnectorCapabilities.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/translator/BasicConnectorCapabilities.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/translator/BasicConnectorCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,379 @@
+/*
+ * 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.
+ */
+
+package org.teiid.translator;
+
+import java.util.List;
+
+
+
+/**
+ * This class is a base implementation of the ConnectorCapabilities interface.
+ * It is implemented to return false for all capabilities. Subclass this base
+ * class and override any methods necessary to specify capabilities the
+ * connector actually supports.
+ */
+public class BasicConnectorCapabilities implements ConnectorCapabilities {
+
+ /**
+ * Construct the basic capabilities class.
+ */
+ public BasicConnectorCapabilities() {
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelectDistinct()
+ */
+ public boolean supportsSelectDistinct() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAliasedGroup()
+ */
+ public boolean supportsAliasedGroup() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelfJoins()
+ */
+ public boolean supportsSelfJoins() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOuterJoins()
+ */
+ public boolean supportsOuterJoins() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsFullOuterJoins()
+ */
+ public boolean supportsFullOuterJoins() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsBetweenCriteria()
+ */
+ public boolean supportsBetweenCriteria() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareCriteriaEquals()
+ */
+ public boolean supportsCompareCriteriaEquals() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCriteria()
+ */
+ public boolean supportsLikeCriteria() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCriteriaEscapeCharacter()
+ */
+ public boolean supportsLikeCriteriaEscapeCharacter() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriteria()
+ */
+ public boolean supportsInCriteria() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriteriaSubquery()
+ */
+ public boolean supportsInCriteriaSubquery() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsIsNullCriteria()
+ */
+ public boolean supportsIsNullCriteria() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrCriteria()
+ */
+ public boolean supportsOrCriteria() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsNotCriteria()
+ */
+ public boolean supportsNotCriteria() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsExistsCriteria()
+ */
+ public boolean supportsExistsCriteria() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifiedCompareCriteriaSome()
+ */
+ public boolean supportsQuantifiedCompareCriteriaSome() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifiedCompareCriteriaAll()
+ */
+ public boolean supportsQuantifiedCompareCriteriaAll() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrderBy()
+ */
+ public boolean supportsOrderBy() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesSum()
+ */
+ public boolean supportsAggregatesSum() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesAvg()
+ */
+ public boolean supportsAggregatesAvg() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesMin()
+ */
+ public boolean supportsAggregatesMin() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesMax()
+ */
+ public boolean supportsAggregatesMax() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesCount()
+ */
+ public boolean supportsAggregatesCount() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesCountStar()
+ */
+ public boolean supportsAggregatesCountStar() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregatesDistinct()
+ */
+ public boolean supportsAggregatesDistinct() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsScalarSubqueries()
+ */
+ public boolean supportsScalarSubqueries() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCorrelatedSubqueries()
+ */
+ public boolean supportsCorrelatedSubqueries() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCaseExpressions()
+ */
+ public boolean supportsCaseExpressions() {
+ return false;
+ }
+
+ /*
+ * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSearchedCaseExpressions()
+ */
+ public boolean supportsSearchedCaseExpressions() {
+ return false;
+ }
+
+ /**
+ * Return null to indicate no functions are supported.
+ * @return null
+ * @see org.teiid.translator.ConnectorCapabilities#getSupportedFunctions()
+ */
+ public List<String> getSupportedFunctions() {
+ return null;
+ }
+
+ public boolean supportsInlineViews() {
+ return false;
+ }
+
+ /**
+ * @see org.teiid.translator.ConnectorCapabilities#supportsUnions()
+ * @since 4.2
+ */
+ public boolean supportsUnions() {
+ return false;
+ }
+
+ /**
+ * @see org.teiid.translator.ConnectorCapabilities#getMaxInCriteriaSize()
+ * @since 4.2
+ */
+ public int getMaxInCriteriaSize() {
+ return -1;
+ }
+
+ /**
+ * @see org.teiid.translator.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @since 5.0
+ */
+ public boolean supportsFunctionsInGroupBy() {
+ return false;
+ }
+
+ public boolean supportsRowLimit() {
+ return false;
+ }
+
+ public boolean supportsRowOffset() {
+ return false;
+ }
+
+ /**
+ * @see org.teiid.translator.ConnectorCapabilities#getMaxFromGroups()
+ */
+ public int getMaxFromGroups() {
+ return -1; //-1 indicates no max
+ }
+
+ /**
+ * @see org.teiid.translator.ConnectorCapabilities#supportsExcept()
+ */
+ public boolean supportsExcept() {
+ return false;
+ }
+
+ /**
+ * @see org.teiid.translator.ConnectorCapabilities#supportsIntersect()
+ */
+ public boolean supportsIntersect() {
+ return false;
+ }
+
+ /**
+ * @see org.teiid.translator.ConnectorCapabilities#supportsSetQueryOrderBy()
+ */
+ public boolean supportsSetQueryOrderBy() {
+ return false;
+ }
+
+ @Override
+ public boolean useAnsiJoin() {
+ return false;
+ }
+
+ @Override
+ public boolean requiresCriteria() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsBatchedUpdates() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsGroupBy() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsHaving() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsInnerJoins() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsSelectExpression() {
+ return false;
+ }
+
+ @Override
+ public SupportedJoinCriteria getSupportedJoinCriteria() {
+ return SupportedJoinCriteria.ANY;
+ }
+
+ @Override
+ public boolean supportsCompareCriteriaOrdered() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsInsertWithQueryExpression() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsBulkUpdate() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsOrderByUnrelated() {
+ return false;
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/translator/BasicExecution.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecution.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/translator/BasicExecution.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/translator/BasicExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package org.teiid.translator;
+
+
+public abstract class BasicExecution implements Execution {
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/translator/BasicExecution.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/connector-api/src/main/java/org/teiid/translator/BasicExecutionFactory.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/resource/adapter/BasicExecutionFactory.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/translator/BasicExecutionFactory.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/translator/BasicExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,209 @@
+package org.teiid.translator;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Collection;
+import java.util.Properties;
+
+import org.teiid.core.TeiidException;
+import org.teiid.core.util.ReflectionHelper;
+import org.teiid.core.util.StringUtil;
+import org.teiid.language.Call;
+import org.teiid.language.Command;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.QueryExpression;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.resource.spi.BasicManagedConnectionFactory;
+
+
+public class BasicExecutionFactory implements ExecutionFactory {
+
+ protected ConnectorCapabilities capabilities;
+ private static final TypeFacility TYPE_FACILITY = new TypeFacility();
+
+ private String capabilitiesClass;
+ private boolean immutable = false;
+ private boolean exceptionOnMaxRows = false;
+ private int maxResultRows = -1;
+ private boolean xaCapable;
+ private String overrideCapabilitiesFile;
+ private boolean sourceRequired = true;
+
+ @Override
+ public void start() throws ConnectorException {
+ }
+
+ public Class<? extends ConnectorCapabilities> getDefaultCapabilities() {
+ return BasicConnectorCapabilities.class;
+ }
+
+ @Override
+ public ConnectorCapabilities getCapabilities() throws ConnectorException {
+ if (capabilities == null) {
+ // create Capabilities
+ capabilities = BasicManagedConnectionFactory.getInstance(ConnectorCapabilities.class, getCapabilitiesClass(), null, getDefaultCapabilities());
+ }
+
+ // capabilities overload
+ Properties props = getOverrideCapabilities();
+ if (this.capabilities != null && props != null) {
+ this.capabilities = (ConnectorCapabilities) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] {ConnectorCapabilities.class}, new CapabilitesOverloader(this.capabilities, props));
+ }
+ return capabilities;
+ }
+
+ @Override
+ public Execution createExecution(Command command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connectionFactory) throws ConnectorException {
+ if (command instanceof QueryExpression) {
+ return createResultSetExecution((QueryExpression)command, executionContext, metadata, connectionFactory);
+ }
+ if (command instanceof Call) {
+ return createProcedureExecution((Call)command, executionContext, metadata, connectionFactory);
+ }
+ return createUpdateExecution(command, executionContext, metadata, connectionFactory);
+ }
+
+ public ResultSetExecution createResultSetExecution(QueryExpression command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connection) throws ConnectorException {
+ throw new ConnectorException("Unsupported Execution"); //$NON-NLS-1$
+ }
+
+ public ProcedureExecution createProcedureExecution(Call command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connection) throws ConnectorException {
+ throw new ConnectorException("Unsupported Execution");//$NON-NLS-1$
+ }
+
+ public UpdateExecution createUpdateExecution(Command command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connection) throws ConnectorException {
+ throw new ConnectorException("Unsupported Execution");//$NON-NLS-1$
+ }
+
+ // derived
+ private Properties overrideCapabilities;
+
+
+ @Override
+ public LanguageFactory getLanguageFactory() {
+ return LanguageFactory.INSTANCE;
+ }
+
+ @Override
+ public TypeFacility getTypeFacility() {
+ return TYPE_FACILITY;
+ }
+
+ @Override
+ public Properties getOverrideCapabilities() throws ConnectorException {
+ if (this.overrideCapabilities == null && getOverrideCapabilitiesFile() != null) {
+ try {
+ this.overrideCapabilities = new Properties();
+ this.overrideCapabilities.loadFromXML(this.getClass().getResourceAsStream(getOverrideCapabilitiesFile()));
+ } catch (IOException e) {
+ throw new ConnectorException(e);
+ }
+ }
+ return this.overrideCapabilities;
+ }
+
+ public static <T> T getInstance(Class<T> expectedType, String className, Collection ctorObjs, Class defaultClass) throws ConnectorException {
+ try {
+ if (className == null) {
+ if (defaultClass == null) {
+ throw new ConnectorException("Neither class name or default class specified to create an instance"); //$NON-NLS-1$
+ }
+ return expectedType.cast(defaultClass.newInstance());
+ }
+ return expectedType.cast(ReflectionHelper.create(className, ctorObjs, Thread.currentThread().getContextClassLoader()));
+ } catch (TeiidException e) {
+ throw new ConnectorException(e);
+ } catch (IllegalAccessException e) {
+ throw new ConnectorException(e);
+ } catch(InstantiationException e) {
+ throw new ConnectorException(e);
+ }
+ }
+ /**
+ * Overloads the connector capabilities with one defined in the connector binding properties
+ */
+ static final class CapabilitesOverloader implements InvocationHandler {
+ ConnectorCapabilities caps;
+ Properties properties;
+
+ CapabilitesOverloader(ConnectorCapabilities caps, Properties properties){
+ this.caps = caps;
+ this.properties = properties;
+ }
+
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ String value = this.properties.getProperty(method.getName());
+ if (value == null || value.trim().length() == 0 || (args != null && args.length != 0)) {
+ return method.invoke(this.caps, args);
+ }
+ return StringUtil.valueOf(value, method.getReturnType());
+ }
+ }
+
+ @Override
+ public String getCapabilitiesClass() {
+ return capabilitiesClass;
+ }
+
+ public void setCapabilitiesClass(String arg0) {
+ this.capabilitiesClass = arg0;
+ }
+
+ @Override
+ public boolean isImmutable() {
+ return immutable;
+ }
+
+ public void setImmutable(boolean arg0) {
+ this.immutable = arg0;
+ }
+
+ @Override
+ public boolean isExceptionOnMaxRows() {
+ return exceptionOnMaxRows;
+ }
+
+ public void setExceptionOnMaxRows(boolean arg0) {
+ this.exceptionOnMaxRows = arg0;
+ }
+
+ @Override
+ public int getMaxResultRows() {
+ return maxResultRows;
+ }
+
+ public void setMaxResultRows(int arg0) {
+ this.maxResultRows = arg0;
+ }
+
+ @Override
+ public boolean isXaCapable() {
+ return xaCapable;
+ }
+
+ public void setXaCapable(boolean arg0) {
+ this.xaCapable = arg0;
+ }
+
+ @Override
+ public String getOverrideCapabilitiesFile() throws ConnectorException {
+ return this.overrideCapabilitiesFile;
+ }
+
+
+ public void setOverrideCapabilitiesFile(String overrideCapabilitiesFile) {
+ this.overrideCapabilitiesFile = overrideCapabilitiesFile;
+ }
+
+ @Override
+ public boolean isSourceRequired() {
+ return sourceRequired;
+ }
+
+ public void setSourceRequired(boolean value) {
+ this.sourceRequired = value;
+ }
+}
Modified: trunk/connector-api/src/main/java/org/teiid/translator/CacheScope.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/CacheScope.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/CacheScope.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.io.Serializable;
Modified: trunk/connector-api/src/main/java/org/teiid/translator/ConnectorCapabilities.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/ConnectorCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/ConnectorCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,12 +20,12 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.util.List;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.SetQuery;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.SetQuery;
/**
Copied: trunk/connector-api/src/main/java/org/teiid/translator/ConnectorException.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/resource/ConnectorException.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/translator/ConnectorException.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/translator/ConnectorException.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+package org.teiid.translator;
+
+import javax.resource.ResourceException;
+
+/**
+ * An exception the connector writer can return in case of an
+ * error while using the connector.
+ */
+public class ConnectorException extends ResourceException{
+
+ private static final long serialVersionUID = -5980862789340592219L;
+
+ /**
+ * No-arg constructor required by Externalizable semantics.
+ */
+ public ConnectorException() {
+ super();
+ }
+
+ /**
+ * Construct an instance with the message specified.
+ *
+ * @param message A message describing the exception
+ */
+ public ConnectorException( String message ) {
+ super( message );
+ }
+
+ public ConnectorException( String errorCode, String message ) {
+ super( message, errorCode);
+ }
+
+ public ConnectorException( int errorCode, String message ) {
+ super(message, Integer.toString(errorCode));
+ }
+
+
+ /**
+ * Construct an instance from a message and an exception to chain to this one.
+ *
+ * @param code A code denoting the exception
+ * @param e An exception to nest within this one
+ */
+ public ConnectorException( Throwable e, String message ) {
+ super(message,e);
+ }
+
+ /**
+ * Construct an instance with a linked exception specified.
+ *
+ * @param e An exception to chain to this exception
+ */
+ public ConnectorException( Throwable e ) {
+ super( e );
+ }
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/translator/ConnectorException.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/connector-api/src/main/java/org/teiid/translator/DataNotAvailableException.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/DataNotAvailableException.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/DataNotAvailableException.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import org.teiid.core.TeiidRuntimeException;
Modified: trunk/connector-api/src/main/java/org/teiid/translator/Execution.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/Execution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/Execution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,9 +20,8 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
-import org.teiid.resource.ConnectorException;
/**
* An execution represents the state and lifecycle for a particular
Modified: trunk/connector-api/src/main/java/org/teiid/translator/ExecutionContext.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/ExecutionContext.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/ExecutionContext.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.io.Serializable;
Modified: trunk/connector-api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/ExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/ExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,14 +20,13 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.util.Properties;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Command;
+import org.teiid.language.LanguageFactory;
+import org.teiid.metadata.RuntimeMetadata;
Copied: trunk/connector-api/src/main/java/org/teiid/translator/FileConnection.java (from rev 2118, trunk/connector-api/src/main/java/org/teiid/resource/adapter/FileConnection.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/translator/FileConnection.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/translator/FileConnection.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+package org.teiid.translator;
+
+import java.io.File;
+
+import javax.resource.cci.Connection;
+
+public interface FileConnection extends Connection {
+
+ File[] getFiles(String path);
+
+}
Modified: trunk/connector-api/src/main/java/org/teiid/translator/MetadataProvider.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/MetadataProvider.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/MetadataProvider.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,10 +20,9 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.resource.ConnectorException;
+import org.teiid.metadata.MetadataFactory;
public interface MetadataProvider {
Modified: trunk/connector-api/src/main/java/org/teiid/translator/ProcedureExecution.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/ProcedureExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/ProcedureExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,12 +20,11 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.util.List;
-import org.teiid.connector.language.Call;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Call;
/**
* The procedure execution represents the case where a connector can execute a
Modified: trunk/connector-api/src/main/java/org/teiid/translator/ResultSetExecution.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/ResultSetExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/ResultSetExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,13 +20,12 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.util.List;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Call;
+import org.teiid.language.QueryExpression;
/**
* Defines an execution for {@link QueryExpression}s and {@link Call}s that
Modified: trunk/connector-api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/SourceSystemFunctions.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/SourceSystemFunctions.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
/**
* Constants for all the possible standard system push down functions.
Modified: trunk/connector-api/src/main/java/org/teiid/translator/TranslatorProperty.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/TranslatorProperty.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/TranslatorProperty.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
Modified: trunk/connector-api/src/main/java/org/teiid/translator/TypeFacility.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/TypeFacility.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/TypeFacility.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
import java.util.Calendar;
import java.util.Date;
Modified: trunk/connector-api/src/main/java/org/teiid/translator/UpdateExecution.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/resource/cci/UpdateExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/main/java/org/teiid/translator/UpdateExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,13 +20,12 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci;
+package org.teiid.translator;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.Update;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Delete;
+import org.teiid.language.Insert;
+import org.teiid.language.Update;
/**
Modified: trunk/connector-api/src/test/java/org/teiid/connector/TestBasicExecutionFactory.java
===================================================================
--- trunk/connector-api/src/test/java/org/teiid/connector/TestBasicExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connector-api/src/test/java/org/teiid/connector/TestBasicExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,9 +27,9 @@
import java.util.Properties;
import org.junit.Test;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionFactory;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ExecutionFactory;
public class TestBasicExecutionFactory {
Copied: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap (from rev 2118, trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/cci/ldap)
Modified: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectionImpl.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/cci/ldap/LDAPConnectionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.cci.ldap;
+package org.teiid.resource.adapter.ldap;
import java.util.Hashtable;
@@ -44,8 +44,8 @@
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.spi.BasicConnection;
+import org.teiid.translator.ConnectorException;
Modified: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPManagedConnectionFactory.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/cci/ldap/LDAPManagedConnectionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPManagedConnectionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.cci.ldap;
+package org.teiid.resource.adapter.ldap;
import javax.resource.ResourceException;
Modified: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPPlugin.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/cci/ldap/LDAPPlugin.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPPlugin.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.cci.ldap;
+package org.teiid.resource.adapter.ldap;
import java.util.ResourceBundle;
@@ -31,7 +31,7 @@
*/
public class LDAPPlugin {
- public static final String PLUGIN_ID = "org.teiid.resource.cci.ldap" ; //$NON-NLS-1$
+ public static final String PLUGIN_ID = LDAPPlugin.class.getPackage().getName();
/**
* Provides access to the plugin's log and to it's resources.
Copied: trunk/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter (from rev 2118, trunk/connectors/connector-ldap/src/main/resources/org/teiid/resource/cci)
Modified: trunk/connectors/connector-ldap/src/test/java/org/teiid/resource/cci/ldap/TestLDAPConnection.java
===================================================================
--- trunk/connectors/connector-ldap/src/test/java/org/teiid/resource/cci/ldap/TestLDAPConnection.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/connector-ldap/src/test/java/org/teiid/resource/cci/ldap/TestLDAPConnection.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -30,8 +30,8 @@
import org.junit.Test;
import org.mockito.Mockito;
-import org.teiid.resource.cci.ldap.LDAPConnectionImpl;
-import org.teiid.resource.cci.ldap.LDAPManagedConnectionFactory;
+import org.teiid.resource.adapter.ldap.LDAPConnectionImpl;
+import org.teiid.resource.adapter.ldap.LDAPManagedConnectionFactory;
public class TestLDAPConnection {
Modified: trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/cci/salesforce/SalesforceConnectionImpl.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/cci/salesforce/SalesforceConnectionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/cci/salesforce/SalesforceConnectionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -32,7 +32,6 @@
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.salesforce.Messages;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
import org.teiid.resource.adapter.salesforce.execution.DataPayload;
@@ -40,6 +39,7 @@
import org.teiid.resource.adapter.salesforce.execution.DeletedResult;
import org.teiid.resource.adapter.salesforce.execution.UpdatedResult;
import org.teiid.resource.spi.BasicConnection;
+import org.teiid.translator.ConnectorException;
import com.sforce.soap.partner.CallOptions;
import com.sforce.soap.partner.DeleteResult;
Modified: trunk/connectors/connector-text/src/main/java/org/teiid/resource/adapter/file/FileConnectionImpl.java
===================================================================
--- trunk/connectors/connector-text/src/main/java/org/teiid/resource/adapter/file/FileConnectionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/connector-text/src/main/java/org/teiid/resource/adapter/file/FileConnectionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,8 +27,8 @@
import javax.resource.ResourceException;
import org.teiid.core.util.FileUtils;
-import org.teiid.resource.adapter.FileConnection;
import org.teiid.resource.spi.BasicConnection;
+import org.teiid.translator.FileConnection;
/**
Modified: trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/TickerCollectorVisitor.java
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/TickerCollectorVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/TickerCollectorVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import java.util.*;
-import org.teiid.connector.language.*;
-import org.teiid.connector.visitor.framework.HierarchyVisitor;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.*;
+import org.teiid.language.visitor.HierarchyVisitor;
+import org.teiid.translator.ConnectorException;
/**
Modified: trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooCapabilities.java
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.Collections;
import java.util.List;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
+import org.teiid.translator.BasicConnectorCapabilities;
/**
Modified: trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecution.java
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -38,19 +38,19 @@
import java.util.Set;
import java.util.StringTokenizer;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Condition;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Condition;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Expression;
+import org.teiid.language.Select;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ResultSetExecution;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ResultSetExecution;
/**
Modified: trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecutionFactory.java
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/resource/adapter/yahoo/YahooExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,14 +22,14 @@
package org.teiid.resource.adapter.yahoo;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ResultSetExecution;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.Select;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ResultSetExecution;
public class YahooExecutionFactory extends BasicExecutionFactory {
Modified: trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/resource/adapter/yahoo/TestYahooTranslation.java
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/resource/adapter/yahoo/TestYahooTranslation.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/resource/adapter/yahoo/TestYahooTranslation.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,8 +22,8 @@
package org.teiid.resource.adapter.yahoo;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Select;
+import org.teiid.language.Command;
+import org.teiid.language.Select;
import org.teiid.resource.adapter.yahoo.YahooExecution;
import junit.framework.TestCase;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCBaseExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCBaseExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCBaseExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -30,14 +30,14 @@
import java.sql.Statement;
import java.util.List;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Literal;
+import org.teiid.language.Command;
+import org.teiid.language.Literal;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
+import org.teiid.translator.BasicConnectorCapabilities;
/**
@@ -46,7 +46,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#getMaxInCriteriaSize()
+ * @see org.teiid.translator.BasicConnectorCapabilities#getMaxInCriteriaSize()
* @since 4.2
*/
public int getMaxInCriteriaSize() {
@@ -260,21 +260,21 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsInlineViews()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsInlineViews()
*/
public boolean supportsInlineViews() {
return false;
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsQuantifiedCompareCriteriaSome()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsQuantifiedCompareCriteriaSome()
*/
public boolean supportsQuantifiedCompareCriteriaSome() {
return true;
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsSetQueryOrderBy()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsSetQueryOrderBy()
*/
@Override
public boolean supportsSetQueryOrderBy() {
@@ -282,7 +282,7 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsUnions()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsUnions()
*/
public boolean supportsUnions() {
return true;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionException.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionException.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionException.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.sql.SQLException;
import java.util.Arrays;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.JDBCPlugin;
import org.teiid.translator.jdbc.TranslatedCommand;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,24 +27,24 @@
import javax.sql.DataSource;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import org.teiid.core.TeiidException;
import org.teiid.core.util.PropertiesUtils;
import org.teiid.core.util.ReflectionHelper;
import org.teiid.core.util.StringUtil;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.MetadataProvider;
-import org.teiid.resource.cci.ProcedureExecution;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.TranslatorProperty;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.language.Call;
+import org.teiid.language.Command;
+import org.teiid.language.QueryExpression;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.MetadataProvider;
+import org.teiid.translator.ProcedureExecution;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.TranslatorProperty;
+import org.teiid.translator.UpdateExecution;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCMetdataProcessor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCMetdataProcessor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCMetdataProcessor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,18 +34,18 @@
import java.util.Set;
import java.util.TreeMap;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
-import org.teiid.connector.metadata.runtime.BaseColumn;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.ProcedureParameter.Type;
import org.teiid.core.util.StringUtil;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.BaseColumn;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.ProcedureParameter.Type;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.JDBCPlugin;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCProcedureExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCProcedureExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCProcedureExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,13 +28,13 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Command;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ProcedureExecution;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.language.Command;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ProcedureExecution;
import org.teiid.translator.jdbc.JDBCPlugin;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCQueryExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCQueryExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCQueryExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -32,12 +32,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ResultSetExecution;
+import org.teiid.language.Command;
+import org.teiid.language.QueryExpression;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ResultSetExecution;
import org.teiid.translator.jdbc.JDBCPlugin;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCUpdateExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCUpdateExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/JDBCUpdateExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,13 +28,13 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Literal;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Command;
+import org.teiid.language.Literal;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.UpdateExecution;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
@@ -75,7 +75,7 @@
}
/**
- * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(org.teiid.connector.language.Command[])
+ * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(org.teiid.language.Command[])
* @since 4.2
*/
public int[] execute(BatchedUpdates batchedCommand) throws ConnectorException {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/SimpleCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/SimpleCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/resource/adapter/jdbc/SimpleCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -248,7 +248,7 @@
/**
* Return null to indicate no functions are supported.
* @return null
- * @see org.teiid.resource.cci.ConnectorCapabilities#getSupportedFunctions()
+ * @see org.teiid.translator.ConnectorCapabilities#getSupportedFunctions()
*/
public List getSupportedFunctions() {
return null;
@@ -259,7 +259,7 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsUnions()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsUnions()
* @since 4.2
*/
public boolean supportsUnions() {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/AliasModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/AliasModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/AliasModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import java.util.List;
-import org.teiid.connector.language.*;
+import org.teiid.language.*;
public class AliasModifier extends FunctionModifier {
// The alias to use
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,12 +27,12 @@
import java.util.List;
import java.util.Map;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
/**
* Base class for handling the convert function.
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.Function;
+import org.teiid.language.Function;
/**
@@ -36,7 +36,7 @@
public class EscapeSyntaxModifier extends FunctionModifier {
/**
- * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#translate(org.teiid.connector.language.Function)
+ * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#translate(org.teiid.language.Function)
* @since 5.0
*/
public List<?> translate(Function function) {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ExtractFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ExtractFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ExtractFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,11 +27,11 @@
import java.util.List;
import java.util.Map;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.SQLReservedWords;
-import org.teiid.connector.language.SQLReservedWords.Tokens;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.SQLReservedWords;
+import org.teiid.language.SQLReservedWords.Tokens;
+import org.teiid.translator.SourceSystemFunctions;
/**
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,9 +28,9 @@
import java.util.List;
import java.util.Map;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageObject;
+import org.teiid.translator.TypeFacility;
/**
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,13 +25,13 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.Comparison.Operator;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Comparison;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
+import org.teiid.language.Comparison.Operator;
+import org.teiid.translator.TypeFacility;
/**
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ModFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ModFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ModFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,11 +29,11 @@
import java.util.List;
import java.util.Set;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
/**
* Adds mod (remainder) support for non-integral types
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,28 +34,28 @@
import java.util.Map;
import java.util.Set;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.In;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.Like;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SQLReservedWords;
-import org.teiid.connector.language.SearchedCase;
-import org.teiid.connector.language.SetClause;
-import org.teiid.connector.language.SortSpecification;
-import org.teiid.connector.language.Argument.Direction;
-import org.teiid.connector.language.SQLReservedWords.Tokens;
-import org.teiid.connector.language.SetQuery.Operation;
-import org.teiid.connector.language.SortSpecification.Ordering;
-import org.teiid.connector.visitor.util.SQLStringVisitor;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.language.Command;
+import org.teiid.language.Comparison;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Function;
+import org.teiid.language.In;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Like;
+import org.teiid.language.Literal;
+import org.teiid.language.SQLReservedWords;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.SetClause;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.Argument.Direction;
+import org.teiid.language.SQLReservedWords.Tokens;
+import org.teiid.language.SetQuery.Operation;
+import org.teiid.language.SortSpecification.Ordering;
+import org.teiid.language.visitor.SQLStringVisitor;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.Translator.NullOrder;
@@ -197,7 +197,7 @@
}
/**
- * @see org.teiid.connector.visitor.util.SQLStringVisitor#visit(org.teiid.connector.language.Call)
+ * @see org.teiid.language.visitor.SQLStringVisitor#visit(org.teiid.language.Call)
*/
public void visit(Call obj) {
this.prepared = true;
@@ -209,7 +209,7 @@
}
/**
- * @see org.teiid.connector.visitor.util.SQLStringVisitor#visit(org.teiid.connector.language.Literal)
+ * @see org.teiid.language.visitor.SQLStringVisitor#visit(org.teiid.language.Literal)
*/
public void visit(Literal obj) {
if (this.prepared && (replaceWithBinding || TranslatedCommand.isBindEligible(obj) || obj.isBindValue())) {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,12 +26,12 @@
import java.util.List;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.visitor.util.CollectorVisitor;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Command;
+import org.teiid.language.Literal;
+import org.teiid.language.visitor.CollectorVisitor;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.TypeFacility;
/**
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/Translator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/Translator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/Translator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -41,27 +41,27 @@
import java.util.Map;
import java.util.TimeZone;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SetQuery;
-import org.teiid.connector.language.Argument.Direction;
import org.teiid.core.util.ReflectionHelper;
+import org.teiid.language.Argument;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Command;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.SetQuery;
+import org.teiid.language.Argument.Direction;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCCapabilities;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
/**
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/access/AccessSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/access/AccessSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/access/AccessSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
*/
package org.teiid.translator.jdbc.access;
-import org.teiid.resource.cci.ConnectorCapabilities;
+import org.teiid.translator.ConnectorCapabilities;
import org.teiid.translator.jdbc.sybase.SybaseSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2Capabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2Capabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2Capabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -112,7 +112,7 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
@@ -124,7 +124,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -132,7 +132,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2SQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2SQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2SQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,21 +25,21 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.Join;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.Comparison.Operator;
-import org.teiid.connector.language.Join.JoinType;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.Join;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.Comparison.Operator;
+import org.teiid.language.Join.JoinType;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -143,7 +143,7 @@
/**
* Derby supports only SearchedCaseExpression, not CaseExpression.
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsCaseExpressions()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsCaseExpressions()
* @since 5.0
*/
public boolean supportsCaseExpressions() {
@@ -152,7 +152,7 @@
/**
* Derby supports only left and right outer joins.
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsFullOuterJoins()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsFullOuterJoins()
* @since 5.0
*/
public boolean supportsFullOuterJoins() {
@@ -161,7 +161,7 @@
/**
* Inline views (subqueries in the FROM clause) are supported.
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsInlineViews()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsInlineViews()
* @since 4.3
*/
public boolean supportsInlineViews() {
@@ -169,7 +169,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -177,7 +177,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbySQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbySQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbySQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,10 +22,10 @@
package org.teiid.translator.jdbc.derby;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.EscapeSyntaxModifier;
import org.teiid.translator.jdbc.db2.DB2SQLTranslator;
import org.teiid.translator.jdbc.oracle.LeftOrRightFunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Capabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Capabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Capabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,7 +26,7 @@
import java.util.List;
import org.teiid.resource.adapter.jdbc.JDBCCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
public class H2Capabilities extends JDBCCapabilities {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Translator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Translator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/h2/H2Translator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,10 +26,10 @@
import java.sql.Time;
import java.sql.Timestamp;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/AddDiffModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/AddDiffModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/AddDiffModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,12 +27,12 @@
import java.util.List;
import java.util.Map;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SQLReservedWords;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
+import org.teiid.language.SQLReservedWords;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.ExtractFunctionModifier;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,7 +26,7 @@
import java.util.List;
import org.teiid.resource.adapter.jdbc.JDBCCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
public class HsqlCapabilities extends JDBCCapabilities {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,10 +26,10 @@
import java.sql.Time;
import java.sql.Timestamp;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.FunctionModifier;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/informix/InformixSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/informix/InformixSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/informix/InformixSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,10 +24,10 @@
*/
package org.teiid.translator.jdbc.informix;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/BitFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/BitFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/BitFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,9 +25,9 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Capabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Capabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Capabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Translator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Translator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5Translator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,11 +25,11 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Function;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Function;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.FunctionModifier;
public class MySQL5Translator extends MySQLTranslator {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,7 +26,7 @@
import java.util.List;
import org.teiid.resource.adapter.jdbc.JDBCCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,14 +31,14 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Function;
+import org.teiid.language.Function;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.FunctionModifier;
import org.teiid.translator.jdbc.LocateFunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/ConcatFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/ConcatFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/ConcatFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,15 +26,15 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Condition;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SearchedWhenClause;
-import org.teiid.connector.language.AndOr.Operator;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Condition;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
+import org.teiid.language.SearchedWhenClause;
+import org.teiid.language.AndOr.Operator;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/DayWeekQuarterFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/DayWeekQuarterFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/DayWeekQuarterFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Function;
+import org.teiid.language.Function;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/LeftOrRightFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/LeftOrRightFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/LeftOrRightFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,10 +25,10 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/Log10FunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/Log10FunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/Log10FunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,10 +24,10 @@
import java.util.List;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/MonthOrDayNameFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/MonthOrDayNameFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/MonthOrDayNameFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,11 +25,11 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,7 +28,7 @@
import java.util.List;
import org.teiid.resource.adapter.jdbc.JDBCCapabilities;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
/**
@@ -122,7 +122,7 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
@@ -137,7 +137,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -145,7 +145,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -35,30 +35,30 @@
import java.util.Collection;
import java.util.List;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.SQLReservedWords.Tokens;
-import org.teiid.connector.language.SetQuery.Operation;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.visitor.util.CollectorVisitor;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Command;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Expression;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Function;
+import org.teiid.language.Insert;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.Select;
+import org.teiid.language.SQLReservedWords.Tokens;
+import org.teiid.language.SetQuery.Operation;
+import org.teiid.language.visitor.CollectorVisitor;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
+import org.teiid.metadata.Column;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.ExtractFunctionModifier;
@@ -348,7 +348,7 @@
/**
* Don't fully qualify elements if table = DUAL or element = ROWNUM or special stuff is packed into name in source value.
*
- * @see org.teiid.connector.visitor.util.SQLStringVisitor#skipGroupInElement(java.lang.String, java.lang.String)
+ * @see org.teiid.language.visitor.SQLStringVisitor#skipGroupInElement(java.lang.String, java.lang.String)
* @since 5.0
*/
@Override
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSpatialFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSpatialFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleSpatialFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,9 +25,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.Literal;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.Literal;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/LocateFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/LocateFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/LocateFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,11 +25,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
+import org.teiid.translator.TypeFacility;
public class LocateFunctionModifier extends org.teiid.translator.jdbc.LocateFunctionModifier {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -263,7 +263,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -271,7 +271,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.translator.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,19 +28,19 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SQLReservedWords;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.SQLReservedWords;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.EscapeSyntaxModifier;
@@ -188,7 +188,7 @@
/**
* Postgres doesn't provide min/max(boolean), so this conversion writes a min(BooleanValue) as
* bool_and(BooleanValue)
- * @see org.teiid.connector.visitor.framework.LanguageObjectVisitor#visit(org.teiid.connector.language.AggregateFunction)
+ * @see org.teiid.language.visitor.LanguageObjectVisitor#visit(org.teiid.language.AggregateFunction)
* @since 4.3
*/
@Override
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -116,7 +116,7 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,12 +27,12 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageObject;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.sybase.SybaseSQLTranslator;
/**
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SubstringFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SubstringFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SubstringFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,11 +25,11 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.FunctionModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -117,7 +117,7 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
@@ -125,7 +125,7 @@
}
/**
- * @see org.teiid.resource.adapter.BasicConnectorCapabilities#getMaxFromGroups()
+ * @see org.teiid.translator.BasicConnectorCapabilities#getMaxFromGroups()
*/
public int getMaxFromGroups() {
return 50;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,16 +28,16 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.OrderBy;
-import org.teiid.connector.language.SetQuery;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Command;
+import org.teiid.language.Function;
+import org.teiid.language.Limit;
+import org.teiid.language.OrderBy;
+import org.teiid.language.SetQuery;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.EscapeSyntaxModifier;
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidCapabilities.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -36,7 +36,7 @@
public class TeiidCapabilities extends JDBCCapabilities {
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#getSupportedFunctions()
+ * @see org.teiid.translator.ConnectorCapabilities#getSupportedFunctions()
* @since 4.3
*/
public List<String> getSupportedFunctions() {
@@ -140,7 +140,7 @@
}
/**
- * @see org.teiid.resource.cci.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.translator.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,9 +26,9 @@
import junit.framework.Assert;
import org.mockito.Mockito;
-import org.teiid.connector.language.Command;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.language.Command;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,10 +31,10 @@
import org.junit.Test;
import org.mockito.Mockito;
-import org.teiid.connector.language.Command;
+import org.teiid.language.Command;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.JDBCProcedureExecution;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.Translator;
public class TestJDBCProcedureExecution {
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,13 +28,13 @@
import org.junit.Test;
import org.mockito.Mockito;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.Literal;
+import org.teiid.language.Command;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Insert;
+import org.teiid.language.Literal;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.JDBCUpdateExecution;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.Translator;
public class TestJDBCUpdateExecution {
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -30,12 +30,12 @@
import junit.framework.Assert;
import org.mockito.Mockito;
-import org.teiid.connector.language.Command;
import org.teiid.core.TeiidRuntimeException;
+import org.teiid.language.Command;
import org.teiid.query.function.metadata.FunctionMetadataReader;
import org.teiid.query.function.metadata.FunctionMethod;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,9 +27,9 @@
import java.util.List;
import org.teiid.cdk.CommandBuilder;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.language.Function;
+import org.teiid.language.Literal;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.unittest.TimestampUtil;
import org.teiid.translator.jdbc.EscapeSyntaxModifier;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestExtractFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestExtractFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestExtractFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,16 +27,16 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.NamedTable;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
import org.teiid.query.unittest.TimestampUtil;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.SourceSystemFunctions;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.ExtractFunctionModifier;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestLocateFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestLocateFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestLocateFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,12 +27,12 @@
import java.util.Arrays;
import org.junit.Test;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.LocateFunctionModifier;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestModFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestModFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestModFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,12 +28,12 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.ModFunctionModifier;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,8 +26,6 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl;
import org.teiid.dqp.internal.datamgr.language.TestInsertImpl;
@@ -35,10 +33,12 @@
import org.teiid.dqp.internal.datamgr.language.TestQueryImpl;
import org.teiid.dqp.internal.datamgr.language.TestUpdateImpl;
import org.teiid.dqp.internal.datamgr.language.TstLanguageBridgeFactory;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.LanguageObject;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.Translator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,10 +25,10 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
-import org.teiid.connector.language.Command;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Command;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
import org.teiid.translator.jdbc.access.AccessSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2ConvertModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2ConvertModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2ConvertModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,12 +29,12 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
import org.teiid.query.unittest.TimestampUtil;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.db2.DB2SQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,12 +27,12 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
-import org.teiid.connector.language.Command;
import org.teiid.core.util.UnitTestUtil;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Command;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.db2.DB2SQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,9 +25,9 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.derby.DerbySQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/TestH2Translator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/TestH2Translator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/TestH2Translator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.h2.H2Translator;
public class TestH2Translator {
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQL5Translator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQL5Translator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQL5Translator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.mysql.MySQL5Translator;
/**
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,9 +25,9 @@
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.mysql.MySQLTranslator;
/**
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,12 +27,12 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
import org.teiid.query.unittest.TimestampUtil;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.oracle.OracleSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLeftOrRightFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLeftOrRightFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLeftOrRightFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,9 +26,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.oracle.OracleSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLog10FunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLog10FunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLog10FunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,11 +27,11 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.visitor.util.SQLStringVisitor;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
+import org.teiid.language.visitor.SQLStringVisitor;
import org.teiid.translator.jdbc.oracle.Log10FunctionModifier;
/**
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,9 +27,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
import org.teiid.query.unittest.TimestampUtil;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.translator.jdbc.SQLConversionVisitor;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleConvertModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleConvertModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleConvertModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,12 +31,12 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
import org.teiid.query.unittest.TimestampUtil;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.Translator;
import org.teiid.translator.jdbc.oracle.OracleSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,24 +29,24 @@
import org.junit.Before;
import org.junit.Test;
import org.teiid.cdk.CommandBuilder;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.UnitTestUtil;
import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
import org.teiid.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
+import org.teiid.language.Command;
+import org.teiid.metadata.Column;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.unittest.FakeMetadataFactory;
import org.teiid.query.unittest.RealMetadataFactory;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.Translator;
import org.teiid.translator.jdbc.oracle.OracleSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestSubstringFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestSubstringFunctionModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestSubstringFunctionModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,11 +26,11 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.TypeFacility;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.oracle.OracleSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.postgresql.PostgreSQLTranslator;
public class TestPostgreSQLTranslator {
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,19 +26,19 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.Command;
+import org.teiid.metadata.Column;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.unittest.RealMetadataFactory;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.sqlserver.SQLServerSQLTranslator;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -30,14 +30,14 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageFactory;
-import org.teiid.connector.language.Literal;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.Literal;
import org.teiid.query.unittest.TimestampUtil;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
+import org.teiid.translator.ConnectorException;
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.sybase.SybaseSQLTranslator;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,11 +27,11 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
-import org.teiid.connector.language.Command;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Command;
import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory;
import org.teiid.resource.adapter.jdbc.TranslationHelper;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.jdbc.TranslatedCommand;
import org.teiid.translator.jdbc.sybase.SybaseSQLTranslator;
Copied: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap (from rev 2118, trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap)
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/IQueryToLdapSearchParser.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/IQueryToLdapSearchParser.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/IQueryToLdapSearchParser.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,7 +31,7 @@
*
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
@@ -47,34 +47,34 @@
import javax.naming.directory.SearchControls;
import javax.naming.ldap.SortKey;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.AndOr;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Condition;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Exists;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.In;
-import org.teiid.connector.language.Like;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Not;
-import org.teiid.connector.language.OrderBy;
-import org.teiid.connector.language.ScalarSubquery;
-import org.teiid.connector.language.SearchedCase;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.SortSpecification;
-import org.teiid.connector.language.TableReference;
-import org.teiid.connector.language.Comparison.Operator;
-import org.teiid.connector.language.SortSpecification.Ordering;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.Table;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.AndOr;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Comparison;
+import org.teiid.language.Condition;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Exists;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.In;
+import org.teiid.language.Like;
+import org.teiid.language.Limit;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Not;
+import org.teiid.language.OrderBy;
+import org.teiid.language.ScalarSubquery;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.Select;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.TableReference;
+import org.teiid.language.Comparison.Operator;
+import org.teiid.language.SortSpecification.Ordering;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.Table;
+import org.teiid.translator.ConnectorException;
@@ -537,7 +537,7 @@
return;
}
filterList.add("("); //$NON-NLS-1$
- filterList.add(parseCompoundCriteriaOp(org.teiid.connector.language.AndOr.Operator.OR));
+ filterList.add(parseCompoundCriteriaOp(org.teiid.language.AndOr.Operator.OR));
Iterator rhsItr = rhsList.iterator();
while(rhsItr.hasNext()) {
addCompareCriteriaToList(filterList, Operator.EQ, getExpressionString(lhs),
@@ -641,7 +641,7 @@
/**
* Helper method for getting runtime {@link org.teiid.connector.metadata.runtime.Element} from a
- * {@link org.teiid.connector.language.DerivedColumn}.
+ * {@link org.teiid.language.DerivedColumn}.
* @param symbol Input ISelectSymbol
* @return Element returned metadata runtime Element
*/
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPConnectorCapabilities.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectorCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPConnectorCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
+import org.teiid.translator.BasicConnectorCapabilities;
/**
* This class extends the BasicConnectorCapabilities class, and establishes
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPConnectorConstants.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectorConstants.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPConnectorConstants.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
import javax.naming.directory.*;
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPExecutionFactory.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,23 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
import javax.naming.ldap.LdapContext;
import javax.resource.ResourceException;
import javax.resource.cci.ConnectionFactory;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.TranslatorProperty;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.language.Command;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.Select;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.TranslatorProperty;
+import org.teiid.translator.UpdateExecution;
/**
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPPlugin.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPPlugin.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPPlugin.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
import java.util.ResourceBundle;
@@ -31,7 +31,7 @@
*/
public class LDAPPlugin {
- public static final String PLUGIN_ID = "org.teiid.resource.adapter.ldap" ; //$NON-NLS-1$
+ public static final String PLUGIN_ID = LDAPPlugin.class.getPackage().getName();
/**
* Provides access to the plugin's log and to it's resources.
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSearchDetails.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPSearchDetails.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSearchDetails.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
import java.util.ArrayList;
import java.util.Iterator;
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPSyncQueryExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -69,7 +69,7 @@
*
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
import java.io.IOException;
import java.sql.Timestamp;
@@ -93,13 +93,13 @@
import javax.naming.ldap.SortControl;
import javax.naming.ldap.SortKey;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.Column;
+import org.teiid.language.Select;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.cci.ResultSetExecution;
+import org.teiid.metadata.Column;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ResultSetExecution;
Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPUpdateExecution.java
===================================================================
--- trunk/connectors/translator-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPUpdateExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPUpdateExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package org.teiid.resource.adapter.ldap;
+package org.teiid.translator.ldap;
import java.util.List;
@@ -32,25 +32,25 @@
import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapContext;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Condition;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SetClause;
-import org.teiid.connector.language.Update;
-import org.teiid.connector.language.Comparison.Operator;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Command;
+import org.teiid.language.Comparison;
+import org.teiid.language.Condition;
+import org.teiid.language.Delete;
+import org.teiid.language.Expression;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Insert;
+import org.teiid.language.Literal;
+import org.teiid.language.SetClause;
+import org.teiid.language.Update;
+import org.teiid.language.Comparison.Operator;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.UpdateExecution;
Copied: trunk/connectors/translator-ldap/src/main/resources/org/teiid/translator (from rev 2118, trunk/connectors/translator-ldap/src/main/resources/org/teiid/resource/adapter)
Modified: trunk/connectors/translator-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestIQueryToLdapSearchParser.java
===================================================================
--- trunk/connectors/translator-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestIQueryToLdapSearchParser.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestIQueryToLdapSearchParser.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,24 +34,24 @@
import junit.framework.TestCase;
import org.teiid.cdk.CommandBuilder;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
import org.teiid.core.types.DataTypeManager;
import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
+import org.teiid.language.Command;
+import org.teiid.language.Select;
+import org.teiid.metadata.Column;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
+import org.teiid.metadata.Column.SearchType;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.unittest.RealMetadataFactory;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.ldap.IQueryToLdapSearchParser;
-import org.teiid.resource.adapter.ldap.LDAPExecutionFactory;
-import org.teiid.resource.adapter.ldap.LDAPSearchDetails;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ldap.IQueryToLdapSearchParser;
+import org.teiid.translator.ldap.LDAPExecutionFactory;
+import org.teiid.translator.ldap.LDAPSearchDetails;
/**
Modified: trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackCapabilities.java
===================================================================
--- trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
+import org.teiid.translator.BasicConnectorCapabilities;
/**
Modified: trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecution.java
===================================================================
--- trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -33,20 +33,20 @@
import java.util.List;
import java.util.Random;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.Argument.Direction;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.language.Command;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.Argument.Direction;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ProcedureExecution;
-import org.teiid.resource.cci.TypeFacility;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ProcedureExecution;
+import org.teiid.translator.TypeFacility;
+import org.teiid.translator.UpdateExecution;
/**
Modified: trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecutionFactory.java
===================================================================
--- trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-loopback/src/main/java/org/teiid/resource/adapter/loopback/LoopbackExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,14 +22,14 @@
package org.teiid.resource.adapter.loopback;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.Execution;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.TranslatorProperty;
+import org.teiid.language.Command;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.Execution;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.TranslatorProperty;
/**
* Loopback connector.
Modified: trunk/connectors/translator-loopback/src/test/java/org/teiid/resource/adaptor/loopback/TestLoopbackExecution.java
===================================================================
--- trunk/connectors/translator-loopback/src/test/java/org/teiid/resource/adaptor/loopback/TestLoopbackExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-loopback/src/test/java/org/teiid/resource/adaptor/loopback/TestLoopbackExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,9 +28,9 @@
import junit.framework.TestCase;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.loopback.LoopbackExecution;
import org.teiid.resource.adapter.loopback.LoopbackExecutionFactory;
+import org.teiid.translator.ConnectorException;
import com.metamatrix.cdk.api.ConnectorHost;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/MetadataProcessor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/MetadataProcessor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/MetadataProcessor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -6,16 +6,16 @@
import java.util.List;
import java.util.Map;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.KeyRecord;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
import org.teiid.core.types.DataTypeManager;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.KeyRecord;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.Column.SearchType;
+import org.teiid.translator.ConnectorException;
import com.sforce.soap.partner.ChildRelationship;
import com.sforce.soap.partner.DescribeGlobalResult;
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/NameUtil.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/NameUtil.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/NameUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -7,7 +7,7 @@
*/
package org.teiid.resource.adapter.salesforce;
-import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.language.SQLReservedWords;
public class NameUtil {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceExecutionFactory.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,29 +22,29 @@
package org.teiid.resource.adapter.salesforce;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.language.Call;
+import org.teiid.language.Command;
+import org.teiid.language.QueryExpression;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.salesforce.execution.DeleteExecutionImpl;
import org.teiid.resource.adapter.salesforce.execution.InsertExecutionImpl;
import org.teiid.resource.adapter.salesforce.execution.ProcedureExecutionParentImpl;
import org.teiid.resource.adapter.salesforce.execution.QueryExecutionImpl;
import org.teiid.resource.adapter.salesforce.execution.UpdateExecutionImpl;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.MetadataProvider;
-import org.teiid.resource.cci.ProcedureExecution;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.TranslatorProperty;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.MetadataProvider;
+import org.teiid.translator.ProcedureExecution;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.TranslatorProperty;
+import org.teiid.translator.UpdateExecution;
-public class SalesForceExecutionFactory extends org.teiid.resource.adapter.BasicExecutionFactory implements MetadataProvider {
+public class SalesForceExecutionFactory extends org.teiid.translator.BasicExecutionFactory implements MetadataProvider {
private String connectorStateClass;
private boolean auditModelFields = false;
@@ -87,11 +87,11 @@
@Override
public UpdateExecution createUpdateExecution(Command command, ExecutionContext executionContext, RuntimeMetadata metadata, Object connectionFactory) throws ConnectorException {
UpdateExecution result = null;
- if(command instanceof org.teiid.connector.language.Delete) {
+ if(command instanceof org.teiid.language.Delete) {
result = new DeleteExecutionImpl(command, (SalesforceConnection)connectionFactory, metadata, executionContext);
- } else if (command instanceof org.teiid.connector.language.Insert) {
+ } else if (command instanceof org.teiid.language.Insert) {
result = new InsertExecutionImpl(command, (SalesforceConnection)connectionFactory, metadata, executionContext);
- } else if (command instanceof org.teiid.connector.language.Update) {
+ } else if (command instanceof org.teiid.language.Update) {
result = new UpdateExecutionImpl(command, (SalesforceConnection)connectionFactory, metadata, executionContext);
}
return result;
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceCapabilities.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
+import org.teiid.translator.BasicConnectorCapabilities;
public class SalesforceCapabilities extends BasicConnectorCapabilities {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnection.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnection.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnection.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,10 +25,10 @@
import javax.xml.datatype.XMLGregorianCalendar;
-import org.teiid.resource.ConnectorException;
import org.teiid.resource.adapter.salesforce.execution.DataPayload;
import org.teiid.resource.adapter.salesforce.execution.DeletedResult;
import org.teiid.resource.adapter.salesforce.execution.UpdatedResult;
+import org.teiid.translator.ConnectorException;
import com.sforce.soap.partner.DescribeGlobalResult;
import com.sforce.soap.partner.DescribeSObjectResult;
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/Util.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/Util.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/Util.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public class Util {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/AbstractUpdateExecution.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/AbstractUpdateExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/AbstractUpdateExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,18 +23,18 @@
import java.util.ArrayList;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Condition;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
+import org.teiid.language.Command;
+import org.teiid.language.Comparison;
+import org.teiid.language.Condition;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
import org.teiid.resource.adapter.salesforce.Util;
import org.teiid.resource.adapter.salesforce.execution.visitors.IQueryProvidingVisitor;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.UpdateExecution;
import com.sforce.soap.partner.QueryResult;
import com.sforce.soap.partner.sobject.SObject;
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/DeleteExecutionImpl.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/DeleteExecutionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/DeleteExecutionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -21,13 +21,13 @@
*/
package org.teiid.resource.adapter.salesforce.execution;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Command;
+import org.teiid.language.Delete;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
import org.teiid.resource.adapter.salesforce.execution.visitors.DeleteVisitor;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
public class DeleteExecutionImpl extends AbstractUpdateExecution {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetDeletedExecutionImpl.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetDeletedExecutionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetDeletedExecutionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -9,9 +9,9 @@
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.translator.ConnectorException;
/**
*
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetUpdatedExecutionImpl.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetUpdatedExecutionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/GetUpdatedExecutionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -10,9 +10,9 @@
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.translator.ConnectorException;
/**
*
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/InsertExecutionImpl.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/InsertExecutionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/InsertExecutionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,13 +22,13 @@
package org.teiid.resource.adapter.salesforce.execution;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Command;
+import org.teiid.language.Insert;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
import org.teiid.resource.adapter.salesforce.execution.visitors.InsertVisitor;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
public class InsertExecutionImpl extends AbstractUpdateExecution {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParent.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParent.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParent.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,9 +1,9 @@
package org.teiid.resource.adapter.salesforce.execution;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.language.Call;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ExecutionContext;
public interface ProcedureExecutionParent {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParentImpl.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParentImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/ProcedureExecutionParentImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -2,13 +2,13 @@
import java.util.List;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Call;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ProcedureExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ProcedureExecution;
public class ProcedureExecutionParentImpl implements ProcedureExecution, ProcedureExecutionParent {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/QueryExecutionImpl.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/QueryExecutionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/QueryExecutionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -33,27 +33,27 @@
import javax.xml.namespace.QName;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.Join;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.TableReference;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.connector.metadata.runtime.Table;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.Join;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.Select;
+import org.teiid.language.TableReference;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.Table;
import org.teiid.resource.adapter.salesforce.Messages;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
import org.teiid.resource.adapter.salesforce.Util;
import org.teiid.resource.adapter.salesforce.execution.visitors.JoinQueryVisitor;
import org.teiid.resource.adapter.salesforce.execution.visitors.SelectVisitor;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ResultSetExecution;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ResultSetExecution;
import org.w3c.dom.Element;
import com.sforce.soap.partner.QueryResult;
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/SalesforceProcedureExecution.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/SalesforceProcedureExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/SalesforceProcedureExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -2,7 +2,7 @@
import java.util.List;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public interface SalesforceProcedureExecution {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/UpdateExecutionImpl.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/UpdateExecutionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/UpdateExecutionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,18 +27,18 @@
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SetClause;
-import org.teiid.connector.language.Update;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Command;
+import org.teiid.language.Literal;
+import org.teiid.language.SetClause;
+import org.teiid.language.Update;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.resource.adapter.salesforce.SalesforceConnection;
import org.teiid.resource.adapter.salesforce.Util;
import org.teiid.resource.adapter.salesforce.execution.visitors.UpdateVisitor;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
public class UpdateExecutionImpl extends AbstractUpdateExecution {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/CriteriaVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/CriteriaVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/CriteriaVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,24 +29,24 @@
import java.util.List;
import java.util.Map;
-import org.teiid.connector.language.AndOr;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.In;
-import org.teiid.connector.language.Like;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Not;
-import org.teiid.connector.language.Comparison.Operator;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.visitor.framework.HierarchyVisitor;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.AndOr;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Comparison;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.In;
+import org.teiid.language.Like;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Not;
+import org.teiid.language.Comparison.Operator;
+import org.teiid.language.visitor.HierarchyVisitor;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.Table;
import org.teiid.resource.adapter.salesforce.Messages;
import org.teiid.resource.adapter.salesforce.Util;
+import org.teiid.translator.ConnectorException;
/**
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/DeleteVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/DeleteVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/DeleteVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,9 +23,9 @@
import java.util.Iterator;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Delete;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.ConnectorException;
public class DeleteVisitor extends CriteriaVisitor implements IQueryProvidingVisitor {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/ICriteriaVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/ICriteriaVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/ICriteriaVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -21,7 +21,7 @@
*/
package org.teiid.resource.adapter.salesforce.execution.visitors;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public interface ICriteriaVisitor {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/IQueryProvidingVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/IQueryProvidingVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/IQueryProvidingVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -21,7 +21,7 @@
*/
package org.teiid.resource.adapter.salesforce.execution.visitors;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public interface IQueryProvidingVisitor extends ICriteriaVisitor {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/InsertVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/InsertVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/InsertVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,14 +27,14 @@
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Expression;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Insert;
+import org.teiid.language.Literal;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.ConnectorException;
public class InsertVisitor extends CriteriaVisitor {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/JoinQueryVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/JoinQueryVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/JoinQueryVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -1,18 +1,18 @@
package org.teiid.resource.adapter.salesforce.execution.visitors;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Join;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.TableReference;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Comparison;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Expression;
+import org.teiid.language.Join;
+import org.teiid.language.NamedTable;
+import org.teiid.language.TableReference;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.Table;
import org.teiid.resource.adapter.salesforce.Util;
+import org.teiid.translator.ConnectorException;
/**
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/SelectVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/SelectVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/SelectVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,21 +27,21 @@
import java.util.List;
import java.util.Map;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Limit;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Expression;
+import org.teiid.language.Limit;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Select;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.Table;
import org.teiid.resource.adapter.salesforce.Constants;
import org.teiid.resource.adapter.salesforce.Messages;
import org.teiid.resource.adapter.salesforce.Util;
+import org.teiid.translator.ConnectorException;
public class SelectVisitor extends CriteriaVisitor implements IQueryProvidingVisitor {
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/UpdateVisitor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/UpdateVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/execution/visitors/UpdateVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -21,9 +21,9 @@
*/
package org.teiid.resource.adapter.salesforce.execution.visitors;
-import org.teiid.connector.language.Update;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
+import org.teiid.language.Update;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.ConnectorException;
public class UpdateVisitor extends CriteriaVisitor implements IQueryProvidingVisitor {
Modified: trunk/connectors/translator-salesforce/src/test/java/org/teiid/resource/adapter/salesforce/execution/visitors/TestVisitors.java
===================================================================
--- trunk/connectors/translator-salesforce/src/test/java/org/teiid/resource/adapter/salesforce/execution/visitors/TestVisitors.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-salesforce/src/test/java/org/teiid/resource/adapter/salesforce/execution/visitors/TestVisitors.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,15 +27,15 @@
import java.util.List;
import org.junit.Test;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.Select;
+import org.teiid.metadata.Column;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
+import org.teiid.metadata.Column.SearchType;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.unittest.RealMetadataFactory;
import org.teiid.resource.adapter.salesforce.execution.visitors.JoinQueryVisitor;
Modified: trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextCapabilities.java
===================================================================
--- trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextCapabilities.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextCapabilities.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,7 +22,7 @@
package org.teiid.resource.adapter.text;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
+import org.teiid.translator.BasicConnectorCapabilities;
public class TextCapabilities extends BasicConnectorCapabilities {
Modified: trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextConnectionImpl.java
===================================================================
--- trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextConnectionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextConnectionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -41,8 +41,8 @@
import org.teiid.core.util.StringUtil;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.FileConnection;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.FileConnection;
Modified: trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextExecutionFactory.java
===================================================================
--- trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextExecutionFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextExecutionFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -37,22 +37,22 @@
import javax.resource.ResourceException;
import javax.resource.cci.ConnectionFactory;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.connector.metadata.runtime.Table;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.Select;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.adapter.FileConnection;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.MetadataProvider;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.TranslatorProperty;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.Table;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.FileConnection;
+import org.teiid.translator.MetadataProvider;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.TranslatorProperty;
+import org.teiid.translator.TypeFacility;
/**
Modified: trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextSynchExecution.java
===================================================================
--- trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextSynchExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/main/java/org/teiid/resource/adapter/text/TextSynchExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,19 +31,19 @@
import java.util.List;
import java.util.Properties;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.Column;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Command;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Select;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.metadata.Column;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.TypeFacility;
/**
* The essential part that executes the query. It keeps all the execution
@@ -241,7 +241,7 @@
/**
* Helper method for getting runtime {@link org.teiid.connector.metadata.runtime.Element} from a
- * {@link org.teiid.connector.language.DerivedColumn}.
+ * {@link org.teiid.language.DerivedColumn}.
* @param symbol Input ISelectSymbol
* @return Element returned metadata runtime Element
*/
Modified: trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestMultiFileTextSynchExecution.java
===================================================================
--- trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestMultiFileTextSynchExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestMultiFileTextSynchExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -30,7 +30,7 @@
import junit.framework.TestCase;
import org.teiid.query.unittest.TimestampUtil;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
import com.metamatrix.cdk.api.ConnectorHost;
Modified: trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestRowHeaderTextSynchExecution.java
===================================================================
--- trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestRowHeaderTextSynchExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestRowHeaderTextSynchExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
Modified: trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestTextConnector.java
===================================================================
--- trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestTextConnector.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/TestTextConnector.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,11 +29,11 @@
import java.util.Properties;
import org.junit.Test;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.connector.metadata.runtime.Table;
import org.teiid.core.types.DataTypeManager;
-import org.teiid.resource.cci.MetadataProvider;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.Table;
+import org.teiid.translator.MetadataProvider;
/**
Modified: trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/Util.java
===================================================================
--- trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/Util.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/Util.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -32,18 +32,18 @@
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.FileUtils;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.metadata.Column;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.unittest.RealMetadataFactory;
-import org.teiid.resource.adapter.FileConnection;
+import org.teiid.translator.FileConnection;
import com.metamatrix.cdk.api.ConnectorHost;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/CapabilitiesConverter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/CapabilitiesConverter.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/CapabilitiesConverter.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,7 +28,7 @@
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability;
-import org.teiid.resource.cci.ConnectorCapabilities;
+import org.teiid.translator.ConnectorCapabilities;
/**
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -36,9 +36,6 @@
import javax.naming.NamingException;
import org.teiid.common.buffer.BlockedException;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
-import org.teiid.connector.metadata.runtime.MetadataStore;
import org.teiid.core.util.Assertion;
import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.cache.DQPContextCache;
@@ -52,19 +49,22 @@
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
import org.teiid.logging.CommandLogMessage.Event;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.MetadataFactory;
+import org.teiid.metadata.MetadataStore;
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Scope;
import org.teiid.query.sql.lang.Command;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ExecutionFactory;
-import org.teiid.resource.cci.MetadataProvider;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ExecutionFactory;
+import org.teiid.translator.MetadataProvider;
/**
- * The <code>ConnectorManager</code> manages a {@link org.teiid.resource.adapter.BasicExecutionFactory Connector}
+ * The <code>ConnectorManager</code> manages a {@link org.teiid.translator.BasicExecutionFactory Connector}
* and its associated workers' state.
*/
public class ConnectorManager {
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWork.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWork.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWork.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import org.teiid.common.buffer.BlockedException;
import org.teiid.dqp.message.AtomicResultsMessage;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
/**
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -30,9 +30,6 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.common.buffer.BlockedException;
import org.teiid.common.buffer.TupleBuffer;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.TransformationException;
@@ -44,22 +41,25 @@
import org.teiid.dqp.message.AtomicRequestID;
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.dqp.message.AtomicResultsMessage;
+import org.teiid.language.Call;
+import org.teiid.language.QueryExpression;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.CommandLogMessage.Event;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataAdapter;
import org.teiid.query.metadata.TempMetadataStore;
import org.teiid.query.sql.lang.Command;
import org.teiid.query.sql.lang.StoredProcedure;
import org.teiid.query.sql.symbol.SingleElementSymbol;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.Execution;
-import org.teiid.resource.cci.ExecutionFactory;
-import org.teiid.resource.cci.ProcedureExecution;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.Execution;
+import org.teiid.translator.ExecutionFactory;
+import org.teiid.translator.ProcedureExecution;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.UpdateExecution;
public class ConnectorWorkItem implements ConnectorWork {
@@ -82,7 +82,7 @@
private ExecutionContextImpl securityContext;
private volatile ResultSetExecution execution;
private ProcedureBatchHandler procedureBatchHandler;
- private org.teiid.connector.language.Command translatedCommand;
+ private org.teiid.language.Command translatedCommand;
private Class<?>[] schema;
private List<Integer> convertToRuntimeType;
private boolean[] convertToDesiredRuntimeType;
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -36,8 +36,8 @@
import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.cache.DQPContextCache;
import org.teiid.dqp.internal.process.DQPWorkContext;
-import org.teiid.resource.cci.CacheScope;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.CacheScope;
+import org.teiid.translator.ExecutionContext;
/**
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ProcedureBatchHandler.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ProcedureBatchHandler.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ProcedureBatchHandler.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -30,12 +30,12 @@
import java.util.Collections;
import java.util.List;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Argument.Direction;
import org.teiid.dqp.DQPPlugin;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ProcedureExecution;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.language.Argument.Direction;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ProcedureExecution;
class ProcedureBatchHandler {
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/TranslatorRepository.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/TranslatorRepository.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/TranslatorRepository.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.teiid.resource.cci.ExecutionFactory;
+import org.teiid.translator.ExecutionFactory;
public class TranslatorRepository implements Serializable{
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/language/LanguageBridgeFactory.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/language/LanguageBridgeFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/language/LanguageBridgeFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,42 +28,42 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.client.metadata.ParameterInfo;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.AndOr;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Condition;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.DerivedTable;
-import org.teiid.connector.language.Exists;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.In;
-import org.teiid.connector.language.InsertValueSource;
-import org.teiid.connector.language.IsNull;
-import org.teiid.connector.language.Join;
-import org.teiid.connector.language.Like;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Not;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.language.SearchedCase;
-import org.teiid.connector.language.SearchedWhenClause;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.SortSpecification;
-import org.teiid.connector.language.SubqueryComparison;
-import org.teiid.connector.language.SubqueryIn;
-import org.teiid.connector.language.TableReference;
-import org.teiid.connector.language.Argument.Direction;
-import org.teiid.connector.language.Comparison.Operator;
-import org.teiid.connector.language.SortSpecification.Ordering;
-import org.teiid.connector.language.SubqueryComparison.Quantifier;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.ProcedureParameter;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.AndOr;
+import org.teiid.language.Argument;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Call;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Condition;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.DerivedTable;
+import org.teiid.language.Exists;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.In;
+import org.teiid.language.InsertValueSource;
+import org.teiid.language.IsNull;
+import org.teiid.language.Join;
+import org.teiid.language.Like;
+import org.teiid.language.Literal;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Not;
+import org.teiid.language.QueryExpression;
+import org.teiid.language.SearchedCase;
+import org.teiid.language.SearchedWhenClause;
+import org.teiid.language.Select;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.SubqueryComparison;
+import org.teiid.language.SubqueryIn;
+import org.teiid.language.TableReference;
+import org.teiid.language.Argument.Direction;
+import org.teiid.language.Comparison.Operator;
+import org.teiid.language.SortSpecification.Ordering;
+import org.teiid.language.SubqueryComparison.Quantifier;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataID;
import org.teiid.query.sql.lang.BatchedUpdateCommand;
@@ -108,7 +108,7 @@
import org.teiid.query.sql.symbol.ScalarSubquery;
import org.teiid.query.sql.symbol.SearchedCaseExpression;
import org.teiid.query.sql.symbol.SingleElementSymbol;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public class LanguageBridgeFactory {
@@ -120,7 +120,7 @@
}
}
- public org.teiid.connector.language.Command translate(Command command) {
+ public org.teiid.language.Command translate(Command command) {
if (command == null) return null;
if (command instanceof Query) {
return translate((Query)command);
@@ -147,18 +147,18 @@
return translate((SetQuery)command);
}
- org.teiid.connector.language.SetQuery translate(SetQuery union) {
- org.teiid.connector.language.SetQuery result = new org.teiid.connector.language.SetQuery();
+ org.teiid.language.SetQuery translate(SetQuery union) {
+ org.teiid.language.SetQuery result = new org.teiid.language.SetQuery();
result.setAll(union.isAll());
switch (union.getOperation()) {
case UNION:
- result.setOperation(org.teiid.connector.language.SetQuery.Operation.UNION);
+ result.setOperation(org.teiid.language.SetQuery.Operation.UNION);
break;
case INTERSECT:
- result.setOperation(org.teiid.connector.language.SetQuery.Operation.INTERSECT);
+ result.setOperation(org.teiid.language.SetQuery.Operation.INTERSECT);
break;
case EXCEPT:
- result.setOperation(org.teiid.connector.language.SetQuery.Operation.EXCEPT);
+ result.setOperation(org.teiid.language.SetQuery.Operation.EXCEPT);
break;
}
result.setLeftQuery(translate(union.getLeftQuery()));
@@ -180,7 +180,7 @@
symbol = ((AliasSymbol)symbol).getSymbol();
}
- org.teiid.connector.language.Expression iExp = null;
+ org.teiid.language.Expression iExp = null;
if(symbol instanceof ElementSymbol) {
iExp = translate((ElementSymbol)symbol);
} else if(symbol instanceof AggregateSymbol) {
@@ -280,7 +280,7 @@
throw new AssertionError();
}
- org.teiid.connector.language.Comparison translate(CompareCriteria criteria) {
+ org.teiid.language.Comparison translate(CompareCriteria criteria) {
Operator operator = Operator.EQ;
switch(criteria.getOperator()) {
case CompareCriteria.EQ:
@@ -304,7 +304,7 @@
}
- return new org.teiid.connector.language.Comparison(translate(criteria.getLeftExpression()),
+ return new org.teiid.language.Comparison(translate(criteria.getLeftExpression()),
translate(criteria.getRightExpression()), operator);
}
@@ -401,19 +401,19 @@
return new Not(translate(criteria.getCriteria()));
}
- public org.teiid.connector.language.GroupBy translate(GroupBy groupBy) {
+ public org.teiid.language.GroupBy translate(GroupBy groupBy) {
if(groupBy == null){
return null;
}
List items = groupBy.getSymbols();
- List<org.teiid.connector.language.Expression> translatedItems = new ArrayList<org.teiid.connector.language.Expression>();
+ List<org.teiid.language.Expression> translatedItems = new ArrayList<org.teiid.language.Expression>();
for (Iterator i = items.iterator(); i.hasNext();) {
translatedItems.add(translate((Expression)i.next()));
}
- return new org.teiid.connector.language.GroupBy(translatedItems);
+ return new org.teiid.language.GroupBy(translatedItems);
}
- public org.teiid.connector.language.OrderBy translate(OrderBy orderBy) {
+ public org.teiid.language.OrderBy translate(OrderBy orderBy) {
if(orderBy == null){
return null;
}
@@ -431,12 +431,12 @@
}
translatedItems.add(orderByItem);
}
- return new org.teiid.connector.language.OrderBy(translatedItems);
+ return new org.teiid.language.OrderBy(translatedItems);
}
/* Expressions */
- public org.teiid.connector.language.Expression translate(Expression expr) {
+ public org.teiid.language.Expression translate(Expression expr) {
if (expr == null) return null;
if (expr instanceof Constant) {
return translate((Constant)expr);
@@ -459,15 +459,15 @@
return result;
}
- org.teiid.connector.language.Function translate(Function function) {
+ org.teiid.language.Function translate(Function function) {
Expression [] args = function.getArgs();
- List<org.teiid.connector.language.Expression> params = new ArrayList<org.teiid.connector.language.Expression>(args.length);
+ List<org.teiid.language.Expression> params = new ArrayList<org.teiid.language.Expression>(args.length);
if (args != null) {
for (int i = 0; i < args.length; i++) {
params.add(translate(args[i]));
}
}
- return new org.teiid.connector.language.Function(function.getName(), params, function.getType());
+ return new org.teiid.language.Function(function.getName(), params, function.getType());
}
SearchedCase translate(SearchedCaseExpression expr) {
@@ -481,11 +481,11 @@
}
- org.teiid.connector.language.Expression translate(ScalarSubquery ss) {
- return new org.teiid.connector.language.ScalarSubquery(translate((QueryCommand)ss.getCommand()));
+ org.teiid.language.Expression translate(ScalarSubquery ss) {
+ return new org.teiid.language.ScalarSubquery(translate((QueryCommand)ss.getCommand()));
}
- org.teiid.connector.language.Expression translate(SingleElementSymbol symbol) {
+ org.teiid.language.Expression translate(SingleElementSymbol symbol) {
if (symbol == null) return null;
if (symbol instanceof ElementSymbol) {
return translate((ElementSymbol)symbol);
@@ -497,7 +497,7 @@
throw new AssertionError();
}
- org.teiid.connector.language.Expression translate(AliasSymbol symbol) {
+ org.teiid.language.Expression translate(AliasSymbol symbol) {
return translate(symbol.getSymbol());
}
@@ -522,13 +522,13 @@
symbol.getType());
}
- org.teiid.connector.language.Expression translate(ExpressionSymbol symbol) {
+ org.teiid.language.Expression translate(ExpressionSymbol symbol) {
return translate(symbol.getExpression());
}
/* Insert */
- org.teiid.connector.language.Insert translate(Insert insert) {
+ org.teiid.language.Insert translate(Insert insert) {
List elements = insert.getVariables();
List<ColumnReference> translatedElements = new ArrayList<ColumnReference>();
for (Iterator i = elements.iterator(); i.hasNext();) {
@@ -541,40 +541,40 @@
} else {
// This is for the simple one row insert.
List values = insert.getValues();
- List<org.teiid.connector.language.Expression> translatedValues = new ArrayList<org.teiid.connector.language.Expression>();
+ List<org.teiid.language.Expression> translatedValues = new ArrayList<org.teiid.language.Expression>();
for (Iterator i = values.iterator(); i.hasNext();) {
translatedValues.add(translate((Expression)i.next()));
}
valueSource = new ExpressionValueSource(translatedValues);
}
- return new org.teiid.connector.language.Insert(translate(insert.getGroup()),
+ return new org.teiid.language.Insert(translate(insert.getGroup()),
translatedElements,
valueSource);
}
/* Update */
- org.teiid.connector.language.Update translate(Update update) {
- return new org.teiid.connector.language.Update(translate(update.getGroup()),
+ org.teiid.language.Update translate(Update update) {
+ return new org.teiid.language.Update(translate(update.getGroup()),
translate(update.getChangeList()),
translate(update.getCriteria()));
}
- List<org.teiid.connector.language.SetClause> translate(SetClauseList setClauseList) {
- List<org.teiid.connector.language.SetClause> clauses = new ArrayList<org.teiid.connector.language.SetClause>(setClauseList.getClauses().size());
+ List<org.teiid.language.SetClause> translate(SetClauseList setClauseList) {
+ List<org.teiid.language.SetClause> clauses = new ArrayList<org.teiid.language.SetClause>(setClauseList.getClauses().size());
for (SetClause setClause : setClauseList.getClauses()) {
clauses.add(translate(setClause));
}
return clauses;
}
- org.teiid.connector.language.SetClause translate(SetClause setClause) {
- return new org.teiid.connector.language.SetClause(translate(setClause.getSymbol()), translate(setClause.getValue()));
+ org.teiid.language.SetClause translate(SetClause setClause) {
+ return new org.teiid.language.SetClause(translate(setClause.getSymbol()), translate(setClause.getValue()));
}
/* Delete */
- org.teiid.connector.language.Delete translate(Delete delete) {
- org.teiid.connector.language.Delete deleteImpl = new org.teiid.connector.language.Delete(translate(delete.getGroup()),
+ org.teiid.language.Delete translate(Delete delete) {
+ org.teiid.language.Delete deleteImpl = new org.teiid.language.Delete(translate(delete.getGroup()),
translate(delete.getCriteria()));
return deleteImpl;
}
@@ -659,14 +659,14 @@
/* Batched Updates */
BatchedUpdates translate(BatchedUpdateCommand command) {
List updates = command.getUpdateCommands();
- List<org.teiid.connector.language.Command> translatedUpdates = new ArrayList<org.teiid.connector.language.Command>(updates.size());
+ List<org.teiid.language.Command> translatedUpdates = new ArrayList<org.teiid.language.Command>(updates.size());
for (Iterator i = updates.iterator(); i.hasNext();) {
translatedUpdates.add(translate((Command)i.next()));
}
return new BatchedUpdates(translatedUpdates);
}
- org.teiid.connector.language.Limit translate(Limit limit) {
+ org.teiid.language.Limit translate(Limit limit) {
if (limit == null) {
return null;
}
@@ -677,6 +677,6 @@
}
Literal c2 = (Literal)translate(limit.getRowLimit());
int rowLimit = ((Integer)c2.getValue()).intValue();
- return new org.teiid.connector.language.Limit(rowOffset, rowLimit);
+ return new org.teiid.language.Limit(rowOffset, rowLimit);
}
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,13 +25,13 @@
package org.teiid.dqp.internal.datamgr.metadata;
import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.connector.metadata.runtime.*;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.util.ArgCheck;
+import org.teiid.metadata.*;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.StoredProcedureInfo;
import org.teiid.query.sql.lang.SPParameter;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
/**
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -36,7 +36,7 @@
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
/**
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -37,16 +37,6 @@
import org.teiid.common.buffer.BlockedException;
import org.teiid.common.buffer.TupleBatch;
import org.teiid.common.buffer.TupleSource;
-import org.teiid.connector.language.SQLReservedWords;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.ForeignKey;
-import org.teiid.connector.metadata.runtime.KeyRecord;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.ProcedureParameter;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
import org.teiid.core.CoreConstants;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
@@ -65,7 +55,17 @@
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.dqp.message.RequestID;
import org.teiid.dqp.service.BufferService;
+import org.teiid.language.SQLReservedWords;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.ForeignKey;
+import org.teiid.metadata.KeyRecord;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.query.processor.CollectionTupleSource;
import org.teiid.query.processor.ProcessorDataManager;
@@ -77,7 +77,7 @@
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.GroupSymbol;
import org.teiid.query.util.CommandContext;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
public class DataTierManagerImpl implements ProcessorDataManager {
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -33,7 +33,7 @@
import org.teiid.dqp.internal.datamgr.impl.ConnectorWork;
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.dqp.message.AtomicResultsMessage;
-import org.teiid.resource.ConnectorException;
+import org.teiid.translator.ConnectorException;
/**
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 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -35,7 +35,6 @@
import org.teiid.client.metadata.MetadataResult;
import org.teiid.client.metadata.ResultsMetadataConstants;
import org.teiid.client.metadata.ResultsMetadataDefaults;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.DataTypeManager;
@@ -44,6 +43,7 @@
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
import org.teiid.dqp.internal.process.multisource.MultiSourceMetadataWrapper;
import org.teiid.dqp.message.RequestID;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.SupportConstants;
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 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -66,7 +66,7 @@
import org.teiid.query.sql.lang.SPParameter;
import org.teiid.query.sql.lang.StoredProcedure;
import org.teiid.query.sql.symbol.SingleElementSymbol;
-import org.teiid.resource.cci.DataNotAvailableException;
+import org.teiid.translator.DataNotAvailableException;
public class RequestWorkItem extends AbstractWorkItem {
Modified: trunk/engine/src/main/java/org/teiid/metadata/CompositeMetadataStore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/metadata/CompositeMetadataStore.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/metadata/CompositeMetadataStore.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,12 +28,12 @@
import java.util.List;
import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.Table.Type;
import org.teiid.core.TeiidComponentException;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.Table.Type;
/**
Modified: trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -39,19 +39,6 @@
import org.jboss.virtual.VirtualFile;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.ColumnSet;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.ForeignKey;
-import org.teiid.connector.metadata.runtime.KeyRecord;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.ProcedureParameter;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
-import org.teiid.connector.metadata.runtime.ProcedureParameter.Type;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.types.BlobImpl;
import org.teiid.core.types.ClobImpl;
@@ -63,6 +50,19 @@
import org.teiid.core.util.ObjectConverterUtil;
import org.teiid.core.util.StringUtil;
import org.teiid.dqp.DQPPlugin;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.ColumnSet;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.ForeignKey;
+import org.teiid.metadata.KeyRecord;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.Column.SearchType;
+import org.teiid.metadata.ProcedureParameter.Type;
import org.teiid.query.QueryPlugin;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.function.FunctionTree;
Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,9 +25,9 @@
import java.io.Serializable;
import java.util.*;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.util.Assertion;
import org.teiid.core.util.HashCodeUtil;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.function.metadata.*;
Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -38,10 +38,10 @@
import org.teiid.api.exception.query.ExpressionEvaluationException;
import org.teiid.api.exception.query.FunctionExecutionException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.TransformationException;
import org.teiid.core.util.TimestampWithTimezone;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.QueryPlugin;
import org.teiid.query.util.CommandContext;
import org.teiid.query.util.ErrorMessageKeys;
Modified: trunk/engine/src/main/java/org/teiid/query/function/source/SystemSource.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/function/source/SystemSource.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/function/source/SystemSource.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,7 +34,7 @@
import org.teiid.query.function.metadata.FunctionCategoryConstants;
import org.teiid.query.function.metadata.FunctionMethod;
import org.teiid.query.function.metadata.FunctionParameter;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
/**
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,9 +28,9 @@
import java.util.List;
import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
@@ -45,7 +45,7 @@
import org.teiid.query.sql.symbol.Expression;
import org.teiid.query.sql.symbol.Function;
import org.teiid.query.sql.visitor.ElementCollectorVisitor;
-import org.teiid.resource.cci.ConnectorCapabilities.SupportedJoinCriteria;
+import org.teiid.translator.ConnectorCapabilities.SupportedJoinCriteria;
/**
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -52,7 +52,7 @@
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.util.CommandContext;
import org.teiid.query.util.Permutation;
-import org.teiid.resource.cci.ConnectorCapabilities.SupportedJoinCriteria;
+import org.teiid.translator.ConnectorCapabilities.SupportedJoinCriteria;
/**
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -38,9 +38,9 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.api.exception.query.QueryResolverException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.metadata.QueryMetadataInterface;
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -54,7 +54,7 @@
import org.teiid.query.sql.symbol.SingleElementSymbol;
import org.teiid.query.sql.util.SymbolMap;
import org.teiid.query.util.CommandContext;
-import org.teiid.resource.cci.ConnectorCapabilities.SupportedJoinCriteria;
+import org.teiid.translator.ConnectorCapabilities.SupportedJoinCriteria;
public final class RuleRaiseAccess implements OptimizerRule {
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRemoveOptionalJoins.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,9 +31,9 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.api.exception.query.QueryResolverException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.util.Assertion;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
Modified: trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,8 +25,8 @@
import java.io.StringReader;
import org.teiid.api.exception.query.QueryParserException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.lang.Command;
import org.teiid.query.sql.lang.Criteria;
Modified: trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,9 +26,9 @@
import java.util.LinkedList;
import java.util.List;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.util.Assertion;
import org.teiid.core.util.StringUtil;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.lang.Command;
import org.teiid.query.sql.lang.FromClause;
Modified: trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -40,7 +40,7 @@
import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.processor.BatchCollector.BatchProducer;
import org.teiid.query.util.CommandContext;
-import org.teiid.resource.cci.DataNotAvailableException;
+import org.teiid.translator.DataNotAvailableException;
public class QueryProcessor implements BatchProducer {
Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,11 +34,11 @@
import org.teiid.api.exception.query.QueryProcessingException;
import org.teiid.client.plan.PlanNode;
import org.teiid.common.buffer.BlockedException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.id.IDGenerator;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.SQLReservedWords;
import org.teiid.logging.LogManager;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.execution.QueryExecPlugin;
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -37,9 +37,9 @@
import org.teiid.common.buffer.TupleBatch;
import org.teiid.common.buffer.TupleBuffer;
import org.teiid.common.buffer.TupleSource;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.eval.Evaluator;
import org.teiid.query.function.aggregate.AggregateFunction;
import org.teiid.query.function.aggregate.Avg;
Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -46,7 +46,6 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryResolverException;
import org.teiid.api.exception.query.QueryValidatorException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.TeiidException;
@@ -54,6 +53,7 @@
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.Assertion;
import org.teiid.core.util.TimestampWithTimezone;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.eval.Evaluator;
import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.function.FunctionDescriptor;
@@ -147,7 +147,7 @@
import org.teiid.query.sql.visitor.EvaluatableVisitor.EvaluationLevel;
import org.teiid.query.util.CommandContext;
import org.teiid.query.util.ErrorMessageKeys;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
/**
Modified: trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,7 +26,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.language.SQLReservedWords;
/**
* Special variable names in stored procedure language.
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/Option.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/Option.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/Option.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,9 +25,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.util.EquivalenceUtil;
import org.teiid.core.util.HashCodeUtil;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.sql.LanguageObject;
import org.teiid.query.sql.LanguageVisitor;
import org.teiid.query.sql.visitor.SQLStringVisitor;
Modified: trunk/engine/src/main/java/org/teiid/query/sql/proc/RaiseErrorStatement.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/proc/RaiseErrorStatement.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/sql/proc/RaiseErrorStatement.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,7 +22,7 @@
package org.teiid.query.sql.proc;
-import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.sql.LanguageVisitor;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.symbol.Expression;
Modified: trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,10 +27,10 @@
import java.util.Map;
import java.util.Set;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.EquivalenceUtil;
import org.teiid.core.util.HashCodeUtil;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.LanguageVisitor;
import org.teiid.query.util.ErrorMessageKeys;
@@ -110,7 +110,7 @@
/**
* Construct an aggregate symbol with all given data.
* @param name Name of the function
- * @param aggregateFunction Aggregate function type ({@link org.teiid.connector.language.SQLReservedWords#COUNT}, etc)
+ * @param aggregateFunction Aggregate function type ({@link org.teiid.language.SQLReservedWords#COUNT}, etc)
* @param isDistinct True if DISTINCT flag is set
* @param expression Contained expression
*/
@@ -125,11 +125,11 @@
* Set the aggregate function. If the aggregate function is an invalid value, an
* IllegalArgumentException is thrown.
* @param aggregateFunction Aggregate function type
- * @see org.teiid.connector.language.SQLReservedWords#COUNT
- * @see org.teiid.connector.language.SQLReservedWords#SUM
- * @see org.teiid.connector.language.SQLReservedWords#AVG
- * @see org.teiid.connector.language.SQLReservedWords#MIN
- * @see org.teiid.connector.language.SQLReservedWords#MAX
+ * @see org.teiid.language.SQLReservedWords#COUNT
+ * @see org.teiid.language.SQLReservedWords#SUM
+ * @see org.teiid.language.SQLReservedWords#AVG
+ * @see org.teiid.language.SQLReservedWords#MIN
+ * @see org.teiid.language.SQLReservedWords#MAX
*/
private void setAggregateFunction(String aggregateFunction) {
// Validate aggregate
@@ -143,11 +143,11 @@
* Get the aggregate function type - this will map to one of the reserved words
* for the aggregate functions.
* @return Aggregate function type
- * @see org.teiid.connector.language.SQLReservedWords#COUNT
- * @see org.teiid.connector.language.SQLReservedWords#SUM
- * @see org.teiid.connector.language.SQLReservedWords#AVG
- * @see org.teiid.connector.language.SQLReservedWords#MIN
- * @see org.teiid.connector.language.SQLReservedWords#MAX
+ * @see org.teiid.language.SQLReservedWords#COUNT
+ * @see org.teiid.language.SQLReservedWords#SUM
+ * @see org.teiid.language.SQLReservedWords#AVG
+ * @see org.teiid.language.SQLReservedWords#MIN
+ * @see org.teiid.language.SQLReservedWords#MAX
*/
public String getAggregateFunction() {
return this.aggregate;
Modified: trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,10 +29,10 @@
import java.util.LinkedList;
import java.util.List;
-import org.teiid.connector.language.SQLReservedWords;
-import org.teiid.connector.language.SQLReservedWords.Tokens;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.StringUtil;
+import org.teiid.language.SQLReservedWords;
+import org.teiid.language.SQLReservedWords.Tokens;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.sql.LanguageObject;
import org.teiid.query.sql.LanguageVisitor;
@@ -113,7 +113,7 @@
import org.teiid.query.sql.symbol.XMLForest;
import org.teiid.query.sql.symbol.XMLNamespaces;
import org.teiid.query.sql.symbol.XMLNamespaces.NamespaceItem;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
/**
Modified: trunk/engine/src/main/java/org/teiid/query/validator/AggregateValidationVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/validator/AggregateValidationVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/validator/AggregateValidationVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,8 +25,8 @@
import java.util.Collection;
import java.util.Set;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.LanguageObject;
import org.teiid.query.sql.navigator.PreOrderNavigator;
Modified: trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -112,7 +112,7 @@
import org.teiid.query.sql.visitor.SQLStringVisitor;
import org.teiid.query.sql.visitor.ValueIteratorProviderCollectorVisitor;
import org.teiid.query.util.ErrorMessageKeys;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
public class ValidationVisitor extends AbstractValidationVisitor {
Modified: trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,10 +26,10 @@
import java.util.Iterator;
import java.util.List;
-import org.teiid.connector.language.LanguageFactory;
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory;
+import org.teiid.language.LanguageFactory;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.relational.AliasGenerator;
import org.teiid.query.parser.QueryParser;
@@ -59,11 +59,11 @@
this.metadata = metadata;
}
- public org.teiid.connector.language.Command getCommand(String queryString) {
+ public org.teiid.language.Command getCommand(String queryString) {
return getCommand(queryString, false, false);
}
- public org.teiid.connector.language.Command getCommand(String queryString, boolean generateAliases, boolean supportsGroupAlias) {
+ public org.teiid.language.Command getCommand(String queryString, boolean generateAliases, boolean supportsGroupAlias) {
Command command = null;
try {
command = QueryParser.getQueryParser().parseCommand(queryString);
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeConnector.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeConnector.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeConnector.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,19 +27,19 @@
import junit.framework.Assert;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.Execution;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.language.Command;
+import org.teiid.language.QueryExpression;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.BasicConnectorCapabilities;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.Execution;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.UpdateExecution;
public class FakeConnector extends BasicExecutionFactory {
private static final int RESULT_SIZE = 5;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeExecutionContextImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeExecutionContextImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeExecutionContextImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import java.util.concurrent.atomic.AtomicInteger;
-import org.teiid.resource.cci.ExecutionContext;
+import org.teiid.translator.ExecutionContext;
/**
*/
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeProcedureExecution.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeProcedureExecution.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/FakeProcedureExecution.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,10 +26,10 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicExecution;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.ProcedureExecution;
+import org.teiid.translator.BasicExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.ProcedureExecution;
final class FakeProcedureExecution extends BasicExecution implements ProcedureExecution {
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManager.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManager.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManager.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,7 +34,7 @@
import org.teiid.dqp.message.AtomicRequestID;
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.dqp.message.RequestID;
-import org.teiid.resource.cci.ExecutionFactory;
+import org.teiid.translator.ExecutionFactory;
/**
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,7 +34,6 @@
import org.junit.Test;
import org.mockito.Mockito;
import org.teiid.client.RequestMessage;
-import org.teiid.connector.language.Call;
import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory;
import org.teiid.dqp.internal.process.AbstractWorkItem;
import org.teiid.dqp.internal.process.DQPWorkContext;
@@ -42,6 +41,7 @@
import org.teiid.dqp.message.AtomicResultsMessage;
import org.teiid.dqp.message.RequestID;
import org.teiid.dqp.service.TransactionContext;
+import org.teiid.language.Call;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.parser.QueryParser;
import org.teiid.query.resolver.QueryResolver;
@@ -49,8 +49,8 @@
import org.teiid.query.sql.lang.StoredProcedure;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.unittest.FakeMetadataFactory;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ProcedureExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ProcedureExecution;
public class TestConnectorWorkItem {
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestTypeFacilityImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestTypeFacilityImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestTypeFacilityImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import java.sql.Clob;
-import org.teiid.resource.cci.TypeFacility;
+import org.teiid.translator.TypeFacility;
import junit.framework.TestCase;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestAggregateImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestAggregateImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestAggregateImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,10 +24,10 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.AggregateFunction;
+import org.teiid.language.Literal;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.sql.symbol.AggregateSymbol;
import org.teiid.query.sql.symbol.Constant;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,10 +25,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Delete;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.Update;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Delete;
+import org.teiid.language.Insert;
+import org.teiid.language.Update;
import org.teiid.query.sql.lang.BatchedUpdateCommand;
import junit.framework.TestCase;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.Comparison.Operator;
+import org.teiid.language.Comparison;
+import org.teiid.language.Literal;
+import org.teiid.language.Comparison.Operator;
import org.teiid.query.sql.lang.AbstractCompareCriteria;
import org.teiid.query.sql.symbol.Constant;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.AndOr;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.AndOr.Operator;
+import org.teiid.language.AndOr;
+import org.teiid.language.Comparison;
+import org.teiid.language.AndOr.Operator;
import org.teiid.query.sql.lang.CompareCriteria;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestDeleteImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestDeleteImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestDeleteImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Delete;
+import org.teiid.language.Delete;
import org.teiid.query.sql.lang.CompoundCriteria;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestElementImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestElementImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestElementImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,8 +24,8 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.NamedTable;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.NamedTable;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.unittest.FakeMetadataObject;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestExistsCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestExistsCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestExistsCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,7 +23,7 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.Exists;
+import org.teiid.language.Exists;
import org.teiid.query.sql.lang.ExistsCriteria;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestFunctionImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestFunctionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestFunctionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,8 +26,8 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
import org.teiid.query.sql.symbol.Constant;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupByImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupByImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupByImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,8 +28,8 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.GroupBy;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.GroupBy;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.symbol.Expression;
import org.teiid.query.sql.symbol.Function;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestGroupImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,7 +23,7 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.NamedTable;
+import org.teiid.language.NamedTable;
import org.teiid.query.sql.symbol.GroupSymbol;
import org.teiid.query.unittest.FakeMetadataObject;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,9 +26,9 @@
import java.util.Iterator;
import java.util.List;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.In;
+import org.teiid.language.Expression;
+import org.teiid.language.In;
+import org.teiid.language.Literal;
import org.teiid.query.sql.lang.SetCriteria;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInlineViewImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInlineViewImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInlineViewImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,7 +23,7 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.DerivedTable;
+import org.teiid.language.DerivedTable;
import org.teiid.query.sql.lang.SubqueryFromClause;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInsertImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInsertImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestInsertImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,10 +27,10 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.ExpressionValueSource;
-import org.teiid.connector.language.Insert;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Expression;
+import org.teiid.language.ExpressionValueSource;
+import org.teiid.language.Insert;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.symbol.GroupSymbol;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestIsNullCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestIsNullCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestIsNullCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,7 +23,7 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.IsNull;
+import org.teiid.language.IsNull;
import org.teiid.query.sql.lang.IsNullCriteria;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestJoinImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestJoinImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestJoinImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,8 +26,8 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Join;
+import org.teiid.language.Comparison;
+import org.teiid.language.Join;
import org.teiid.query.sql.lang.CompareCriteria;
import org.teiid.query.sql.lang.JoinPredicate;
import org.teiid.query.sql.lang.JoinType;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -22,8 +22,8 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.Like;
+import org.teiid.language.Like;
+import org.teiid.language.Literal;
import org.teiid.query.sql.lang.MatchCriteria;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLiteralImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLiteralImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestLiteralImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,7 +23,7 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.Literal;
+import org.teiid.language.Literal;
import org.teiid.query.sql.symbol.Constant;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestNotCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestNotCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestNotCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,7 +23,7 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.Not;
+import org.teiid.language.Not;
import org.teiid.query.sql.lang.CompareCriteria;
import org.teiid.query.sql.lang.NotCriteria;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestOrderByImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestOrderByImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestOrderByImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,8 +28,8 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.OrderBy;
-import org.teiid.connector.language.SortSpecification;
+import org.teiid.language.OrderBy;
+import org.teiid.language.SortSpecification;
public class TestOrderByImpl extends TestCase {
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestParameterImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestParameterImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestParameterImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Argument.Direction;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.language.Argument.Direction;
public class TestParameterImpl extends TestCase {
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestProcedureImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestProcedureImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestProcedureImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Call;
+import org.teiid.language.Call;
import org.teiid.query.parser.QueryParser;
import org.teiid.query.resolver.QueryResolver;
import org.teiid.query.sql.lang.Command;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestQueryImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestQueryImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestQueryImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,9 +29,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Select;
import org.teiid.core.util.EquivalenceUtil;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Select;
import org.teiid.query.sql.lang.CompoundCriteria;
import org.teiid.query.sql.lang.Query;
import org.teiid.query.sql.lang.UnaryFromClause;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,8 +24,8 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.ScalarSubquery;
+import org.teiid.language.ScalarSubquery;
+import org.teiid.language.Select;
import org.teiid.query.sql.lang.Query;
import org.teiid.query.sql.symbol.SingleElementSymbol;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSearchedCaseExpressionImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSearchedCaseExpressionImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSearchedCaseExpressionImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.language.SearchedCase;
+import org.teiid.language.SearchedCase;
import org.teiid.query.sql.lang.CompareCriteria;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSelectSymbolImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSelectSymbolImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSelectSymbolImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.DerivedColumn;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.DerivedColumn;
public class TestSelectSymbolImpl extends TestCase {
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSetQueryImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSetQueryImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSetQueryImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,15 +27,15 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.OrderBy;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.SetQuery;
-import org.teiid.connector.language.SortSpecification;
-import org.teiid.connector.language.SortSpecification.Ordering;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.NamedTable;
+import org.teiid.language.OrderBy;
+import org.teiid.language.Select;
+import org.teiid.language.SetQuery;
+import org.teiid.language.SortSpecification;
+import org.teiid.language.SortSpecification.Ordering;
import org.teiid.query.sql.lang.SetQuery.Operation;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.SubqueryComparison;
-import org.teiid.connector.language.SubqueryComparison.Quantifier;
+import org.teiid.language.Comparison;
+import org.teiid.language.SubqueryComparison;
+import org.teiid.language.SubqueryComparison.Quantifier;
import org.teiid.query.sql.lang.AbstractCompareCriteria;
import org.teiid.query.sql.lang.Query;
import org.teiid.query.sql.lang.SubqueryCompareCriteria;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryInCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryInCriteriaImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestSubqueryInCriteriaImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -23,7 +23,7 @@
package org.teiid.dqp.internal.datamgr.language;
-import org.teiid.connector.language.SubqueryIn;
+import org.teiid.language.SubqueryIn;
import org.teiid.query.sql.lang.Query;
import org.teiid.query.sql.lang.SubquerySetCriteria;
import org.teiid.query.sql.symbol.ElementSymbol;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestUpdateImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestUpdateImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/language/TestUpdateImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,7 +26,7 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Update;
+import org.teiid.language.Update;
import org.teiid.query.sql.lang.CompareCriteria;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.GroupSymbol;
Modified: trunk/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -38,8 +38,8 @@
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
import org.teiid.query.sql.symbol.SingleElementSymbol;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.DataNotAvailableException;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
/**
Modified: trunk/engine/src/test/java/org/teiid/metadata/TestTransformationMetadata.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/metadata/TestTransformationMetadata.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/metadata/TestTransformationMetadata.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -36,9 +36,9 @@
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.MetadataFactory;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.MetadataFactory;
import org.teiid.query.unittest.FakeMetadataFactory;
Modified: trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -34,7 +34,7 @@
import org.junit.Test;
import org.teiid.api.exception.query.FunctionExecutionException;
-import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.function.FunctionMethods;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.unittest.TimestampUtil;
Modified: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -41,13 +41,13 @@
import org.junit.Test;
import org.teiid.api.exception.query.FunctionExecutionException;
import org.teiid.common.buffer.BufferManagerFactory;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.types.ClobType;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.NullType;
import org.teiid.core.types.XMLType;
import org.teiid.core.util.ObjectConverterUtil;
import org.teiid.core.util.TimestampWithTimezone;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.function.FunctionDescriptor;
import org.teiid.query.function.FunctionForm;
import org.teiid.query.function.FunctionLibrary;
@@ -58,7 +58,7 @@
import org.teiid.query.function.metadata.FunctionMethod;
import org.teiid.query.unittest.TimestampUtil;
import org.teiid.query.util.CommandContext;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
@SuppressWarnings("nls")
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -49,7 +49,7 @@
import org.teiid.query.unittest.FakeMetadataFactory;
import org.teiid.query.unittest.FakeMetadataObject;
import org.teiid.query.unittest.FakeMetadataStore;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
public class TestJoinOptimization {
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,7 +27,7 @@
import org.teiid.query.optimizer.capabilities.FakeCapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability;
import org.teiid.query.unittest.FakeMetadataFactory;
-import org.teiid.resource.cci.ConnectorCapabilities.SupportedJoinCriteria;
+import org.teiid.translator.ConnectorCapabilities.SupportedJoinCriteria;
public class TestJoinPushdownRestrictions {
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -89,7 +89,7 @@
import org.teiid.query.util.CommandContext;
import org.teiid.query.validator.Validator;
import org.teiid.query.validator.ValidatorReport;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
public class TestOptimizer {
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,7 +31,7 @@
import org.teiid.query.processor.ProcessorPlan;
import org.teiid.query.unittest.FakeMetadataFacade;
import org.teiid.query.unittest.FakeMetadataFactory;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
public class TestSubqueryPushdown {
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestCapabilitiesUtil.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestCapabilitiesUtil.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestCapabilitiesUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,8 +26,8 @@
import java.util.List;
import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.TeiidComponentException;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.FakeCapabilitiesFinder;
Modified: trunk/engine/src/test/java/org/teiid/query/sql/lang/TestJDBCExecutionHelper.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/lang/TestJDBCExecutionHelper.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/sql/lang/TestJDBCExecutionHelper.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,10 +29,10 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.Select;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Literal;
+import org.teiid.language.Select;
public class TestJDBCExecutionHelper extends TestCase{
Modified: trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,8 +24,8 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.sql.symbol.AggregateSymbol;
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.ElementSymbol;
Modified: trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,7 +31,7 @@
import java.util.Map;
import org.junit.Test;
-import org.teiid.connector.language.SQLReservedWords;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.sql.LanguageObject;
import org.teiid.query.sql.lang.CompareCriteria;
import org.teiid.query.sql.lang.Select;
@@ -46,7 +46,7 @@
import org.teiid.query.sql.symbol.TestCaseExpression;
import org.teiid.query.sql.symbol.TestSearchedCaseExpression;
import org.teiid.query.sql.visitor.ExpressionMappingVisitor;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
Modified: trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,8 +28,8 @@
import java.util.List;
import org.teiid.client.metadata.ParameterInfo;
-import org.teiid.connector.language.SQLReservedWords;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.language.SQLReservedWords;
import org.teiid.query.parser.QueryParser;
import org.teiid.query.resolver.QueryResolver;
import org.teiid.query.sql.LanguageObject;
Modified: trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -35,10 +35,10 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.client.metadata.ParameterInfo;
-import org.teiid.connector.metadata.runtime.Table;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.dqp.internal.process.DQPWorkContext;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingAttribute;
Modified: trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,19 +29,19 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.client.metadata.ParameterInfo;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.ColumnSet;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.ProcedureParameter;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
-import org.teiid.connector.metadata.runtime.ProcedureParameter.Type;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.ColumnSet;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.Column.SearchType;
+import org.teiid.metadata.ProcedureParameter.Type;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.sql.lang.SPParameter;
Modified: trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -46,7 +46,7 @@
import org.teiid.adminapi.jboss.ManagedUtil;
import org.teiid.deployers.ExtendedPropertyMetadata;
import org.teiid.deployers.ManagedPropertyUtil;
-import org.teiid.resource.cci.ExecutionFactory;
+import org.teiid.translator.ExecutionFactory;
public class RaXmlPropertyConverter {
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -43,17 +43,6 @@
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.ColumnSet;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.ForeignKey;
-import org.teiid.connector.metadata.runtime.KeyRecord;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.ProcedureParameter;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
import org.teiid.core.CoreConstants;
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidRuntimeException;
@@ -62,6 +51,17 @@
import org.teiid.core.util.ArgCheck;
import org.teiid.core.util.StringUtil;
import org.teiid.internal.core.index.Index;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.ColumnSet;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.ForeignKey;
+import org.teiid.metadata.KeyRecord;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.metadata.VdbConstants;
import org.teiid.metadata.TransformationMetadata.Resource;
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,25 +27,25 @@
import java.util.Iterator;
import java.util.List;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
-import org.teiid.connector.metadata.runtime.Column;
-import org.teiid.connector.metadata.runtime.ColumnSet;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.ForeignKey;
-import org.teiid.connector.metadata.runtime.KeyRecord;
-import org.teiid.connector.metadata.runtime.Procedure;
-import org.teiid.connector.metadata.runtime.ProcedureParameter;
-import org.teiid.connector.metadata.runtime.Schema;
-import org.teiid.connector.metadata.runtime.Table;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
-import org.teiid.connector.metadata.runtime.Datatype.Variety;
import org.teiid.core.id.UUID;
import org.teiid.core.index.IEntryResult;
import org.teiid.core.util.Assertion;
import org.teiid.core.util.StringUtil;
import org.teiid.internal.core.index.EntryResult;
import org.teiid.internal.core.index.IIndexConstants;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.ColumnSet;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.ForeignKey;
+import org.teiid.metadata.KeyRecord;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Schema;
+import org.teiid.metadata.Table;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.Column.SearchType;
+import org.teiid.metadata.Datatype.Variety;
/**
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,7 +24,7 @@
import java.util.List;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
+import org.teiid.metadata.AbstractMetadataRecord;
/**
* TransformationRecordImpl
Modified: trunk/metadata/src/test/java/com/metamatrix/cdk/api/ConnectorHost.java
===================================================================
--- trunk/metadata/src/test/java/com/metamatrix/cdk/api/ConnectorHost.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/metadata/src/test/java/com/metamatrix/cdk/api/ConnectorHost.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,17 +26,17 @@
import java.util.Arrays;
import java.util.List;
-import org.teiid.connector.language.BatchedUpdates;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.language.BatchedUpdates;
+import org.teiid.language.Command;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.metadata.index.VDBMetadataFactory;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.DataNotAvailableException;
-import org.teiid.resource.cci.Execution;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ExecutionFactory;
-import org.teiid.resource.cci.ResultSetExecution;
-import org.teiid.resource.cci.UpdateExecution;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.DataNotAvailableException;
+import org.teiid.translator.Execution;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ExecutionFactory;
+import org.teiid.translator.ResultSetExecution;
+import org.teiid.translator.UpdateExecution;
/**
* A simple test environment to execute commands on a connector.
Modified: trunk/metadata/src/test/java/com/metamatrix/cdk/api/TranslationUtility.java
===================================================================
--- trunk/metadata/src/test/java/com/metamatrix/cdk/api/TranslationUtility.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/metadata/src/test/java/com/metamatrix/cdk/api/TranslationUtility.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,9 +27,9 @@
import java.util.Collection;
import org.teiid.cdk.CommandBuilder;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
+import org.teiid.language.Command;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.metadata.index.VDBMetadataFactory;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.function.FunctionTree;
Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
===================================================================
--- trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,13 +31,13 @@
import java.util.Arrays;
import java.util.Collection;
-import org.teiid.connector.metadata.runtime.MetadataStore;
import org.teiid.core.CoreConstants;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.FileUtils;
import org.teiid.core.util.LRUCache;
import org.teiid.core.util.UnitTestUtil;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.query.function.metadata.FunctionMetadataReader;
import org.teiid.query.function.metadata.FunctionMethod;
Modified: trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -29,8 +29,8 @@
import org.teiid.adminapi.impl.DataPolicyMetadata;
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.connector.metadata.runtime.MetadataStore;
import org.teiid.metadata.CompositeMetadataStore;
+import org.teiid.metadata.MetadataStore;
import org.teiid.metadata.TransformationMetadata;
import org.teiid.metadata.TransformationMetadata.Resource;
import org.teiid.query.function.metadata.FunctionMethod;
Modified: trunk/runtime/src/main/java/org/teiid/deployers/ManagedPropertyUtil.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/ManagedPropertyUtil.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/deployers/ManagedPropertyUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,7 +31,7 @@
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
-import org.teiid.resource.cci.TranslatorProperty;
+import org.teiid.translator.TranslatorProperty;
public class ManagedPropertyUtil {
private static final String TEIID_PROPERTY = "teiid-property"; //$NON-NLS-1$
Modified: trunk/runtime/src/main/java/org/teiid/deployers/MetadataStoreGroup.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/MetadataStoreGroup.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/deployers/MetadataStoreGroup.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.connector.metadata.runtime.MetadataStore;
+import org.teiid.metadata.MetadataStore;
public class MetadataStoreGroup implements Serializable{
private static final long serialVersionUID = -3702321839716725121L;
Modified: trunk/runtime/src/main/java/org/teiid/deployers/TranslatorDeployer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/TranslatorDeployer.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/deployers/TranslatorDeployer.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -37,9 +37,9 @@
import org.teiid.dqp.internal.datamgr.impl.TranslatorRepository;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.resource.cci.ExecutionFactory;
-import org.teiid.resource.cci.TranslatorProperty;
import org.teiid.runtime.RuntimePlugin;
+import org.teiid.translator.ExecutionFactory;
+import org.teiid.translator.TranslatorProperty;
/**
Modified: trunk/runtime/src/main/java/org/teiid/deployers/TranslatorPropertyUtil.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/TranslatorPropertyUtil.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/deployers/TranslatorPropertyUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.teiid.resource.cci.TranslatorProperty;
+import org.teiid.translator.TranslatorProperty;
public class TranslatorPropertyUtil {
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -35,7 +35,6 @@
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.SourceMappingMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.connector.metadata.runtime.MetadataStore;
import org.teiid.core.CoreConstants;
import org.teiid.core.util.FileUtils;
import org.teiid.dqp.internal.cache.DQPContextCache;
@@ -44,11 +43,12 @@
import org.teiid.dqp.internal.datamgr.impl.TranslatorRepository;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.metadata.MetadataStore;
import org.teiid.metadata.TransformationMetadata.Resource;
import org.teiid.metadata.index.IndexMetadataFactory;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.cci.ExecutionFactory;
import org.teiid.runtime.RuntimePlugin;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionFactory;
public class VDBDeployer extends AbstractSimpleRealDeployer<VDBMetaData> {
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -35,9 +35,9 @@
import org.teiid.adminapi.AdminProcessingException;
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.connector.metadata.runtime.MetadataStore;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.metadata.Datatype;
+import org.teiid.metadata.MetadataStore;
import org.teiid.metadata.TransformationMetadata.Resource;
import org.teiid.runtime.RuntimePlugin;
import org.teiid.vdb.runtime.VDBKey;
Modified: trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfo.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfo.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfo.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -28,7 +28,7 @@
import org.jboss.metatype.api.types.MapCompositeMetaType;
import org.jboss.metatype.api.types.SimpleMetaType;
import org.teiid.deployers.ManagedPropertyUtil;
-import org.teiid.resource.cci.TranslatorProperty;
+import org.teiid.translator.TranslatorProperty;
/**
* This class defines the template for all the translator classes. Each Translator's class
Modified: trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfoFactory.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfoFactory.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/runtime/src/main/java/org/teiid/templates/TranslatorTemplateInfoFactory.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,7 +31,7 @@
import org.jboss.managed.api.ManagedProperty;
import org.teiid.deployers.ManagedPropertyUtil;
import org.teiid.deployers.TranslatorPropertyUtil;
-import org.teiid.resource.cci.TranslatorProperty;
+import org.teiid.translator.TranslatorProperty;
public class TranslatorTemplateInfoFactory {
Modified: trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java
===================================================================
--- trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -24,11 +24,11 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.language.Command;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Select;
+import org.teiid.metadata.AbstractMetadataRecord;
public class TestTranslationUtility extends TestCase {
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,6 +27,11 @@
import java.util.List;
import java.util.Set;
+import org.teiid.language.Condition;
+import org.teiid.language.LanguageFactory;
+import org.teiid.language.LanguageUtil;
+import org.teiid.language.Select;
+
import junit.framework.TestCase;
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/MockConnector.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/MockConnector.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/MockConnector.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -5,20 +5,23 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.QueryExpression;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
-import org.teiid.resource.ConnectorException;
-import org.teiid.resource.adapter.BasicConnectorCapabilities;
-import org.teiid.resource.adapter.BasicExecutionFactory;
-import org.teiid.resource.cci.ConnectorCapabilities;
-import org.teiid.resource.cci.ExecutionContext;
-import org.teiid.resource.cci.ProcedureExecution;
-import org.teiid.resource.cci.ResultSetExecution;
+import org.teiid.language.Call;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.NamedTable;
+import org.teiid.language.QueryExpression;
+import org.teiid.metadata.AbstractMetadataRecord;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.Column.SearchType;
+import org.teiid.translator.BasicConnectorCapabilities;
+import org.teiid.translator.BasicExecutionFactory;
+import org.teiid.translator.ConnectorCapabilities;
+import org.teiid.translator.ConnectorException;
+import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.ProcedureExecution;
+import org.teiid.translator.ResultSetExecution;
public class MockConnector extends BasicExecutionFactory {
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,12 +27,13 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
-import org.teiid.connector.metadata.runtime.Column.SearchType;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.Select;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.BaseColumn.NullType;
+import org.teiid.metadata.Column.SearchType;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,9 +27,10 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Select;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Select;
+import org.teiid.metadata.Table;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -26,12 +26,16 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.DerivedColumn;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Select;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.language.Call;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.DerivedColumn;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Select;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.Table;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,11 +27,12 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Argument;
-import org.teiid.connector.language.Call;
-import org.teiid.connector.language.Argument.Direction;
-import org.teiid.connector.metadata.runtime.BaseColumn.NullType;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.language.Argument;
+import org.teiid.language.Call;
+import org.teiid.language.Argument.Direction;
+import org.teiid.metadata.ProcedureParameter;
+import org.teiid.metadata.BaseColumn.NullType;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -27,8 +27,11 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.Call;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.language.Call;
+import org.teiid.metadata.Column;
+import org.teiid.metadata.Procedure;
+import org.teiid.metadata.ProcedureParameter;
import com.metamatrix.cdk.api.TranslationUtility;
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestCollectorVisitor.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestCollectorVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestCollectorVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -32,14 +32,15 @@
import junit.framework.TestCase;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Comparison;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.NamedTable;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.language.Comparison.Operator;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Comparison;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.NamedTable;
+import org.teiid.language.Select;
+import org.teiid.language.Comparison.Operator;
+import org.teiid.language.visitor.CollectorVisitor;
/**
*/
Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -31,17 +31,6 @@
import java.util.List;
import org.junit.Test;
-import org.teiid.connector.language.AggregateFunction;
-import org.teiid.connector.language.ColumnReference;
-import org.teiid.connector.language.Command;
-import org.teiid.connector.language.Expression;
-import org.teiid.connector.language.Function;
-import org.teiid.connector.language.Insert;
-import org.teiid.connector.language.LanguageObject;
-import org.teiid.connector.language.Literal;
-import org.teiid.connector.language.SQLReservedWords;
-import org.teiid.connector.language.Select;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import org.teiid.dqp.internal.datamgr.language.TestAggregateImpl;
import org.teiid.dqp.internal.datamgr.language.TestCompareCriteriaImpl;
import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl;
@@ -68,6 +57,18 @@
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.language.AggregateFunction;
+import org.teiid.language.ColumnReference;
+import org.teiid.language.Command;
+import org.teiid.language.Expression;
+import org.teiid.language.Function;
+import org.teiid.language.Insert;
+import org.teiid.language.LanguageObject;
+import org.teiid.language.Literal;
+import org.teiid.language.SQLReservedWords;
+import org.teiid.language.Select;
+import org.teiid.language.visitor.SQLStringVisitor;
+import org.teiid.metadata.RuntimeMetadata;
import org.teiid.query.sql.lang.CompareCriteria;
import org.teiid.query.sql.lang.JoinType;
Modified: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -41,7 +41,7 @@
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability;
import org.teiid.query.processor.HardcodedDataManager;
import org.teiid.query.unittest.TimestampUtil;
-import org.teiid.resource.cci.SourceSystemFunctions;
+import org.teiid.translator.SourceSystemFunctions;
public class TestXMLTypeTranslations extends BaseQueryTest {
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2010-05-11 22:15:35 UTC (rev 2118)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2010-05-12 15:27:10 UTC (rev 2119)
@@ -33,8 +33,6 @@
import org.teiid.client.DQP;
import org.teiid.client.security.ILogon;
import org.teiid.common.queue.FakeWorkManager;
-import org.teiid.connector.metadata.runtime.MetadataStore;
-import org.teiid.connector.metadata.runtime.Schema;
import org.teiid.deployers.MetadataStoreGroup;
import org.teiid.deployers.VDBRepository;
import org.teiid.dqp.internal.datamgr.impl.ConnectorManager;
@@ -43,12 +41,14 @@
import org.teiid.dqp.internal.process.DQPConfiguration;
import org.teiid.dqp.internal.process.DQPCore;
import org.teiid.dqp.service.FakeBufferService;
+import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Schema;
import org.teiid.metadata.index.IndexMetadataFactory;
import org.teiid.metadata.index.VDBMetadataFactory;
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
-import org.teiid.resource.ConnectorException;
import org.teiid.services.SessionServiceImpl;
+import org.teiid.translator.ConnectorException;
import org.teiid.transport.ClientServiceRegistry;
import org.teiid.transport.ClientServiceRegistryImpl;
import org.teiid.transport.LocalServerConnection;
More information about the teiid-commits
mailing list