Merge pull request #60 from patterninc/pred-6551

PRED-6551 Process all the criteria(not just first one) and store in the filters

Author: mayank0109

lib/query_helper.rb

@@ -282,12 +282,8 @@ def search_filter(column_maps)
       raise ArgumentError.new("search_fields not defined") unless @search_fields.length > 0
       placement = :where
       maps = column_maps.select do |cm|
-        if @search_fields.include? cm.alias_name
           placement = :having if cm.aggregate
-          true
-        else
-          false
-        end
+          @search_fields.include? cm.alias_name
       end
       bind_variable = ('a'..'z').to_a.shuffle[0,20].join.to_sym
       @bind_variables[bind_variable] = "%#{@search_string}%"

lib/query_helper/sql_filter.rb

@@ -21,13 +21,15 @@ def create_filters
         raise InvalidQueryError.new("cannot filter by #{comparate_alias}") unless map
 
         # create the filter
-        @filters << QueryHelper::Filter.new(
-          operator_code: criteria.keys.first,
-          criterion: criteria.values.first,
-          comparate: map.sql_expression,
-          aggregate: map.aggregate,
-          qualify_clause: aggregated_attribute?(comparate: map.sql_expression)
-        )
+        criteria.each do |k, v|
+          @filters << QueryHelper::Filter.new(
+            operator_code: k,
+            criterion: v,
+            comparate: map.sql_expression,
+            aggregate: map.aggregate,
+            qualify_clause: aggregated_attribute?(comparate: map.sql_expression)
+          )
+        end
       end
     end
 

lib/query_helper/sql_parser.rb

@@ -188,7 +188,7 @@ def find_aliases
         ColumnMap.new(
           alias_name: sql_alias,
           sql_expression: sql_expression.squish,
-          aggregate: /\b(array_agg|avg|bit_and|bit_or|bool_and|bool_or|boolor_agg|booland_agg|count|every|json_agg|jsonb_agg|json_object_agg|jsonb_object_agg|max|min|string_agg|sum|xmlagg)\((.*)\)/.match?(sql_expression)
+          aggregate: /(?i)\b(array_agg|avg|bit_and|bit_or|bool_and|bool_or|boolor_agg|booland_agg|count|every|json_agg|jsonb_agg|json_object_agg|jsonb_object_agg|max|min|string_agg|sum|xmlagg|any_value)\((.*)\)/.match?(sql_expression)
         ) if sql_alias
       end
       column_maps.compact

lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end