From teiid-commits at lists.jboss.org Wed Nov 17 12:07:37 2010
Content-Type: multipart/mixed; boundary="===============8898097475342450897=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [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.
Date: Wed, 17 Nov 2010 12:07:37 -0500
Message-ID: <201011171707.oAHH7bF7010007@svn01.web.mwc.hst.phx2.redhat.com>
--===============8898097475342450897==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
-![3D"Teiid"](3D"https://www.jboss.org/dms=)
+
=
Teiid ${project.version} Release Notes
Teiid ${project.version} adds ODBC, SQL, performance, and caching featu=
res. =
Modified: branches/7.1.x/connectors/translator-salesforce/src/main/java/org=
/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/7.1.x/connectors/translator-salesforce/src/main/java/org/teiid=
/translator/salesforce/execution/visitors/CriteriaVisitor.java 2010-11-17 1=
5: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 1=
7:07:37 UTC (rev 2728)
@@ -168,14 +168,16 @@
public void visit( In criteria ) {
try {
Expression lExpr =3D criteria.getLeftExpression();
- String columnName =3D lExpr.toString();
- if (columnElementsByName.containsKey(columnName)) {
- Column column =3D columnElementsByName.get(columnName);
- if (MULTIPICKLIST.equalsIgnoreCase(column.getNativeType())=
|| RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(column.getNativeType()))=
{
+ if (lExpr instanceof ColumnReference) {
+ ColumnReference cr =3D (ColumnReference)lExpr;
+ Column column =3D cr.getMetadataObject();
+ if (column !=3D null && (MULTIPICKLIST.equalsIgnoreCase(co=
lumn.getNativeType()) || RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(col=
umn.getNativeType()))) {
appendMultiselectIn(column, criteria);
} else {
appendCriteria(criteria);
}
+ } else {
+ appendCriteria(criteria);
}
setHasCriteria(true, isIdColumn(criteria.getLeftExpression()));
} catch (TranslatorException e) {
@@ -378,9 +380,6 @@
}
List columnIds =3D table.getColumns();
for (Column element : columnIds) {
- String name =3D table.getName() + '.' + element.getNameInSourc=
e();
- columnElementsByName.put(name, element);
-
// influences queryAll behavior
if (element.getNameInSource().equals("IsDeleted")) { //$NON-NL=
S-1$
String isDeleted =3D element.getDefaultValue();
Modified: branches/7.1.x/connectors/translator-salesforce/src/test/java/org=
/teiid/translator/salesforce/execution/visitors/TestVisitors.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/7.1.x/connectors/translator-salesforce/src/test/java/org/teiid=
/translator/salesforce/execution/visitors/TestVisitors.java 2010-11-17 15:5=
3: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:0=
7:37 UTC (rev 2728)
@@ -76,7 +76,7 @@
}
=
// Create Contact group
- Table contactTable =3D RealMetadataFactory.createPhysicalGroup("Co=
ntact", salesforceModel); //$NON-NLS-1$
+ Table contactTable =3D RealMetadataFactory.createPhysicalGroup("Co=
ntacts", 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 =3D (Select)translationUtility.parseCommand("SELECT Accou=
nt.Name, Contact.Name FROM Contact LEFT OUTER JOIN Account ON Account.Id =
=3D Contact.AccountId"); //$NON-NLS-1$
+ Select command =3D (Select)translationUtility.parseCommand("SELECT Accou=
nt.Name, Contacts.Name FROM Contacts LEFT OUTER JOIN Account ON Account.Id =
=3D Contacts.AccountId"); //$NON-NLS-1$
SelectVisitor visitor =3D new JoinQueryVisitor(translationUtility.create=
RuntimeMetadata());
visitor.visit(command);
assertEquals("SELECT Account.AccountName, Contact.ContactName FROM Conta=
ct", visitor.getQuery().toString().trim()); //$NON-NLS-1$
}
=
@Test public void testJoin2() throws Exception {
- Select command =3D (Select)translationUtility.parseCommand("SELECT Accou=
nt.Name, Contact.Name FROM Account LEFT OUTER JOIN Contact ON Account.Id =
=3D Contact.AccountId"); //$NON-NLS-1$
+ Select command =3D (Select)translationUtility.parseCommand("SELECT Accou=
nt.Name, Contacts.Name FROM Account LEFT OUTER JOIN Contacts ON Account.Id =
=3D Contacts.AccountId"); //$NON-NLS-1$
SelectVisitor visitor =3D new JoinQueryVisitor(translationUtility.create=
RuntimeMetadata());
visitor.visit(command);
assertEquals("SELECT Account.AccountName, (SELECT Contact.ContactName FR=
OM Contacts) FROM Account", visitor.getQuery().toString().trim()); //$NON-N=
LS-1$
}
+ =
+ @Test public void testInWithNameInSourceDifferent() throws Exception {
+ Select command =3D (Select)translationUtility.parseCommand("SELECT Conta=
cts.Name FROM Contacts WHERE Contacts.Name in ('x', 'y')"); //$NON-NLS-1$
+ SelectVisitor visitor =3D new SelectVisitor(translationUtility.createRun=
timeMetadata());
+ visitor.visit(command);
+ assertEquals("SELECT Contact.ContactName FROM Contact WHERE ContactName =
IN('x','y')", visitor.getQuery().toString().trim()); //$NON-NLS-1$
+ }
=
}
--===============8898097475342450897==--