TEIIDDES-3125 applied patches TEIID-5109

Teiid-Designer · Oct 23, 2017 · 36228b3 · 36228b3
1 parent 12e90ee
commit 36228b3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/...s/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/visitor/SQLStringVisitor.java b/...s/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/visitor/SQLStringVisitor.java
@@ -43,6 +43,7 @@
 import org.teiid.designer.query.sql.ISQLStringVisitor;
 import org.teiid.designer.query.sql.IToken;
 import org.teiid.designer.query.sql.lang.IComment;
+import org.teiid.designer.query.sql.lang.ISetQuery.Operation;
 import org.teiid.designer.query.sql.symbol.IAggregateSymbol.Type;
 import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
@@ -2101,16 +2102,17 @@ public void visit(SetQuery obj) {
     }
 
     protected void appendSetQuery(SetQuery parent, QueryCommand obj, boolean right) {
-        if (obj.getLimit() != null
-            || obj.getOrderBy() != null
-            || (right && ((obj instanceof SetQuery && ((parent.isAll() && !((SetQuery)obj).isAll()) || parent.getOperation() != ((SetQuery)obj).getOperation()))))) {
+        if (obj.getLimit() != null || obj.getOrderBy() != null || (obj instanceof SetQuery
+                && ((right && parent.isAll() && !((SetQuery)obj).isAll()) 
+                        || ((parent.getOperation() == Operation.INTERSECT || right) 
+                                && parent.getOperation() != ((SetQuery)obj).getOperation())))) {
             append(Tokens.LPAREN);
             visitNode(obj);
             append(Tokens.RPAREN);
         } else {
             visitNode(obj);
         }
-
+        
         enableComments(obj);
         addComments(obj);
     }

diff --git a/...eiid/org.teiid.runtime.client_v9/engine/org/teiid/query/sql/visitor/SQLStringVisitor.java b/...eiid/org.teiid.runtime.client_v9/engine/org/teiid/query/sql/visitor/SQLStringVisitor.java
@@ -42,6 +42,7 @@
 import org.teiid.designer.query.sql.ISQLStringVisitor;
 import org.teiid.designer.query.sql.IToken;
 import org.teiid.designer.query.sql.lang.IComment;
+import org.teiid.designer.query.sql.lang.ISetQuery.Operation;
 import org.teiid.designer.query.sql.symbol.IAggregateSymbol.Type;
 import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
@@ -2037,13 +2038,13 @@ protected void appendSetQuery(SetQuery parent, QueryCommand obj, boolean right)
         addComments(obj);
     }
 
-    protected boolean shouldNestSetChild(SetQuery parent, QueryCommand obj,
-    	boolean right) {
-    return (!(obj instanceof SetQuery) && useParensForSetQueries()) 
-    	|| (!useSelectLimit() && (obj.getLimit() != null || obj.getOrderBy() != null)) || (right && ((obj instanceof SetQuery 
-    	&& ((parent.isAll() && !((SetQuery)obj).isAll()) 
-     	|| parent.getOperation() != ((SetQuery)obj).getOperation())) || obj.getLimit() != null || obj.getOrderBy() != null));
-    }
+	protected boolean shouldNestSetChild(SetQuery parent, QueryCommand obj,
+			boolean right) {
+		return (!(obj instanceof SetQuery) && useParensForSetQueries()) 
+        		|| obj.getLimit() != null || obj.getOrderBy() != null || (obj instanceof SetQuery 
+        				&& ((right && parent.isAll() && !((SetQuery)obj).isAll()) 
+        						|| ((parent.getOperation() == Operation.INTERSECT || right) && parent.getOperation() != ((SetQuery)obj).getOperation())));
+}
 
     protected boolean useSelectLimit() {
     	return false;