[teiid-commits] teiid SVN: r541 - trunk/engine/src/main/java/com/metamatrix/query/sql/visitor.

[teiid-commits at lists.jboss.org]

Author: li.liang
Date: 2009-03-09 13:25:07 -0400 (Mon, 09 Mar 2009)
New Revision: 541

Modified:
   trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CommandCollectorVisitor.java
Log:
TEIID-406 - Properly handle command collection for SetQuery.

Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CommandCollectorVisitor.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CommandCollectorVisitor.java	2009-03-09 16:49:40 UTC (rev 540)
+++ trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CommandCollectorVisitor.java	2009-03-09 17:25:07 UTC (rev 541)
@@ -164,17 +164,18 @@
         }
     }
     
-    public void visit(SetQuery obj) {
-        if (!nonEmbeddedOnly) {
-            
-            for (QueryCommand command : obj.getQueryCommands()) {
-                if (command instanceof SetQuery) {
-                    visit((SetQuery)command);
-                } else {
-                    this.commands.addAll(command.getSubCommands());
-                }
+    public void visit(SetQuery obj) {  
+        for (QueryCommand command : obj.getQueryCommands()) {
+            if (command instanceof SetQuery) {
+                visit((SetQuery)command);
+            } else {
+            	if(embeddedOnly){
+            		this.commands.add(command);
+            	}else if(!nonEmbeddedOnly){
+            		this.commands.addAll(CommandCollectorVisitor.getCommands(command, false, false));
+            	}
             }
-        }
+        } 
     }
     
     public void visit(BatchedUpdateCommand obj) {