activecube 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65e60e75f69a9191397975d522338a4a145050f43a5efdb7c6bc7b415b13595
-  data.tar.gz: 27a27e6ccbb2b377804fc8b857db498859d3dbc916c11703c44d2e1e37dc40f2
+  metadata.gz: 1756ca9a20b9afb872308e649356470299fbc32bce30d34b2b37f759cd335f16
+  data.tar.gz: bac53b887ba067e42efe555e00179732be1ad97b33a568cb6ea568dfc5e64975
 SHA512:
-  metadata.gz: f30d27c6d9f7e8c2ceea94e58d16c9e65d809c21b900dcd933af8fca16fde2717e9d571e1ba196f3485ab5f686a8944ae47ee48de074099dec338184b134b7c7
-  data.tar.gz: b610d3a65a8f8b6d7ff140705a4ac28ad2ef0aa63a0fcd1dd535fbc45224660c871276f1f1e5ce7ef61528098fbe057669a17792e30c1a0953205f70fc898ed9
+  metadata.gz: 43c32104bacfb934077b7d2ff92e1bfb9659066dc718f232a8971382a506ba73383cb930b2713ab7f7cddeaf87333044aca34a5202a664dcf2f3fc7224af8222
+  data.tar.gz: 4732c37e478cea2e99097114a03da08798bee23a70fcc5de8474c5c9fd9819dfd66aa2aa0873462a5a2194a1e2cc1ee0bf73598d8deba960a22eb56f80f44bd8

data/lib/activecube/processor/table.rb

@@ -35,7 +35,7 @@ module Activecube::Processor
 
       outer_table = model.arel_table.class.new('').project(Arel.star)
 
-      dimension_names = cube_query.join_fields
+      dimension_names = (cube_query.join_fields + cube_query.slices.map{|s| s.key} ).uniq
 
       query = outer_table.from(left_query).
           join(right_query, ::Arel::Nodes::FullOuterJoin).

data/lib/activecube/query/cube_query.rb

@@ -118,7 +118,7 @@ module Activecube::Query
     end
 
     def join_fields
-      slices.map(&:group_by_columns).uniq
+      slices.map(&:group_by_columns).flatten.uniq
     end
 
     def orderings

data/lib/activecube/query/slice.rb

@@ -69,7 +69,10 @@ module Activecube::Query
 
       if dimension.class.identity
         group_by_columns.each do |column|
-            query = query.project(table[column]).group(table[column])
+          if !query.projections.detect{|p| p.kind_of?(::Arel::Attributes::Attribute) && p.name==column}
+            query = query.project(table[column])
+          end
+          query = query.group(table[column])
         end
       else
         query = query.group(attr_alias)

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord