activecube 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5e229585093009dd0f27fc13fb03f4c47800af504431125d6924cec518e5933
-  data.tar.gz: b0f733fc1f6152715c679bbf023648837687f6c835e41163076b6d3840c7c4b2
+  metadata.gz: 566db205500299f766f3971b9692e876926ca5ff1f65fbfea78a8c19ed4c501d
+  data.tar.gz: 33c2890756ea8fba2d4dc28a877fcf21891a56783d63a996d5bf3c5cfde14033
 SHA512:
-  metadata.gz: 1059e6c2ca73b04b25e5c820e57d1a6e4c37131079b864eccc6b5a5d55e31553ba53b2098d32c27588088c8b922eb8b98da1d59afe65129ba1437696832451c5
-  data.tar.gz: 1b25987ebc1638fc745e8730ef6d9eb89468514466df59e6784e442996656aef54c1f8fbc5237ed78f81e1124018813b6ad9dbca4c3e9a553dab303f3137b04b
+  metadata.gz: 54316348e68e897854789e8a7dd3ac628fbab5b1c1b4e4fa877faff72ecbe42ebe2a589c77f31b2287af0c40dc03efd8da9467bba6eaa59466c4951cb9c6d638
+  data.tar.gz: aed6fcd142c56ef9f56a84b9efb00bab50a7b96090d9d4379653991dc387b6ae1d7249da5170389422d57ca683b4e9f853eb3549559d1e160db5583be8dcc2bc

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.39)
+    activecube (0.1.40)
       activerecord (>= 5.2)
 
 GEM

data/lib/activecube/processor/composer.rb

@@ -75,9 +75,7 @@ module Activecube::Processor
       measures_by_tables = measure_tables.group_by(&:table)
       measures_by_tables.each_pair do |table, list|
         @models << table.model
-        reduce_options = measures_by_tables.count==1 ? cube_query.options : []
-        reduced = cube_query.reduced list.map(&:measure), reduce_options
-        table_query = table.query reduced
+        table_query = table.query cube_query
         composed_query = composed_query ? table.join(cube_query, composed_query, table_query) : table_query
       end
       composed_query

data/lib/activecube/query/cube_query.rb

@@ -124,36 +124,6 @@ module Activecube::Query
       (measures.map(&:selectors) + slices.map(&:selectors) + selectors).flatten.map(&:required_column_names).flatten.uniq
     end
 
-    def reduced other_measures, other_options
-
-      common_selectors = []
-      other_measures.each_with_index do |m,i|
-        if i==0
-          common_selectors += m.selectors
-        else
-          common_selectors &= m.selectors
-        end
-      end
-
-      if common_selectors.empty?
-        reduced_measures = other_measures
-        reduced_selectors = self.selectors
-      else
-        reduced_measures = other_measures.collect{|m|
-          Measure.new m.cube, m.key, m.definition, (m.selectors - common_selectors), m.modifications
-        }
-        reduced_selectors = self.selectors + common_selectors
-      end
-
-      unless reduced_measures.detect{|rm| rm.selectors.empty? }
-        reduced_selectors += [Selector.or(reduced_measures.map(&:selectors).flatten.uniq)]
-      end
-
-      return self if (reduced_measures == self.measures) && (reduced_selectors == self.selectors)
-
-      CubeQuery.new cube, slices, reduced_measures, reduced_selectors, other_options, tables
-    end
-
     def join_fields
       slices.map(&:group_by_columns).flatten.uniq
     end

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.40"
+  VERSION = "0.1.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord