teiid SVN: r587 - trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-18 16:09:28 -0400 (Wed, 18 Mar 2009)
New Revision: 587
Modified:
trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java
===================================================================
--- trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java 2009-03-18 20:09:25 UTC (rev 586)
+++ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java 2009-03-18 20:09:28 UTC (rev 587)
@@ -35,13 +35,13 @@
import org.teiid.connector.language.ICommand;
import org.teiid.connector.language.IQuery;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.SysLogger;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.unittest.FakeMetadataFacade;
import com.metamatrix.query.unittest.FakeMetadataFactory;
15 years, 2 months
teiid SVN: r586 - trunk/connector-api/src/main/java/org/teiid/connector/api.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-18 16:09:25 -0400 (Wed, 18 Mar 2009)
New Revision: 586
Modified:
trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionContext.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionContext.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionContext.java 2009-03-18 20:09:22 UTC (rev 585)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionContext.java 2009-03-18 20:09:25 UTC (rev 586)
@@ -155,5 +155,7 @@
* @param ex
*/
void addWarning(Exception ex);
+
+ boolean isTransactional();
}
15 years, 2 months
teiid SVN: r585 - in trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc: mm and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-18 16:09:22 -0400 (Wed, 18 Mar 2009)
New Revision: 585
Added:
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/SequeLinkOracleCapabilities.java
Removed:
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/ssl/
Modified:
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java 2009-03-18 20:09:19 UTC (rev 584)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java 2009-03-18 20:09:22 UTC (rev 585)
@@ -158,4 +158,14 @@
public boolean supportsRowOffset() {
return true;
}
+
+ @Override
+ public boolean supportsExcept() {
+ return true;
+ }
+
+ @Override
+ public boolean supportsIntersect() {
+ return true;
+ }
}
Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/SequeLinkOracleCapabilities.java (from rev 549, trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/ssl/SequeLinkOracleCapabilities.java)
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/SequeLinkOracleCapabilities.java (rev 0)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/SequeLinkOracleCapabilities.java 2009-03-18 20:09:22 UTC (rev 585)
@@ -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.connector.jdbc.oracle;
+
+
+
+/**
+ * @since 5.0
+ */
+public class SequeLinkOracleCapabilities extends OracleCapabilities {
+
+ @Override
+ public boolean supportsBulkInsert() {
+ return false;
+ }
+
+}
Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/SequeLinkOracleCapabilities.java
___________________________________________________________________
Name: svn:mergeinfo
+
15 years, 2 months
teiid SVN: r584 - in trunk/connector-sdk/src/main/java/com/metamatrix/cdk: api and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-18 16:09:19 -0400 (Wed, 18 Mar 2009)
New Revision: 584
Modified:
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java 2009-03-18 20:09:16 UTC (rev 583)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java 2009-03-18 20:09:19 UTC (rev 584)
@@ -28,14 +28,14 @@
import org.teiid.connector.language.ICommand;
import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory;
+import org.teiid.dqp.internal.datamgr.language.LanguageFactoryImpl;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryParserException;
import com.metamatrix.api.exception.query.QueryResolverException;
import com.metamatrix.api.exception.query.QueryValidatorException;
import com.metamatrix.core.MetaMatrixRuntimeException;
-import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory;
-import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.optimizer.relational.AliasGenerator;
import com.metamatrix.query.parser.QueryParser;
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java 2009-03-18 20:09:16 UTC (rev 583)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java 2009-03-18 20:09:19 UTC (rev 584)
@@ -39,14 +39,14 @@
import org.teiid.connector.api.UpdateExecution;
import org.teiid.connector.language.ICommand;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
+import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
+import org.teiid.dqp.internal.datamgr.language.BatchedUpdatesImpl;
import com.metamatrix.cdk.IConnectorHost;
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.ApplicationService;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
-import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
-import com.metamatrix.dqp.internal.datamgr.language.BatchedUpdatesImpl;
import com.metamatrix.metadata.runtime.VDBMetadataFactory;
/**
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java 2009-03-18 20:09:16 UTC (rev 583)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java 2009-03-18 20:09:19 UTC (rev 584)
@@ -29,9 +29,9 @@
import org.teiid.connector.api.ConnectorLogger;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
+import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
-import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
-import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
/**
* A utility factory class to create connector environment objects that are normally supplied
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java 2009-03-18 20:09:16 UTC (rev 583)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java 2009-03-18 20:09:19 UTC (rev 584)
@@ -27,9 +27,9 @@
import org.teiid.connector.language.ICommand;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.cdk.CommandBuilder;
-import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.metadata.runtime.VDBMetadataFactory;
import com.metamatrix.query.metadata.QueryMetadataInterface;
15 years, 2 months
teiid SVN: r583 - in trunk/test-integration/src/test/java/com/metamatrix: connector/jdbc/oracle and 4 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-18 16:09:16 -0400 (Wed, 18 Mar 2009)
New Revision: 583
Modified:
trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java
trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java
trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java
trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java
trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java
trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java
trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java
trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -35,19 +35,19 @@
import org.teiid.connector.language.ICommand;
import org.teiid.connector.language.ILanguageObject;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
+import org.teiid.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
+import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory;
+import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl;
+import org.teiid.dqp.internal.datamgr.language.TestInsertImpl;
+import org.teiid.dqp.internal.datamgr.language.TestProcedureImpl;
+import org.teiid.dqp.internal.datamgr.language.TestSelectImpl;
+import org.teiid.dqp.internal.datamgr.language.TestUpdateImpl;
+import org.teiid.dqp.internal.datamgr.language.TstLanguageBridgeFactory;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.core.util.UnitTestUtil;
-import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
-import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
-import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory;
-import com.metamatrix.dqp.internal.datamgr.language.TestDeleteImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestInsertImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestProcedureImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestSelectImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFactory;
import com.metamatrix.metadata.runtime.VDBMetadataFactory;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.resolver.QueryResolver;
Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -33,15 +33,15 @@
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.language.ICommand;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
+import org.teiid.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
+import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.common.types.DataTypeManager;
import com.metamatrix.core.util.UnitTestUtil;
-import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
-import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
-import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.unittest.FakeMetadataFacade;
import com.metamatrix.query.unittest.FakeMetadataFactory;
Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -32,12 +32,12 @@
import org.teiid.connector.jdbc.JDBCQueryExecution;
import org.teiid.connector.language.IQuery;
import org.teiid.connector.language.ISelect;
+import org.teiid.dqp.internal.datamgr.language.LiteralImpl;
+import org.teiid.dqp.internal.datamgr.language.QueryImpl;
+import org.teiid.dqp.internal.datamgr.language.SelectImpl;
+import org.teiid.dqp.internal.datamgr.language.SelectSymbolImpl;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.dqp.internal.datamgr.language.LiteralImpl;
-import com.metamatrix.dqp.internal.datamgr.language.QueryImpl;
-import com.metamatrix.dqp.internal.datamgr.language.SelectImpl;
-import com.metamatrix.dqp.internal.datamgr.language.SelectSymbolImpl;
public class TestJDBCExecutionHelper extends TestCase{
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -29,12 +29,12 @@
import org.teiid.connector.language.ICriteria;
import org.teiid.connector.language.IQuery;
import org.teiid.connector.language.LanguageUtil;
+import org.teiid.dqp.internal.datamgr.language.LanguageFactoryImpl;
import junit.framework.TestCase;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl;
/**
*/
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -27,8 +27,8 @@
import org.teiid.connector.language.*;
import org.teiid.connector.language.ICompareCriteria.Operator;
import org.teiid.connector.visitor.util.CollectorVisitor;
+import org.teiid.dqp.internal.datamgr.language.*;
-import com.metamatrix.dqp.internal.datamgr.language.*;
import junit.framework.TestCase;
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -37,45 +37,45 @@
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import org.teiid.connector.visitor.util.SQLReservedWords;
import org.teiid.connector.visitor.util.SQLStringVisitor;
+import org.teiid.dqp.internal.datamgr.language.AggregateImpl;
+import org.teiid.dqp.internal.datamgr.language.ElementImpl;
+import org.teiid.dqp.internal.datamgr.language.FunctionImpl;
+import org.teiid.dqp.internal.datamgr.language.GroupImpl;
+import org.teiid.dqp.internal.datamgr.language.LiteralImpl;
+import org.teiid.dqp.internal.datamgr.language.TestAggregateImpl;
+import org.teiid.dqp.internal.datamgr.language.TestCompareCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl;
+import org.teiid.dqp.internal.datamgr.language.TestElementImpl;
+import org.teiid.dqp.internal.datamgr.language.TestExistsCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestFromImpl;
+import org.teiid.dqp.internal.datamgr.language.TestFunctionImpl;
+import org.teiid.dqp.internal.datamgr.language.TestGroupByImpl;
+import org.teiid.dqp.internal.datamgr.language.TestGroupImpl;
+import org.teiid.dqp.internal.datamgr.language.TestInCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestInsertImpl;
+import org.teiid.dqp.internal.datamgr.language.TestIsNullCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestJoinImpl;
+import org.teiid.dqp.internal.datamgr.language.TestLikeCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestLiteralImpl;
+import org.teiid.dqp.internal.datamgr.language.TestNotCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestOrderByImpl;
+import org.teiid.dqp.internal.datamgr.language.TestProcedureImpl;
+import org.teiid.dqp.internal.datamgr.language.TestQueryImpl;
+import org.teiid.dqp.internal.datamgr.language.TestScalarSubqueryImpl;
+import org.teiid.dqp.internal.datamgr.language.TestSearchedCaseExpressionImpl;
+import org.teiid.dqp.internal.datamgr.language.TestSelectImpl;
+import org.teiid.dqp.internal.datamgr.language.TestSelectSymbolImpl;
+import org.teiid.dqp.internal.datamgr.language.TestSetQueryImpl;
+import org.teiid.dqp.internal.datamgr.language.TestSubqueryCompareCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestSubqueryInCriteriaImpl;
+import org.teiid.dqp.internal.datamgr.language.TestUpdateImpl;
+import org.teiid.dqp.internal.datamgr.language.TstLanguageBridgeFactory;
+import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import junit.framework.TestCase;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.dqp.internal.datamgr.language.AggregateImpl;
-import com.metamatrix.dqp.internal.datamgr.language.ElementImpl;
-import com.metamatrix.dqp.internal.datamgr.language.FunctionImpl;
-import com.metamatrix.dqp.internal.datamgr.language.GroupImpl;
-import com.metamatrix.dqp.internal.datamgr.language.LiteralImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestAggregateImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestCompareCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestDeleteImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestElementImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestExistsCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestFromImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestFunctionImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestGroupByImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestGroupImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestInCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestInsertImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestIsNullCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestJoinImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestLikeCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestLiteralImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestNotCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestOrderByImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestProcedureImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestQueryImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestScalarSubqueryImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestSearchedCaseExpressionImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestSelectImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestSelectSymbolImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestSetQueryImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestSubqueryCompareCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestSubqueryInCriteriaImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl;
-import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFactory;
-import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.sql.ReservedWords;
import com.metamatrix.query.sql.lang.CompareCriteria;
Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestTPCR.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -27,9 +27,9 @@
import org.teiid.connector.jdbc.oracle.OracleCapabilities;
import org.teiid.connector.jdbc.sqlserver.SqlServerCapabilities;
+import org.teiid.dqp.internal.datamgr.CapabilitiesConverter;
import com.metamatrix.core.util.UnitTestUtil;
-import com.metamatrix.dqp.internal.datamgr.CapabilitiesConverter;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.optimizer.TestOptimizer;
import com.metamatrix.query.optimizer.capabilities.FakeCapabilitiesFinder;
Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java 2009-03-18 20:09:13 UTC (rev 582)
+++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestXMLTypeTranslations.java 2009-03-18 20:09:16 UTC (rev 583)
@@ -29,9 +29,9 @@
import java.util.Set;
import org.teiid.connector.jdbc.oracle.OracleCapabilities;
+import org.teiid.dqp.internal.datamgr.CapabilitiesConverter;
import com.metamatrix.core.util.UnitTestUtil;
-import com.metamatrix.dqp.internal.datamgr.CapabilitiesConverter;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.optimizer.capabilities.FakeCapabilitiesFinder;
import com.metamatrix.query.processor.HardcodedDataManager;
15 years, 2 months
teiid SVN: r582 - trunk/common-core/src/main/java/com/metamatrix/core/util.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-18 16:09:13 -0400 (Wed, 18 Mar 2009)
New Revision: 582
Modified:
trunk/common-core/src/main/java/com/metamatrix/core/util/ReflectionHelper.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/ReflectionHelper.java
===================================================================
--- trunk/common-core/src/main/java/com/metamatrix/core/util/ReflectionHelper.java 2009-03-18 20:09:10 UTC (rev 581)
+++ trunk/common-core/src/main/java/com/metamatrix/core/util/ReflectionHelper.java 2009-03-18 20:09:13 UTC (rev 582)
@@ -266,26 +266,34 @@
public static final Object create(String className, Collection ctorObjs,
final ClassLoader classLoader) throws MetaMatrixCoreException {
+ try {
+ int size = (ctorObjs == null ? 0 : ctorObjs.size());
+ Class[] names = new Class[size];
+ Object[] objArray = new Object[size];
+ int i = 0;
+
+ if (size > 0) {
+ for (Iterator it=ctorObjs.iterator(); it.hasNext(); ) {
+ Object obj = it.next();
+ names[i] = loadClass(obj.getClass().getName(),classLoader);
+ objArray[i] = obj;
+ i++;
+ }
+ }
+ return create(className, objArray, names, classLoader);
+ } catch (Exception e) {
+ throw new MetaMatrixCoreException(e);
+ }
+ }
+
+ public static final Object create(String className, Object[] ctorObjs, Class<?>[] argTypes,
+ final ClassLoader classLoader) throws MetaMatrixCoreException {
try {
- int size = (ctorObjs == null ? 0 : ctorObjs.size());
- Class[] names = new Class[size];
- Object[] objArray = new Object[size];
- int i = 0;
-
- if (size > 0) {
- for (Iterator it=ctorObjs.iterator(); it.hasNext(); ) {
- Object obj = it.next();
- names[i] = loadClass(obj.getClass().getName(),classLoader);
- objArray[i] = obj;
- i++;
- }
- }
-
final Class cls = loadClass(className,classLoader);
- Constructor ctor = cls.getDeclaredConstructor(names);
+ Constructor ctor = cls.getDeclaredConstructor(argTypes);
- return ctor.newInstance(objArray);
+ return ctor.newInstance(ctorObjs);
} catch(Exception e) {
throw new MetaMatrixCoreException(e);
15 years, 2 months
teiid SVN: r581 - in trunk/connector-metadata/src: test/java/com/metamatrix/connector/metadata and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-18 16:09:10 -0400 (Wed, 18 Mar 2009)
New Revision: 581
Modified:
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java 2009-03-18 19:52:31 UTC (rev 580)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java 2009-03-18 20:09:10 UTC (rev 581)
@@ -25,11 +25,11 @@
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
+import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.connector.metadata.adapter.ObjectConnector;
import com.metamatrix.connector.metadata.internal.IObjectSource;
-import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.dqp.service.DQPServiceNames;
import com.metamatrix.dqp.service.metadata.IndexSelectorSource;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java 2009-03-18 19:52:31 UTC (rev 580)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java 2009-03-18 20:09:10 UTC (rev 581)
@@ -36,6 +36,8 @@
import org.teiid.connector.api.ResultSetExecution;
import org.teiid.connector.language.IQuery;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
+import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
import junit.framework.TestCase;
@@ -48,8 +50,6 @@
import com.metamatrix.connector.metadata.internal.TestConnectorHost;
import com.metamatrix.connector.metadata.internal.TestObjectQueryProcessor;
import com.metamatrix.core.MetaMatrixRuntimeException;
-import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
-import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
import com.metamatrix.dqp.service.DQPServiceNames;
import com.metamatrix.metadata.runtime.FakeMetadataService;
import com.metamatrix.metadata.runtime.FakeQueryMetadata;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java 2009-03-18 19:52:31 UTC (rev 580)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java 2009-03-18 20:09:10 UTC (rev 581)
@@ -34,13 +34,13 @@
import org.teiid.connector.api.ResultSetExecution;
import org.teiid.connector.language.IQuery;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.core.MetaMatrixRuntimeException;
-import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.unittest.QueryMetadataInterfaceBuilder;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java 2009-03-18 19:52:31 UTC (rev 580)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java 2009-03-18 20:09:10 UTC (rev 581)
@@ -29,13 +29,13 @@
import org.teiid.connector.language.ICommand;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.connector.metadata.index.MetadataInCriteria;
import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria;
-import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory;
import com.metamatrix.query.parser.QueryParser;
import com.metamatrix.query.resolver.QueryResolver;
import com.metamatrix.query.sql.lang.Command;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java 2009-03-18 19:52:31 UTC (rev 580)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java 2009-03-18 20:09:10 UTC (rev 581)
@@ -31,13 +31,13 @@
import org.teiid.connector.language.ICommand;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.core.util.UnitTestUtil;
-import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.metadata.runtime.FakeMetadataService;
import com.metamatrix.metadata.runtime.FakeQueryMetadata;
15 years, 2 months
teiid SVN: r580 - in trunk: embedded/src/test/java/com/metamatrix/jdbc and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-18 15:52:31 -0400 (Wed, 18 Mar 2009)
New Revision: 580
Modified:
trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties
trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java
Log:
TEIID-426: Changed the names of the Driver to "Teiid" and also hooked the driver versions to be derived from the ApplicationInfo object
Modified: trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties
===================================================================
--- trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties 2009-03-18 19:39:32 UTC (rev 579)
+++ trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties 2009-03-18 19:52:31 UTC (rev 580)
@@ -113,7 +113,7 @@
MMDatabaseMetadata.getModels_error=Error trying to get metadata information for models that match {0} - {1}.
MMDriver.Err_registering=JDBC driver could not be registered with the DriverManager: {0}.
MMDriver.urlFormat=The required url format is jdbc:metamatrix:VDBName@mm[s]://server1:port1[,server2:port2][;optional properties]
-MMDriver.Connection_sucess=The JDBC Driver successfully obtained a connection.
+JDBCDriver.Connection_sucess=The JDBC Driver successfully obtained a connection.
MMDriver.Err_init_appinfo=Could not initialize ApplicationInfo (Version number): {0}.
MMStatement.Close_stmt_success=Statement closed successfully.
MMStatement.Stmt_closed=Unable to perform operations on an already closed statement.
Modified: trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
===================================================================
--- trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java 2009-03-18 19:39:32 UTC (rev 579)
+++ trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java 2009-03-18 19:52:31 UTC (rev 580)
@@ -38,12 +38,6 @@
EmbeddedDriver driver = new EmbeddedDriver();
- public void testGetVersion() {
- assertEquals(EmbeddedDriver.MAJOR_VERSION, driver.getMajorVersion());
- assertEquals(EmbeddedDriver.MINOR_VERSION, driver.getMinorVersion());
- assertEquals(EmbeddedDriver.DRIVER_NAME, driver.getDriverName());
- }
-
/*
* Test method for 'com.metamatrix.jdbc.EmbeddedDriver.acceptsURL(String)'
* // (\\w:[\\\\,\\/]|file:\\/\\/|\\/|\\\\|(\\.){1,2}){1}
Modified: trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java 2009-03-18 19:39:32 UTC (rev 579)
+++ trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java 2009-03-18 19:52:31 UTC (rev 580)
@@ -51,6 +51,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import com.metamatrix.common.util.ApplicationInfo;
import com.metamatrix.core.util.UnitTestUtil;
import com.metamatrix.jdbc.util.ResultSetUtil;
@@ -116,6 +117,8 @@
Object expectedValue = null;
Object expectedReturn = expectedMap.get(methods[i].getName());
Object[] params = null;
+
+ if (methods[i].getName().equalsIgnoreCase(DQP_CONFIG_FILE))
if (expectedReturn instanceof List) {
// has input parameters
@@ -1473,13 +1476,13 @@
expected.put("usesLocalFilePerTable", Boolean.FALSE); //$NON-NLS-1$
// return type -- int
- expected.put("getDatabaseMinorVersion", new Integer(EmbeddedDriver.MINOR_VERSION)); //$NON-NLS-1$
- expected.put("getDatabaseMajorVersion", new Integer(EmbeddedDriver.MAJOR_VERSION)); //$NON-NLS-1$
+ expected.put("getDatabaseMinorVersion", new Integer(ApplicationInfo.getInstance().getMinorReleaseVersion())); //$NON-NLS-1$
+ expected.put("getDatabaseMajorVersion", new Integer(ApplicationInfo.getInstance().getMajorReleaseVersion())); //$NON-NLS-1$
expected.put("getJDBCMajorVersion", new Integer(3)); //$NON-NLS-1$
expected.put("getJDBCMinorVersion", new Integer(0)); //$NON-NLS-1$
expected.put("getDefaultTransactionIsolation", new Integer(Connection.TRANSACTION_NONE)); //$NON-NLS-1$
- expected.put("getDriverMajorVersion", new Integer(EmbeddedDriver.MAJOR_VERSION)); //$NON-NLS-1$
- expected.put("getDriverMinorVersion", new Integer(EmbeddedDriver.MINOR_VERSION)); //$NON-NLS-1$
+ expected.put("getDriverMajorVersion", new Integer(ApplicationInfo.getInstance().getMajorReleaseVersion())); //$NON-NLS-1$
+ expected.put("getDriverMinorVersion", new Integer(ApplicationInfo.getInstance().getMinorReleaseVersion())); //$NON-NLS-1$
expected.put("getMaxBinaryLiteralLength", new Integer(NO_LIMIT)); //$NON-NLS-1$
expected.put("getMaxCatalogNameLength", new Integer(NO_LIMIT)); //$NON-NLS-1$
expected.put("getMaxCharLiteralLength", new Integer(NO_LIMIT)); //$NON-NLS-1$
@@ -1509,7 +1512,7 @@
expected.put("getDatabaseProductName", "MetaMatrix Query"); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getDatabaseProductVersion", "5.5"); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getDriverName", "MetaMatrix Query JDBC Driver"); //$NON-NLS-1$ //$NON-NLS-2$
- expected.put("getDriverVersion", "5.5"); //$NON-NLS-1$ //$NON-NLS-2$
+ expected.put("getDriverVersion", ApplicationInfo.getInstance().getMajorReleaseVersion()+"."+ApplicationInfo.getInstance().getMinorReleaseVersion()); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getExtraNameCharacters", ".@"); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getIdentifierQuoteString", "\""); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getNumericFunctions", MMDatabaseMetaData.NUMERIC_FUNCTIONS); //$NON-NLS-1$
15 years, 2 months
teiid SVN: r579 - trunk/common-core/src/main/java/com/metamatrix/common/util.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-18 15:39:32 -0400 (Wed, 18 Mar 2009)
New Revision: 579
Modified:
trunk/common-core/src/main/java/com/metamatrix/common/util/ApplicationInfo.java
Log:
TEIID-426: Changed the names of the Driver to "Teiid" and also hooked the driver versions to be derived from the ApplicationInfo object
Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/ApplicationInfo.java
===================================================================
--- trunk/common-core/src/main/java/com/metamatrix/common/util/ApplicationInfo.java 2009-03-18 19:33:17 UTC (rev 578)
+++ trunk/common-core/src/main/java/com/metamatrix/common/util/ApplicationInfo.java 2009-03-18 19:39:32 UTC (rev 579)
@@ -69,9 +69,20 @@
}
public String getMajorReleaseNumber() {
- return getReleaseNumber().substring(0, getReleaseNumber().lastIndexOf('.')); //$NON-NLS-1$
+ return getReleaseNumber().substring(0, getReleaseNumber().lastIndexOf('.'));
}
+ public int getMajorReleaseVersion() {
+ String version = getReleaseNumber().substring(0, getReleaseNumber().indexOf('.'));
+ return Integer.parseInt(version);
+ }
+
+ public int getMinorReleaseVersion() {
+ int majorIndex = getReleaseNumber().indexOf('.');
+ String version = getReleaseNumber().substring(majorIndex+1, getReleaseNumber().indexOf('.', majorIndex+1));
+ return Integer.parseInt(version);
+ }
+
public String getBuildNumber() {
return props.getProperty("build.number"); //$NON-NLS-1$
}
15 years, 2 months
teiid SVN: r578 - trunk/client-jdbc/src/main/java/com/metamatrix/jdbc.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-18 15:33:17 -0400 (Wed, 18 Mar 2009)
New Revision: 578
Modified:
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataSource.java
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java
Log:
TEIID-426: Changed the names of the Driver to "Teiid" and also hooked the driver versions to be derived from the ApplicationInfo object
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataSource.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataSource.java 2009-03-18 18:39:01 UTC (rev 577)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataSource.java 2009-03-18 19:33:17 UTC (rev 578)
@@ -102,7 +102,7 @@
if (this.getBootstrapFile() != null && this.getBootstrapFile().trim().length() != 0) {
try {
- if (this.getBootstrapFile().equals(this.driver.getDefaultConnectionURL())) {
+ if (this.getBootstrapFile().equals(EmbeddedDriver.getDefaultConnectionURL())) {
props.put("vdb.definition", getDatabaseName() +".vdb"); //$NON-NLS-1$ //$NON-NLS-2$
}
props.put(EmbeddedDataSource.DQP_BOOTSTRAP_FILE, URLHelper.buildURL(this.getBootstrapFile().trim()));
@@ -119,7 +119,7 @@
// we do not have bootstrap file, make sure we have a default one.
if (getBootstrapFile() == null && getDatabaseName() != null) {
- setBootstrapFile(this.driver.getDefaultConnectionURL());
+ setBootstrapFile(EmbeddedDriver.getDefaultConnectionURL());
}
String reason = reasonWhyInvalidConfigFile(this.bootstrapFile);
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-03-18 18:39:01 UTC (rev 577)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-03-18 19:33:17 UTC (rev 578)
@@ -45,6 +45,7 @@
import com.metamatrix.common.protocol.MMURLConnection;
import com.metamatrix.common.protocol.MetaMatrixURLStreamHandlerFactory;
import com.metamatrix.common.protocol.URLHelper;
+import com.metamatrix.common.util.ApplicationInfo;
import com.metamatrix.jdbc.util.MMJDBCURL;
/**
@@ -69,9 +70,7 @@
*/
static final String URL_PATTERN = "jdbc:metamatrix:(\\w+)@(([^;]*)[;]?)((.*)*)"; //$NON-NLS-1$
static final String BASE_PATTERN = "jdbc:metamatrix:((\\w+)[;]?)(;([^@])+)*"; //$NON-NLS-1$
- public static final int MAJOR_VERSION = 5;
- public static final int MINOR_VERSION = 5;
- public static final String DRIVER_NAME = "MetaMatrix Query JDBC Driver"; //$NON-NLS-1$
+ public static final String DRIVER_NAME = "Teiid Embedded JDBC Driver"; //$NON-NLS-1$
static final String DQP_IDENTITY = "dqp.identity"; //$NON-NLS-1$
static final String MM_IO_TMPDIR = "mm.io.tmpdir"; //$NON-NLS-1$
@@ -301,7 +300,7 @@
* @return major version number of the driver.
*/
public int getMajorVersion() {
- return MAJOR_VERSION;
+ return ApplicationInfo.getInstance().getMajorReleaseVersion();
}
/**
@@ -309,7 +308,7 @@
* @return major version number of the driver.
*/
public int getMinorVersion() {
- return MINOR_VERSION;
+ return ApplicationInfo.getInstance().getMinorReleaseVersion();
}
/**
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-03-18 18:39:01 UTC (rev 577)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-03-18 19:33:17 UTC (rev 578)
@@ -39,6 +39,7 @@
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.comm.exception.ConnectionException;
import com.metamatrix.common.comm.platform.socket.client.SocketServerConnectionFactory;
+import com.metamatrix.common.util.ApplicationInfo;
import com.metamatrix.common.util.PropertiesUtils;
import com.metamatrix.core.MetaMatrixCoreException;
import com.metamatrix.jdbc.api.ConnectionProperties;
@@ -59,9 +60,7 @@
static final String JDBC = BaseDataSource.JDBC;
static final String URL_PREFIX = JDBC + BaseDataSource.METAMATRIX_PROTOCOL;
- static final int MAJOR_VERSION = 5;
- static final int MINOR_VERSION = 5;
- static final String DRIVER_NAME = "MetaMatrix JDBC Driver"; //$NON-NLS-1$
+ static final String DRIVER_NAME = "Teiid JDBC Driver"; //$NON-NLS-1$
/**
* Suports JDBC URLS of format
* - jdbc:metamatrix:BQT@mm://localhost:####;version=1
@@ -128,11 +127,10 @@
} catch (MetaMatrixCoreException e) {
DriverManager.println(e.getMessage());
throw MMSQLException.create(e, e.getMessage());
- //throw new MMSQLException(e.getMessage(), e);
}
// logging
- String logMsg = JDBCPlugin.Util.getString("MMDriver.Connection_sucess"); //$NON-NLS-1$
+ String logMsg = JDBCPlugin.Util.getString("JDBCDriver.Connection_sucess"); //$NON-NLS-1$
logger.info(logMsg);
return myConnection;
@@ -208,7 +206,7 @@
* @return major version number of the driver.
*/
public int getMajorVersion() {
- return MAJOR_VERSION;
+ return ApplicationInfo.getInstance().getMajorReleaseVersion();
}
/**
@@ -216,7 +214,7 @@
* @return major version number of the driver.
*/
public int getMinorVersion() {
- return MINOR_VERSION;
+ return ApplicationInfo.getInstance().getMinorReleaseVersion();
}
/**
15 years, 2 months