Author: shawkins Date: 2009-11-12 14:47:07 -0500 (Thu, 12 Nov 2009) New Revision: 1549 Added: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java Removed: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/h2/TestH2Translator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java trunk/test-integration/common/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java Log: TEIID-880 adding a fix for uniqueidentifier handling Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -28,9 +28,16 @@ import java.util.List; import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator; +import org.teiid.connector.language.IElement; import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageObject; +import com.metamatrix.core.MetaMatrixRuntimeException; + /** * Updated to assume the use of the DataDirect, 2005 driver, or later. */ @@ -52,5 +59,20 @@ public Class<? extends ConnectorCapabilities> getDefaultCapabilities() { return SqlServerCapabilities.class; } + + @Override + public List<?> translate(ILanguageObject obj, ExecutionContext context) { + if (obj instanceof IElement) { + IElement elem = (IElement)obj; + try { + if (TypeFacility.RUNTIME_TYPES.STRING.equals(elem.getType()) && "uniqueidentifier".equalsIgnoreCase(elem.getMetadataObject().getNativeType())) { //$NON-NLS-1$ + return Arrays.asList("cast(", elem, " as char(36))"); //$NON-NLS-1$ //$NON-NLS-2$ + } + } catch (ConnectorException e) { + throw new MetaMatrixRuntimeException(e); + } + } + return super.translate(obj, context); + } } Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -1,66 +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.jdbc; - -import static org.junit.Assert.*; - -import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.translator.TranslatedCommand; -import org.teiid.connector.jdbc.translator.Translator; -import org.teiid.connector.language.ICommand; - -import junit.framework.Assert; - -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; - -public class MetadataFactory { - - public static final String PARTS_VDB = "/PartsSupplier.vdb"; //$NON-NLS-1$ - public static final String BQT_VDB = "/bqt.vdb"; //$NON-NLS-1$ - - public static ICommand helpTranslate(String vdbFileName, String sql) { - TranslationUtility util = null; - if (PARTS_VDB.equals(vdbFileName)) { - util = new TranslationUtility(MetadataFactory.class.getResource(vdbFileName)); - } else if (BQT_VDB.equals(vdbFileName)){ - util = FakeTranslationFactory.getInstance().getBQTTranslationUtility(); - } else { - Assert.fail("unknown vdb"); //$NON-NLS-1$ - } - return util.parseCommand(sql); - } - - public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { - // Convert from sql to objects - ICommand obj = helpTranslate(vdb, input); - - TranslatedCommand tc = new TranslatedCommand(EnvironmentUtility.createSecurityContext("user"), translator); //$NON-NLS-1$ - tc.translateCommand(obj); - - // Check stuff - assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ - } - -} Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -44,7 +44,7 @@ public class TestJDBCProcedureExecution { @Test public void testProcedureExecution() throws Exception { - ICommand command = MetadataFactory.helpTranslate(MetadataFactory.BQT_VDB, "exec pm2.spTest8a()"); //$NON-NLS-1$ + ICommand command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "exec pm2.spTest8a()"); //$NON-NLS-1$ Connection connection = Mockito.mock(Connection.class); CallableStatement cs = Mockito.mock(CallableStatement.class); Mockito.stub(cs.getUpdateCount()).toReturn(-1); @@ -60,7 +60,7 @@ } @Test public void testProcedureExecution1() throws Exception { - ICommand command = MetadataFactory.helpTranslate(MetadataFactory.BQT_VDB, "exec pm2.spTest8(1)"); //$NON-NLS-1$ + ICommand command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "exec pm2.spTest8(1)"); //$NON-NLS-1$ Connection connection = Mockito.mock(Connection.class); CallableStatement cs = Mockito.mock(CallableStatement.class); Mockito.stub(cs.getUpdateCount()).toReturn(-1); Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -42,7 +42,7 @@ public class TestJDBCUpdateExecution { @Test public void testBulkUpdate() throws Exception { - ICommand command = MetadataFactory.helpTranslate(MetadataFactory.BQT_VDB, "insert into bqt1.smalla (intkey, intnum) values (1, 2)"); //$NON-NLS-1$ + ICommand command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "insert into bqt1.smalla (intkey, intnum) values (1, 2)"); //$NON-NLS-1$ ILiteral value = ((ILiteral)((IInsertExpressionValueSource)((IInsert)command).getValueSource()).getValues().get(0)); ILiteral value1 = ((ILiteral)((IInsertExpressionValueSource)((IInsert)command).getValueSource()).getValues().get(1)); value.setMultiValued(true); Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java (from rev 1545, trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java) =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -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.connector.jdbc; + +import static org.junit.Assert.*; + +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; + +import junit.framework.Assert; + +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.cdk.api.TranslationUtility; +import com.metamatrix.cdk.unittest.FakeTranslationFactory; + +public class TranslationHelper { + + public static final String PARTS_VDB = "/PartsSupplier.vdb"; //$NON-NLS-1$ + public static final String BQT_VDB = "/bqt.vdb"; //$NON-NLS-1$ + + public static ICommand helpTranslate(String vdbFileName, String sql) { + TranslationUtility util = null; + if (PARTS_VDB.equals(vdbFileName)) { + util = new TranslationUtility(TranslationHelper.class.getResource(vdbFileName)); + } else if (BQT_VDB.equals(vdbFileName)){ + util = FakeTranslationFactory.getInstance().getBQTTranslationUtility(); + } else { + Assert.fail("unknown vdb"); //$NON-NLS-1$ + } + return util.parseCommand(sql); + } + + public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { + // Convert from sql to objects + ICommand obj = helpTranslate(vdb, input); + + helpTestVisitor(expectedOutput, translator, obj); + } + + public static void helpTestVisitor(String expectedOutput, + Translator translator, ICommand obj) throws ConnectorException { + TranslatedCommand tc = new TranslatedCommand(EnvironmentUtility.createSecurityContext("user"), translator); //$NON-NLS-1$ + tc.translateCommand(obj); + assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ + } + +} Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -30,7 +30,7 @@ import org.junit.Test; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ExecutionContext; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.language.ICommand; @@ -130,7 +130,7 @@ String input = "SELECT locate(INTNUM, 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(char(SmallA.IntNum), 'chimp', 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -147,7 +147,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp') FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -164,7 +164,7 @@ String input = "SELECT locate(INTNUM, '234567890', 1) FROM BQT1.SMALLA WHERE INTKEY = 26"; //$NON-NLS-1$ String output = "SELECT LOCATE(char(SmallA.IntNum), '234567890', 1) FROM SmallA WHERE SmallA.IntKey = 26"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -181,7 +181,7 @@ String input = "SELECT locate('c', 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT 1 FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -198,7 +198,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', -5) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp', 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -215,7 +215,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', INTNUM) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp', CASE WHEN SmallA.IntNum < 1 THEN 1 ELSE SmallA.IntNum END) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -232,7 +232,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', LOCATE(STRINGNUM, 'chimp') + 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp', CASE WHEN (LOCATE(SmallA.StringNum, 'chimp') + 1) < 1 THEN 1 ELSE (LOCATE(SmallA.StringNum, 'chimp') + 1) END) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbySQLTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbySQLTranslator.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbySQLTranslator.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -27,7 +27,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import com.metamatrix.cdk.api.EnvironmentUtility; @@ -48,7 +48,7 @@ String input = "select concat(stringnum,'_xx') from BQT1.Smalla"; //$NON-NLS-1$ String output = "SELECT {fn concat(SmallA.StringNum, '_xx')} FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @Test @@ -56,7 +56,7 @@ String input = "select concat(stringnum, stringnum) from BQT1.Smalla"; //$NON-NLS-1$ String output = "SELECT {fn concat(SmallA.StringNum, SmallA.StringNum)} FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @Test @@ -64,7 +64,7 @@ String input = "select concat2(stringnum,'_xx') from BQT1.Smalla"; //$NON-NLS-1$ String output = "SELECT {fn concat(coalesce(SmallA.StringNum, ''), '_xx')} FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @Test @@ -72,7 +72,7 @@ String input = "select concat2(stringnum, stringnum) from BQT1.Smalla"; //$NON-NLS-1$ String output = "SELECT CASE WHEN SmallA.StringNum IS NULL THEN NULL ELSE {fn concat(coalesce(SmallA.StringNum, ''), coalesce(SmallA.StringNum, ''))} END FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/h2/TestH2Translator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/h2/TestH2Translator.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/h2/TestH2Translator.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -27,7 +27,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import com.metamatrix.cdk.api.EnvironmentUtility; @@ -45,21 +45,21 @@ String input = "select timestampdiff(SQL_TSI_FRAC_SECOND, timestampvalue, {d'1970-01-01'}) from BQT1.Smalla"; //$NON-NLS-1$ String output = "SELECT datediff('MILLISECOND', SmallA.TimestampValue, TIMESTAMP '1970-01-01 00:00:00.0') * 1000000 FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @Test public void testTimestampAdd() throws Exception { String input = "select timestampadd(SQL_TSI_FRAC_SECOND, 2, datevalue) from BQT1.Smalla"; //$NON-NLS-1$ String output = "SELECT cast(dateadd('MILLISECOND', (2 / 1000000), cast(SmallA.DateValue AS timestamp)) AS date) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @Test public void testTimestampAdd1() throws Exception { String input = "select timestampadd(SQL_TSI_HOUR, intnum, {t'00:00:00'}) from BQT1.Smalla"; //$NON-NLS-1$ String output = "SELECT cast(dateadd('HOUR', SmallA.IntNum, TIMESTAMP '1970-01-01 00:00:00.0') AS time) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -27,7 +27,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import com.metamatrix.cdk.api.EnvironmentUtility; @@ -43,18 +43,18 @@ } private String getTestVDB() { - return MetadataFactory.PARTS_VDB; + return TranslationHelper.PARTS_VDB; } private String getTestBQTVDB() { - return MetadataFactory.BQT_VDB; + return TranslationHelper.BQT_VDB; } @Test public void testConversion1() throws Exception { String input = "SELECT char(convert(PART_WEIGHT, integer) + 100) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT char((cast(PARTS.PART_WEIGHT AS signed) + 100)) FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -63,7 +63,7 @@ String input = "SELECT convert(PART_WEIGHT, long) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT cast(PARTS.PART_WEIGHT AS signed) FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -72,7 +72,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, long), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT cast(cast(PARTS.PART_WEIGHT AS signed) AS char) FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -81,7 +81,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, date), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT date_format(DATE(PARTS.PART_WEIGHT), '%Y-%m-%d') FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -89,7 +89,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, time), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT date_format(TIME(PARTS.PART_WEIGHT), '%H:%i:%S') FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -97,7 +97,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, timestamp), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT date_format(TIMESTAMP(PARTS.PART_WEIGHT), '%Y-%m-%d %H:%i:%S.%f') FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -105,7 +105,7 @@ String input = "SELECT ifnull(PART_WEIGHT, 'otherString') FROM PARTS"; //$NON-NLS-1$ String output = "SELECT ifnull(PARTS.PART_WEIGHT, 'otherString') FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -113,7 +113,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, integer), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT cast(cast(PARTS.PART_WEIGHT AS signed) AS char) FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -121,7 +121,7 @@ String input = "SELECT insert(PART_WEIGHT, 1, 5, 'chimp') FROM PARTS"; //$NON-NLS-1$ String output = "SELECT insert(PARTS.PART_WEIGHT, 1, 5, 'chimp') FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -138,7 +138,7 @@ String input = "SELECT locate(INTNUM, 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(cast(SmallA.IntNum AS char), 'chimp', 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -155,7 +155,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp') FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -172,7 +172,7 @@ String input = "SELECT locate(INTNUM, '234567890', 1) FROM BQT1.SMALLA WHERE INTKEY = 26"; //$NON-NLS-1$ String output = "SELECT LOCATE(cast(SmallA.IntNum AS char), '234567890', 1) FROM SmallA WHERE SmallA.IntKey = 26"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -189,7 +189,7 @@ String input = "SELECT locate('c', 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT 1 FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -206,7 +206,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', -5) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp', 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -223,7 +223,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', INTNUM) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp', CASE WHEN SmallA.IntNum < 1 THEN 1 ELSE SmallA.IntNum END) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -240,7 +240,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', LOCATE(STRINGNUM, 'chimp') + 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT LOCATE(SmallA.StringNum, 'chimp', CASE WHEN (LOCATE(SmallA.StringNum, 'chimp') + 1) < 1 THEN 1 ELSE (LOCATE(SmallA.StringNum, 'chimp') + 1) END) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -249,7 +249,7 @@ String input = "SELECT substring(PART_WEIGHT, 1) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT substring(PARTS.PART_WEIGHT, 1) FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -257,7 +257,7 @@ String input = "SELECT substring(PART_WEIGHT, 1, 5) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT substring(PARTS.PART_WEIGHT, 1, 5) FROM PARTS"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -265,7 +265,7 @@ String input = "SELECT PART_ID FROM PARTS UNION SELECT PART_ID FROM PARTS ORDER BY PART_ID"; //$NON-NLS-1$ String output = "(SELECT PARTS.PART_ID FROM PARTS) UNION (SELECT PARTS.PART_ID FROM PARTS) ORDER BY PART_ID"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestVDB(), + TranslationHelper.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -274,7 +274,7 @@ String input = "select intkey from bqt1.smalla limit 100"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA LIMIT 100"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestBQTVDB(), + TranslationHelper.helpTestVisitor(getTestBQTVDB(), input, output, TRANSLATOR); } @@ -283,7 +283,7 @@ String input = "select intkey from bqt1.smalla limit 50, 100"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA LIMIT 50, 100"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(getTestBQTVDB(), + TranslationHelper.helpTestVisitor(getTestBQTVDB(), input, output, TRANSLATOR); } @@ -292,7 +292,7 @@ String input = "select bitand(intkey, intnum) from bqt1.smalla"; //$NON-NLS-1$ String output = "SELECT cast((SmallA.IntKey & SmallA.IntNum) AS signed) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -301,7 +301,7 @@ String input = "select smalla.intkey from bqt1.smalla inner join bqt1.smallb on smalla.stringkey=smallb.stringkey cross join bqt1.mediuma"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM (SmallA INNER JOIN SmallB ON SmallA.StringKey = SmallB.StringKey) CROSS JOIN MediumA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -310,7 +310,7 @@ String input = "select smalla.intkey from bqt1.smalla where smalla.timestampvalue = '2009-08-06 12:23:34.999'"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA WHERE SmallA.TimestampValue = {ts '2009-08-06 12:23:34.0'}"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; import org.teiid.connector.language.ICommand; @@ -101,7 +101,7 @@ String input = "select smalla.intkey from bqt1.smalla inner join bqt1.smallb on smalla.stringkey=smallb.stringkey cross join bqt1.mediuma"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA INNER JOIN SmallB ON SmallA.StringKey = SmallB.StringKey CROSS JOIN MediumA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -110,7 +110,7 @@ String input = "select smalla.intkey from bqt1.smalla cross join (bqt1.smallb cross join bqt1.mediuma)"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA CROSS JOIN (SmallB CROSS JOIN MediumA)"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -119,7 +119,7 @@ String input = "SELECT char(convert(STRINGNUM, integer) + 100) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT chr((trunc(to_number(SmallA.StringNum)) + 100)) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -128,7 +128,7 @@ String input = "SELECT convert(STRINGNUM, long) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT trunc(to_number(SmallA.StringNum)) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -137,7 +137,7 @@ String input = "SELECT convert(convert(STRINGNUM, long), string) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT to_char(trunc(to_number(SmallA.StringNum))) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -146,7 +146,7 @@ String input = "SELECT convert(convert(TIMESTAMPVALUE, date), string) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT to_char(trunc(cast(SmallA.TimestampValue AS date)), 'YYYY-MM-DD') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -154,7 +154,7 @@ String input = "SELECT convert(convert(TIMEVALUE, timestamp), string) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT to_char(cast(SmallA.TimeValue AS timestamp), 'YYYY-MM-DD HH24:MI:SS.FF') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -162,7 +162,7 @@ String input = "SELECT nvl(INTNUM, 'otherString') FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT nvl(to_char(SmallA.IntNum), 'otherString') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -170,7 +170,7 @@ String input = "SELECT convert(convert(STRINGNUM, integer), string) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT to_char(trunc(to_number(SmallA.StringNum))) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -187,7 +187,7 @@ String input = "SELECT locate(INTNUM, 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT INSTR('chimp', to_char(SmallA.IntNum), 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -204,7 +204,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp') FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT INSTR('chimp', SmallA.StringNum) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -221,7 +221,7 @@ String input = "SELECT locate(INTNUM, '234567890', 1) FROM BQT1.SMALLA WHERE INTKEY = 26"; //$NON-NLS-1$ String output = "SELECT INSTR('234567890', to_char(SmallA.IntNum), 1) FROM SmallA WHERE SmallA.IntKey = 26"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -238,7 +238,7 @@ String input = "SELECT locate('c', 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT 1 FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -255,7 +255,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', -5) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT INSTR('chimp', SmallA.StringNum, 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -272,7 +272,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', INTNUM) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT INSTR('chimp', SmallA.StringNum, CASE WHEN SmallA.IntNum < 1 THEN 1 ELSE SmallA.IntNum END) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -289,7 +289,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', LOCATE(STRINGNUM, 'chimp') + 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT INSTR('chimp', SmallA.StringNum, CASE WHEN (INSTR('chimp', SmallA.StringNum) + 1) < 1 THEN 1 ELSE (INSTR('chimp', SmallA.StringNum) + 1) END) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -298,7 +298,7 @@ String input = "SELECT substring(StringNum, 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT substr(SmallA.StringNum, 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -306,7 +306,7 @@ String input = "SELECT substring(StringNum, 1, 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT substr(SmallA.StringNum, 1, 1) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -314,7 +314,7 @@ String input = "SELECT IntKey FROM BQT1.SMALLA UNION SELECT IntKey FROM BQT1.SMALLB ORDER BY IntKey"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA UNION SELECT SmallB.IntKey FROM SmallB ORDER BY IntKey NULLS FIRST"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -322,7 +322,7 @@ String input = "select intkey from bqt1.smalla limit 10, 0"; //$NON-NLS-1$ String output = "SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNUM_ FROM (SELECT SmallA.IntKey FROM SmallA) VIEW_FOR_LIMIT WHERE ROWNUM <= 10) WHERE ROWNUM_ > 10"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -330,7 +330,7 @@ String input = "select intkey from bqt1.smalla limit 0, 10"; //$NON-NLS-1$ String output = "SELECT * FROM (SELECT SmallA.IntKey FROM SmallA) WHERE ROWNUM <= 10"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -338,7 +338,7 @@ String input = "select intkey from bqt1.smalla limit 1, 10"; //$NON-NLS-1$ String output = "SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNUM_ FROM (SELECT SmallA.IntKey FROM SmallA) VIEW_FOR_LIMIT WHERE ROWNUM <= 11) WHERE ROWNUM_ > 1"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -346,7 +346,7 @@ String input = "select intkey from bqt1.mediuma limit 100"; //$NON-NLS-1$ String output = "SELECT * FROM (SELECT MediumA.IntKey FROM MediumA) WHERE ROWNUM <= 100"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -354,7 +354,7 @@ String input = "select intkey from bqt1.mediuma limit 50, 100"; //$NON-NLS-1$ String output = "SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNUM_ FROM (SELECT MediumA.IntKey FROM MediumA) VIEW_FOR_LIMIT WHERE ROWNUM <= 150) WHERE ROWNUM_ > 50"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -362,7 +362,7 @@ @Test public void testConcat2_useLiteral() throws Exception { String input = "select concat2(stringnum,'_xx') from bqt1.Smalla"; //$NON-NLS-1$ String output = "SELECT concat(nvl(SmallA.StringNum, ''), '_xx') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -370,7 +370,7 @@ @Test public void testConcat2() throws Exception { String input = "select concat2(stringnum, stringkey) from bqt1.Smalla"; //$NON-NLS-1$ String output = "SELECT CASE WHEN (SmallA.StringNum IS NULL) AND (SmallA.StringKey IS NULL) THEN NULL ELSE concat(nvl(SmallA.StringNum, ''), nvl(SmallA.StringKey, '')) END FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -386,7 +386,7 @@ String input = "SELECT a.INTKEY FROM BQT1.SMALLA A, BQT1.SMALLB B WHERE sdo_relate(A.OBJECTVALUE, b.OBJECTVALUE, 'mask=ANYINTERACT') = true"; //$NON-NLS-1$ String output = "SELECT /*+ ORDERED */ A.IntKey FROM SmallA A, SmallB B WHERE sdo_relate(A.ObjectValue, B.ObjectValue, 'mask=ANYINTERACT') = 'true'"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -402,7 +402,7 @@ String input = "SELECT INTKEY FROM BQT1.SMALLA WHERE sdo_within_distance(OBJECTVALUE, 'SDO_GEOMETRY(2001, 8307, MDSYS.SDO_POINT_TYPE(90.0, -45.0, NULL), NULL, NULL)', 'DISTANCE=25.0 UNIT=NAUT_MILE') = true"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA WHERE sdo_within_distance(SmallA.ObjectValue, SDO_GEOMETRY(2001, 8307, MDSYS.SDO_POINT_TYPE(90.0, -45.0, NULL), NULL, NULL), 'DISTANCE=25.0 UNIT=NAUT_MILE') = 'true'"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -418,7 +418,7 @@ String input = "SELECT INTKEY FROM BQT1.SMALLA WHERE sdo_within_distance('SDO_GEOMETRY(2001, 8307, MDSYS.SDO_POINT_TYPE(90.0, -45.0, NULL), NULL, NULL)', OBJECTVALUE, 'DISTANCE=25.0 UNIT=NAUT_MILE') = true"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA WHERE sdo_within_distance(SDO_GEOMETRY(2001, 8307, MDSYS.SDO_POINT_TYPE(90.0, -45.0, NULL), NULL, NULL), SmallA.ObjectValue, 'DISTANCE=25.0 UNIT=NAUT_MILE') = 'true'"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -439,7 +439,7 @@ // as the signature was the best match for this query. String output = "SELECT SmallA.IntKey FROM SmallA WHERE sdo_within_distance(SmallA.StringKey, SDO_GEOMETRY(2001, 8307, MDSYS.SDO_POINT_TYPE(90.0, -45.0, NULL), NULL, NULL), 'DISTANCE=25.0 UNIT=NAUT_MILE') = ?"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -460,7 +460,7 @@ // as the signature was the best match for this query. String output = "SELECT SmallA.IntKey FROM SmallA WHERE sdo_within_distance(SDO_GEOMETRY(2001, 8307, MDSYS.SDO_POINT_TYPE(90.0, -45.0, NULL), NULL, NULL), SDO_GEOMETRY(2001, 8307, MDSYS.SDO_POINT_TYPE(90.0, -45.0, NULL), NULL, NULL), 'DISTANCE=25.0 UNIT=NAUT_MILE') = ?"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -476,7 +476,7 @@ String input = "SELECT a.INTKEY FROM BQT1.SMALLA A, BQT1.SMALLB B WHERE sdo_within_distance(a.OBJECTVALUE, b.OBJECTVALUE, 'DISTANCE=25.0 UNIT=NAUT_MILE') = true"; //$NON-NLS-1$ String output = "SELECT A.IntKey FROM SmallA A, SmallB B WHERE sdo_within_distance(A.ObjectValue, B.ObjectValue, 'DISTANCE=25.0 UNIT=NAUT_MILE') = 'true'"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -485,7 +485,7 @@ String input = "SELECT log(CONVERT(stringkey, INTEGER)) FROM bqt1.smalla"; //$NON-NLS-1$ String output = "SELECT ln(trunc(to_number(SmallA.StringKey))) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -494,7 +494,7 @@ String input = "SELECT log10(CONVERT(stringkey, INTEGER)) FROM bqt1.smalla"; //$NON-NLS-1$ String output = "SELECT log(10, trunc(to_number(SmallA.StringKey))) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -503,7 +503,7 @@ String input = "SELECT char(CONVERT(stringkey, INTEGER)), lcase(stringkey), ucase(stringkey), ifnull(stringkey, 'x') FROM bqt1.smalla"; //$NON-NLS-1$ String output = "SELECT chr(trunc(to_number(SmallA.StringKey))), lower(SmallA.StringKey), upper(SmallA.StringKey), nvl(SmallA.StringKey, 'x') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -27,7 +27,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import com.metamatrix.cdk.api.EnvironmentUtility; @@ -41,15 +41,15 @@ } public String getTestVDB() { - return MetadataFactory.PARTS_VDB; + return TranslationHelper.PARTS_VDB; } private String getTestBQTVDB() { - return MetadataFactory.BQT_VDB; + return TranslationHelper.BQT_VDB; } public void helpTestVisitor(String vdb, String input, String expectedOutput) throws ConnectorException { - MetadataFactory.helpTestVisitor(vdb, input, expectedOutput, TRANSLATOR); + TranslationHelper.helpTestVisitor(vdb, input, expectedOutput, TRANSLATOR); } @Test public void testConversion1() throws Exception { @@ -414,7 +414,7 @@ String input = "SELECT locate(INTNUM, 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT position(cast(SmallA.IntNum AS varchar(4000)) in substr('chimp', 1)) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -431,7 +431,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp') FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT position(SmallA.StringNum in 'chimp') FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -448,7 +448,7 @@ String input = "SELECT locate(INTNUM, '234567890', 1) FROM BQT1.SMALLA WHERE INTKEY = 26"; //$NON-NLS-1$ String output = "SELECT position(cast(SmallA.IntNum AS varchar(4000)) in substr('234567890', 1)) FROM SmallA WHERE SmallA.IntKey = 26"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -465,7 +465,7 @@ String input = "SELECT locate('c', 'chimp', 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT 1 FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -482,7 +482,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', -5) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT position(SmallA.StringNum in substr('chimp', 1)) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -499,7 +499,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', INTNUM) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT position(SmallA.StringNum in substr('chimp', CASE WHEN SmallA.IntNum < 1 THEN 1 ELSE SmallA.IntNum END)) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } @@ -516,7 +516,7 @@ String input = "SELECT locate(STRINGNUM, 'chimp', LOCATE(STRINGNUM, 'chimp') + 1) FROM BQT1.SMALLA"; //$NON-NLS-1$ String output = "SELECT position(SmallA.StringNum in substr('chimp', CASE WHEN (position(SmallA.StringNum in 'chimp') + 1) < 1 THEN 1 ELSE (position(SmallA.StringNum in 'chimp') + 1) END)) FROM SmallA"; //$NON-NLS-1$ - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -22,17 +22,23 @@ package org.teiid.connector.jdbc.sqlserver; +import java.util.List; import java.util.Properties; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.MetadataFactory; -import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.language.ICommand; import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.cdk.api.TranslationUtility; +import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.unittest.FakeMetadataFacade; +import com.metamatrix.query.unittest.FakeMetadataFactory; +import com.metamatrix.query.unittest.FakeMetadataObject; +import com.metamatrix.query.unittest.FakeMetadataStore; /** */ @@ -46,23 +52,16 @@ } public String getTestVDB() { - return MetadataFactory.PARTS_VDB; + return TranslationHelper.PARTS_VDB; } public String getBQTVDB() { - return MetadataFactory.BQT_VDB; + return TranslationHelper.BQT_VDB; } public void helpTestVisitor(String vdb, String input, String expectedOutput) throws ConnectorException { - helpTestVisitor(vdb, input, new String[] {expectedOutput}); + TranslationHelper.helpTestVisitor(vdb, input, expectedOutput, trans); } - - public void helpTestVisitor(String vdb, String input, String[] expectedOutputs) throws ConnectorException { - ICommand obj = MetadataFactory.helpTranslate(vdb, input); - TranslatedCommand tc = new TranslatedCommand(EnvironmentUtility.createSecurityContext("user"), trans); //$NON-NLS-1$ - tc.translateCommand(obj); - Assert.assertEquals("Did not get correct sql", expectedOutputs[0], tc.getSql()); //$NON-NLS-1$ - } @Test public void testModFunction() throws Exception { @@ -132,5 +131,33 @@ input, output); } + + @Test public void testUniqueidentifier() throws Exception { + FakeMetadataObject ldapModel = FakeMetadataFactory.createPhysicalModel("foo"); //$NON-NLS-1$ + FakeMetadataObject table = FakeMetadataFactory.createPhysicalGroup("bar", ldapModel); //$NON-NLS-1$ + String[] elemNames = new String[] { + "x" //$NON-NLS-1$ + }; + String[] elemTypes = new String[] { + DataTypeManager.DefaultDataTypes.STRING + }; + + List cols = FakeMetadataFactory.createElements(table, elemNames, elemTypes); + + FakeMetadataObject obj = (FakeMetadataObject) cols.get(0); + obj.putProperty(FakeMetadataObject.Props.NATIVE_TYPE, "uniqueidentifier"); //$NON-NLS-1$ + + FakeMetadataStore store = new FakeMetadataStore(); + store.addObject(ldapModel); + store.addObject(table); + store.addObjects(cols); + + // Create the facade from the store + QueryMetadataInterface metadata = new FakeMetadataFacade(store); + + TranslationUtility tu = new TranslationUtility(metadata); + ICommand command = tu.parseCommand("select max(x) from bar"); //$NON-NLS-1$ + TranslationHelper.helpTestVisitor("SELECT MAX(cast(bar.x as char(36))) FROM bar", trans, command); //$NON-NLS-1$ + } } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -29,7 +29,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.language.ICommand; @@ -47,16 +47,16 @@ } public String getTestVDB() { - return MetadataFactory.PARTS_VDB; + return TranslationHelper.PARTS_VDB; } public String getBQTVDB() { - return MetadataFactory.BQT_VDB; + return TranslationHelper.BQT_VDB; } public void helpTestVisitor(String vdb, String input, String expectedOutput) { // Convert from sql to objects - ICommand obj = MetadataFactory.helpTranslate(vdb, input); + ICommand obj = TranslationHelper.helpTranslate(vdb, input); TranslatedCommand tc = new TranslatedCommand(EnvironmentUtility.createSecurityContext("user"), trans); //$NON-NLS-1$ try { Modified: trunk/test-integration/common/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java =================================================================== --- trunk/test-integration/common/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-11-11 21:17:34 UTC (rev 1548) +++ trunk/test-integration/common/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-11-12 19:47:07 UTC (rev 1549) @@ -29,7 +29,7 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.jdbc.JDBCPropertyNames; -import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; import org.teiid.connector.jdbc.translator.Translator; import org.teiid.connector.language.ILanguageObject; @@ -65,7 +65,7 @@ } public String getTestVDB() { - return MetadataFactory.PARTS_VDB; + return TranslationHelper.PARTS_VDB; } public void helpTestVisitor(String vdb, String input, String expectedOutput) { @@ -81,7 +81,7 @@ } trans.initialize(EnvironmentUtility.createEnvironment(p, false)); - MetadataFactory.helpTestVisitor(vdb, input, expectedOutput, trans); + TranslationHelper.helpTestVisitor(vdb, input, expectedOutput, trans); } catch (ConnectorException e) { throw new RuntimeException(e); } @@ -405,6 +405,6 @@ p.setProperty(JDBCPropertyNames.TRIM_STRINGS, Boolean.TRUE.toString()); trans.initialize(EnvironmentUtility.createEnvironment(p, false)); - MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, "select stringkey from bqt1.smalla", "SELECT rtrim(SmallA.StringKey) FROM SmallA", trans); //$NON-NLS-1$ //$NON-NLS-2$ + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, "select stringkey from bqt1.smalla", "SELECT rtrim(SmallA.StringKey) FROM SmallA", trans); //$NON-NLS-1$ //$NON-NLS-2$ } }