[teiid-commits] teiid SVN: r2728 - in branches/7.1.x: connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors and 1 other directories.

Wednesday, 17 November 2010

Author: shawkins
Date: 2010-11-17 12:07:37 -0500 (Wed, 17 Nov 2010)
New Revision: 2728

Modified:
   branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
  
branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java
  
branches/7.1.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java
Log:
TEIID-1361 fix for sf in handling

Modified: branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================

--- branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html	2010-11-17 15:53:07
UTC (rev 2727)
+++ branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html	2010-11-17 17:07:37
UTC (rev 2728)
@@ -7,7 +7,7 @@
 	</STYLE>
 </HEAD>
 <BODY LANG="en-US" DIR="LTR">
-<P><A HREF="http://www.teiid.org/"><IMG
SRC="https://www.jboss.org/dms/teiid/images/teiid_banner.png"
NAME="graphics1" ALT="Teiid" ALIGN=BOTTOM WIDTH=800></A>
+<P><A HREF="http://www.teiid.org/"><IMG
SRC="https://www.jboss.org/dms/teiid/images/teiid-banner.png"
NAME="graphics1" ALT="Teiid" ALIGN=BOTTOM WIDTH=800></A>
 
 <H1>Teiid ${project.version} Release Notes</H1>
 <P>Teiid ${project.version} adds ODBC, SQL, performance, and caching features. 

Modified:
branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java
===================================================================
---
branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java	2010-11-17
15:53:07 UTC (rev 2727)
+++
branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java	2010-11-17
17:07:37 UTC (rev 2728)
@@ -168,14 +168,16 @@
     public void visit( In criteria ) {
         try {
             Expression lExpr = criteria.getLeftExpression();
-            String columnName = lExpr.toString();
-            if (columnElementsByName.containsKey(columnName)) {
-                Column column = columnElementsByName.get(columnName);
-                if (MULTIPICKLIST.equalsIgnoreCase(column.getNativeType()) ||
RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(column.getNativeType())) {
+            if (lExpr instanceof ColumnReference) {
+            	ColumnReference cr = (ColumnReference)lExpr;
+                Column column = cr.getMetadataObject();
+                if (column != null &&
(MULTIPICKLIST.equalsIgnoreCase(column.getNativeType()) ||
RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(column.getNativeType()))) {
                     appendMultiselectIn(column, criteria);
                 } else {
                     appendCriteria(criteria);
                 }
+            } else {
+            	appendCriteria(criteria);
             }
             setHasCriteria(true, isIdColumn(criteria.getLeftExpression()));
         } catch (TranslatorException e) {
@@ -378,9 +380,6 @@
         }
         List<Column> columnIds = table.getColumns();
         for (Column element : columnIds) {
-            String name = table.getName() + '.' + element.getNameInSource();
-            columnElementsByName.put(name, element);
-
             // influences queryAll behavior
             if (element.getNameInSource().equals("IsDeleted")) { //$NON-NLS-1$
                 String isDeleted = element.getDefaultValue();

Modified:
branches/7.1.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java
===================================================================
---
branches/7.1.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java	2010-11-17
15:53:07 UTC (rev 2727)
+++
branches/7.1.x/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java	2010-11-17
17:07:37 UTC (rev 2728)
@@ -76,7 +76,7 @@
         }
         
         // Create Contact group
-        Table contactTable = RealMetadataFactory.createPhysicalGroup("Contact",
salesforceModel); //$NON-NLS-1$
+        Table contactTable =
RealMetadataFactory.createPhysicalGroup("Contacts", salesforceModel);
//$NON-NLS-1$
         contactTable.setNameInSource("Contact"); //$NON-NLS-1$
         contactTable.setProperty("Supports Query", Boolean.TRUE.toString());
//$NON-NLS-1$
         // Create Contact Columns
@@ -151,17 +151,24 @@
 	}
 	
 	@Test public void testJoin() throws Exception {
-		Select command = (Select)translationUtility.parseCommand("SELECT Account.Name,
Contact.Name FROM Contact LEFT OUTER JOIN Account ON Account.Id =
Contact.AccountId"); //$NON-NLS-1$
+		Select command = (Select)translationUtility.parseCommand("SELECT Account.Name,
Contacts.Name FROM Contacts LEFT OUTER JOIN Account ON Account.Id =
Contacts.AccountId"); //$NON-NLS-1$
 		SelectVisitor visitor = new
JoinQueryVisitor(translationUtility.createRuntimeMetadata());
 		visitor.visit(command);
 		assertEquals("SELECT Account.AccountName, Contact.ContactName FROM Contact",
visitor.getQuery().toString().trim()); //$NON-NLS-1$
 	}
 	
 	@Test public void testJoin2() throws Exception {
-		Select command = (Select)translationUtility.parseCommand("SELECT Account.Name,
Contact.Name FROM Account LEFT OUTER JOIN Contact ON Account.Id =
Contact.AccountId"); //$NON-NLS-1$
+		Select command = (Select)translationUtility.parseCommand("SELECT Account.Name,
Contacts.Name FROM Account LEFT OUTER JOIN Contacts ON Account.Id =
Contacts.AccountId"); //$NON-NLS-1$
 		SelectVisitor visitor = new
JoinQueryVisitor(translationUtility.createRuntimeMetadata());
 		visitor.visit(command);
 		assertEquals("SELECT Account.AccountName, (SELECT Contact.ContactName FROM
Contacts) FROM Account", visitor.getQuery().toString().trim()); //$NON-NLS-1$
 	}
+	
+	@Test public void testInWithNameInSourceDifferent() throws Exception {
+		Select command = (Select)translationUtility.parseCommand("SELECT Contacts.Name
FROM Contacts WHERE Contacts.Name in ('x', 'y')"); //$NON-NLS-1$
+		SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata());
+		visitor.visit(command);
+		assertEquals("SELECT Contact.ContactName FROM Contact WHERE ContactName
IN('x','y')", visitor.getQuery().toString().trim()); //$NON-NLS-1$
+	}
 
 }


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[teiid-commits] teiid SVN: r2728 - in branches/7.1.x: connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors and 1 other directories.