[teiid-commits] teiid SVN: r1161 - in trunk/engine/src: test/java/com/metamatrix/query/parser and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-07-21 18:51:14 -0400 (Tue, 21 Jul 2009)
New Revision: 1161

Modified:
   trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubqueryFromClause.java
   trunk/engine/src/test/java/com/metamatrix/query/parser/TestOptionsAndHints.java
   trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java
   trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSubqueryFromClause.java
Log:
TEIID-735 fix to the equals method of subqueryfromclause

Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubqueryFromClause.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubqueryFromClause.java	2009-07-21 21:07:33 UTC (rev 1160)
+++ trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubqueryFromClause.java	2009-07-21 22:51:14 UTC (rev 1161)
@@ -134,7 +134,7 @@
 		SubqueryFromClause sfc = (SubqueryFromClause) obj;
 		
         return this.getName().equalsIgnoreCase(sfc.getName()) &&
-            sfc.isOptional() == this.isOptional();
+            sfc.isOptional() == this.isOptional() && this.command.equals(sfc.command);
 	}
 	
 	/**

Modified: trunk/engine/src/test/java/com/metamatrix/query/parser/TestOptionsAndHints.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/parser/TestOptionsAndHints.java	2009-07-21 21:07:33 UTC (rev 1160)
+++ trunk/engine/src/test/java/com/metamatrix/query/parser/TestOptionsAndHints.java	2009-07-21 22:51:14 UTC (rev 1161)
@@ -689,7 +689,7 @@
         
         Query query2 = new Query();
         select = new Select();
-        select.addSymbol(new ElementSymbol("a"));//$NON-NLS-1$
+        select.addSymbol(new AllSymbol());
         From from2 = new From();
         from2.addGroup(new GroupSymbol("t1")); //$NON-NLS-1$
         from2.addGroup(new GroupSymbol("t2")); //$NON-NLS-1$

Modified: trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java	2009-07-21 21:07:33 UTC (rev 1160)
+++ trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java	2009-07-21 22:51:14 UTC (rev 1161)
@@ -5271,16 +5271,10 @@
         query.setSelect(select);
         From from = new From();
         from.addClause(new UnaryFromClause(new GroupSymbol("newModel2.Table1")));         //$NON-NLS-1$
-        Query subquery = new Query();
+        StoredProcedure subquery = new StoredProcedure();
+        subquery.setProcedureName("NewVirtual.StoredQuery");
         from.addClause(new SubqueryFromClause("a", subquery)); //$NON-NLS-1$
         query.setFrom(from);
-        
-        Select select2 = new Select();
-        select2.addSymbol(new AllSymbol());
-        subquery.setSelect(select2);
-        From from2 = new From();
-        from2.addClause(new UnaryFromClause(new GroupSymbol("a", "NewVirtual.StoredQuery"))); //$NON-NLS-1$ //$NON-NLS-2$
-        subquery.setFrom(from2);
                         
         helpTest("SELECT * FROM newModel2.Table1, (EXEC NewVirtual.StoredQuery()) AS a",  //$NON-NLS-1$
             "SELECT * FROM newModel2.Table1, (EXEC NewVirtual.StoredQuery()) AS a", //$NON-NLS-1$

Modified: trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSubqueryFromClause.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSubqueryFromClause.java	2009-07-21 21:07:33 UTC (rev 1160)
+++ trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSubqueryFromClause.java	2009-07-21 22:51:14 UTC (rev 1161)
@@ -113,10 +113,10 @@
         UnitTestUtil.helpTestEquivalence(equals, s1, s2);
     }
    
-    public void testEquivalenceSameName(){
+    public void testCommandNonEquivalence(){
         Object s1 = example1();
         Object s2 = example2();
-        int equals = 0;
+        int equals = -1;
         UnitTestUtil.helpTestEquivalence(equals, s1, s2);
     }