From a2ab619e2d27338e77f55b372c60167c38c53489 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 29 Nov 2019 22:29:50 +0900 Subject: [PATCH] Merge headers into 'finalResults' --- .../datasources/ExecuteMultipleQueriesVisitor.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/geppetto/datasources/ExecuteMultipleQueriesVisitor.java b/src/main/java/org/geppetto/datasources/ExecuteMultipleQueriesVisitor.java index b7d0336..ee80d91 100644 --- a/src/main/java/org/geppetto/datasources/ExecuteMultipleQueriesVisitor.java +++ b/src/main/java/org/geppetto/datasources/ExecuteMultipleQueriesVisitor.java @@ -120,17 +120,9 @@ public QueryResults getResults() throws GeppettoDataSourceException boolean first = true; for(QueryResults result : results.keySet()) { - if(finalResults.getHeader().isEmpty()) - { - finalResults.getHeader().addAll(result.getHeader()); - } - else - { - if(!finalResults.getHeader().equals(result.getHeader())) - { - throw new GeppettoDataSourceException("Multiple queries were executed but they returned incompatible headers"); - } - } + // Merge all headers into finalResults instead of only when is empty + finalResults.getHeader().addAll(result.getHeader()); + BooleanOperator o = results.get(result); switch(o) {