Author: shawkins Date: 2011-01-20 14:57:51 -0500 (Thu, 20 Jan 2011) New Revision: 2863 Added: branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestProcedureExecution.java Modified: branches/7.3.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/ProcedureExecutionParentImpl.java branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java branches/7.3.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java Log: TEIID-1443 adding a better check for procedure names Modified: branches/7.3.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/ProcedureExecutionParentImpl.java =================================================================== --- branches/7.3.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/ProcedureExecutionParentImpl.java 2011-01-20 15:28:34 UTC (rev 2862) +++ branches/7.3.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/ProcedureExecutionParentImpl.java 2011-01-20 19:57:51 UTC (rev 2863) @@ -71,14 +71,14 @@ @Override public void execute() throws TranslatorException { - if(getCommand().getProcedureName().endsWith("getUpdated")) { + if("GetUpdated".equalsIgnoreCase(getCommand().getMetadataObject().getNameInSource())) { //$NON-NLS-1$ execution = new GetUpdatedExecutionImpl(this); - execution.execute(this); - } - else if(getCommand().getProcedureName().endsWith("getDeleted")) { + } else if("GetDeleted".equalsIgnoreCase(getCommand().getMetadataObject().getNameInSource())) { //$NON-NLS-1$ execution = new GetDeletedExecutionImpl(this); - execution.execute(this); + } else { + throw new AssertionError("Unknown procedure " + getCommand().getProcedureName() + " with name in source " + getCommand().getMetadataObject().getNameInSource()); //$NON-NLS-1$ //$NON-NLS-2$ } + execution.execute(this); } public void setCommand(Call command) { Added: branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestProcedureExecution.java =================================================================== --- branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestProcedureExecution.java (rev 0) +++ branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestProcedureExecution.java 2011-01-20 19:57:51 UTC (rev 2863) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.translator.salesforce.execution; + +import static org.junit.Assert.*; + +import java.math.BigDecimal; +import java.util.Arrays; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.junit.Test; +import org.mockito.Mockito; +import org.teiid.cdk.api.TranslationUtility; +import org.teiid.language.Call; +import org.teiid.metadata.RuntimeMetadata; +import org.teiid.translator.ExecutionContext; +import org.teiid.translator.salesforce.SalesforceConnection; +import org.teiid.translator.salesforce.execution.visitors.TestVisitors; + +@SuppressWarnings("nls") +public class TestProcedureExecution { + + private static TranslationUtility translationUtility = new TranslationUtility(TestVisitors.exampleSalesforce()); + + @Test public void testProcedureName() throws Exception { + Call command = (Call)translationUtility.parseCommand("exec getupdated('foo', {d '1970-01-01'}, {d '1990-01-01'})"); //$NON-NLS-1$ + SalesforceConnection sfc = Mockito.mock(SalesforceConnection.class); + UpdatedResult ur = new UpdatedResult(); + ur.setIDs(Arrays.asList("1", "2")); + Mockito.stub(sfc.getUpdated(Mockito.eq("foo"), (XMLGregorianCalendar)Mockito.anyObject(), (XMLGregorianCalendar)Mockito.anyObject())).toReturn(ur); + ProcedureExecutionParentImpl pepi = new ProcedureExecutionParentImpl(command, sfc, Mockito.mock(RuntimeMetadata.class), Mockito.mock(ExecutionContext.class)); + pepi.execute(); + assertNotNull(pepi.next()); + assertNotNull(pepi.next()); + assertNull(pepi.next()); + pepi.close(); + } + +} Property changes on: branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestProcedureExecution.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java =================================================================== --- branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2011-01-20 15:28:34 UTC (rev 2862) +++ branches/7.3.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2011-01-20 19:57:51 UTC (rev 2863) @@ -24,6 +24,7 @@ import static org.junit.Assert.*; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; import java.util.TimeZone; @@ -34,15 +35,19 @@ import org.teiid.language.Select; import org.teiid.metadata.Column; import org.teiid.metadata.MetadataStore; +import org.teiid.metadata.Procedure; +import org.teiid.metadata.ProcedureParameter; import org.teiid.metadata.Schema; import org.teiid.metadata.Table; import org.teiid.metadata.Column.SearchType; import org.teiid.query.metadata.CompositeMetadataStore; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TransformationMetadata; +import org.teiid.query.sql.lang.SPParameter; import org.teiid.query.unittest.FakeMetadataFactory; import org.teiid.query.unittest.RealMetadataFactory; import org.teiid.translator.ExecutionContext; +import org.teiid.translator.TypeFacility; import org.teiid.translator.salesforce.Constants; import org.teiid.translator.salesforce.SalesforceConnection; import org.teiid.translator.salesforce.execution.QueryExecutionImpl; @@ -101,6 +106,14 @@ Column obj = contactCols.get(i); obj.setNameInSource(contactNameInSource[i]); } + List<ProcedureParameter> params = new LinkedList<ProcedureParameter>(); + params.add(RealMetadataFactory.createParameter("type", SPParameter.IN, TypeFacility.RUNTIME_NAMES.STRING)); + params.add(RealMetadataFactory.createParameter("start", SPParameter.IN, TypeFacility.RUNTIME_NAMES.TIMESTAMP)); + params.add(RealMetadataFactory.createParameter("end", SPParameter.IN, TypeFacility.RUNTIME_NAMES.TIMESTAMP)); + + Procedure getUpdated = RealMetadataFactory.createStoredProcedure("GetUpdated", salesforceModel, params, "GetUpdated"); + getUpdated.setResultSet(RealMetadataFactory.createResultSet("rs", new String[] {"updated"}, new String[] {TypeFacility.RUNTIME_NAMES.STRING})); + return new TransformationMetadata(null, new CompositeMetadataStore(store), null, FakeMetadataFactory.SFM.getSystemFunctions(), null); } Modified: branches/7.3.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java =================================================================== --- branches/7.3.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2011-01-20 15:28:34 UTC (rev 2862) +++ branches/7.3.x/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2011-01-20 19:57:51 UTC (rev 2863) @@ -604,12 +604,13 @@ * @param name Name of procedure, must match model name * @param model Metadata object for the model * @param params List of FakeMetadataObject that are the parameters for the procedure - * @param callableName Callable name of procedure, usually same as procedure name + * @param nameInSource Callable name of procedure, usually same as procedure name * @return Metadata object for stored procedure */ - public static Procedure createStoredProcedure(String name, Schema model, List<ProcedureParameter> params, String callableName) { + public static Procedure createStoredProcedure(String name, Schema model, List<ProcedureParameter> params, String nameInSource) { Procedure proc = new Procedure(); proc.setName(name); + proc.setNameInSource(nameInSource); if (params != null) { int index = 1; for (ProcedureParameter procedureParameter : params) {