CBQE-0:RQG:: Fix subquery false alarms

Change-Id: If18a192ea9f7a1faead33e31ff87d5b1af111bf8 Reviewed-on: http://review.couchbase.org/52824 Reviewed-by: Parag Agarwal <agarwal.parag@gmail.com> Tested-by: Parag Agarwal <agarwal.parag@gmail.com>
membase · Jul 3, 2015 · 8c5475d · 8c5475d
1 parent 419b2a9
commit 8c5475d
Show file tree

Hide file tree

Showing 4 changed files with 428 additions and 424 deletions.
diff --git a/b/resources/rqg/multiple_table_db/grammar/subquery_fields_multiple_table.yy b/b/resources/rqg/multiple_table_db/grammar/subquery_fields_multiple_table.yy
@@ -56,7 +56,7 @@ select_from:
 	*   ;
 
 select_from_with_aggregate:
-	AVG(OUTER_SUBQUERY_AGG_FIELD) | SUM(OUTER_SUBQUERY_AGG_FIELD) | MAX(OUTER_SUBQUERY_AGG_FIELD) | MIN(OUTER_SUBQUERY_AGG_FIELD) | COUNT(*);
+	AVG(OUTER_SUBQUERY_AGG_FIELD) AS OUTER_SUBQUERY_AGG_FIELD | SUM(OUTER_SUBQUERY_AGG_FIELD) AS OUTER_SUBQUERY_AGG_FIELD | MAX(OUTER_SUBQUERY_AGG_FIELD) AS OUTER_SUBQUERY_AGG_FIELD| MIN(OUTER_SUBQUERY_AGG_FIELD) AS OUTER_SUBQUERY_AGG_FIELD | COUNT(*) AS OUTER_SUBQUERY_AGG_FIELD;
 
 complex_condition:
 	NOT (condition) | (condition) AND (condition) | (condition) OR (condition) | (condition) AND (condition) OR (condition) AND (condition) | condition | (complex_condition) AND (complex_condition) | (complex_condition) OR (complex_condition) | NOT (complex_condition);