simple_drilldown 0.13.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f8406ee9ef7580adc175f3995a79bcb428f954e4d84012ad0a0180b6cf7996
-  data.tar.gz: cfd5b6a19277aac5e11443a0c7429bc741991e2da00c1915ddff1b6554df75c3
+  metadata.gz: ef72a1d7f488dd64e45e610dafbef583ed0be5c3e65ae1a4fe024350efc5bde9
+  data.tar.gz: 356bbee827c123946e2ec7d75891b81454f862ed57d1ba88bddc210b47e94884
 SHA512:
-  metadata.gz: 930779fb380dcff0933a71df90bfa3d55f7ca43103f68d30e89d380f6dc68ac5cb6ae6accd32d98bba445179e6498b0143b4d235e98aa0649b94ed20c5b04de6
-  data.tar.gz: c54be58a2c0c072e70884b73ce88daceb8c3e6508f921c06eaa67011a93d52ebc9624b462e47c393397ee285325b8f8a05eb8cdfee5dc6eb8247054c939e4605
+  metadata.gz: f3a2390ecacca9bd85ce30e768aa662917f4b165df4f77e45cccfbb3201cb43548bc4cfd21052d0e835f1ed58a1770dd3d92f66283792aed86f5001e3171676b
+  data.tar.gz: ee791c11f609c1ca18dd95405c80be69c73e7a8ba79ba4cb4b4dd32164f49f93224f2a22ec8e452aeb71ccf60c709e66ae00a7f4433c587ab25d97c2b08979b0

data/lib/simple_drilldown/controller.rb

@@ -155,14 +155,17 @@ module SimpleDrilldown
           dimension_def = c_dimension_defs[field.to_s]
           result_sets = dimension_def[:queries].map do |query|
             includes = merge_includes(includes, query[:includes]) if query[:includes]
-            rows_query = c_target_class.unscoped.where(c_base_condition)
+            rows_query = c_target_class.unscoped.where(realized_where(c_base_condition))
                                        .select("#{query[:select]} AS value")
                                        .joins(make_join([], c_target_class.name.underscore.to_sym, includes))
                                        .order('value')
                                        .group(:value)
             rows_query = rows_query.without_deleted if c_target_class.try :paranoid?
             rows_query = rows_query.where(filter_conditions) if filter_conditions
-            rows_query = rows_query.where(query[:where]) if query[:where]
+            if (where = query[:where])
+              where_mapped = realized_where(where)
+              rows_query = rows_query.where(where_mapped)
+            end
             rows = rows_query.to_a
             filter_fields = search.filter[field.to_s]
             filter_fields&.each do |selected_value|
@@ -181,6 +184,15 @@ module SimpleDrilldown
         end
       end
 
+      def realized_where(where)
+        case where
+        when Array
+          where.map { |e| e.respond_to?(:call) ? e.call : e }
+        else
+          where
+        end
+      end
+
       def make_conditions(search_filter)
         includes = c_base_includes.dup
         if search_filter
@@ -192,6 +204,13 @@ module SimpleDrilldown
             dimension_def = c_dimension_defs[field]
             raise "Unknown filter field: #{field.inspect}" if dimension_def.nil?
 
+            dimension_def[:queries].each do |query|
+              next unless (where = query[:where])
+
+              where_mapped = where.map { |e| e.respond_to?(:call) ? e.call : e }
+              condition_strings << where_mapped[0]
+              condition_values += where_mapped[1..]
+            end
             values = Array(values)
             if dimension_def[:interval]
               if values[0].present? && values[1].present?
@@ -383,7 +402,7 @@ module SimpleDrilldown
       group = nil if group.empty?
 
       joins = self.class.make_join([], c_target_class.name.underscore.to_sym, includes)
-      row_query = c_target_class.unscoped.where(c_base_condition).select(select)
+      row_query = c_target_class.unscoped.where(self.class.realized_where(c_base_condition)).select(select)
       row_query = row_query.where(conditions) if conditions
       rows = row_query.joins(joins).group(group).order(order).to_a
       if rows.empty?
@@ -588,7 +607,8 @@ module SimpleDrilldown
       end
       joins = self.class.make_join([], c_target_class.name.underscore.to_sym, list_includes)
       list_conditions = list_conditions(conditions, values)
-      base_query = c_target_class.unscoped.where(c_base_condition).joins(joins).order(c_list_order)
+      base_query = c_target_class.unscoped.where(self.class.realized_where(c_base_condition)).joins(joins)
+                                 .order(c_list_order)
       base_query = base_query.where(list_conditions) if list_conditions
       result[:records] = base_query.to_a
     end

data/lib/simple_drilldown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleDrilldown
-  VERSION = '0.13.0'
+  VERSION = '0.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails