martyr 0.1.84.pre → 0.1.85.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6f612ed989982d638bfab8b65db92f37e47eb06
-  data.tar.gz: f91c1aa0fc1de054714cb75c648e202f4d667c9d
+  metadata.gz: 5ec6f93b867fe3034f60c9866ddf89232174334b
+  data.tar.gz: f58e9db9a603d6692fdae928653da8de19b303bc
 SHA512:
-  metadata.gz: e47d47725fcb74d7308e38d5cbf9a2654faad5a3f8c0ebea4958e04b7f8914d1a9a2b762861599f3e635c6d5ed706075ae90bff30a9bee47bd1098affb58363b
-  data.tar.gz: 082b33748653c03733759bdb4bf0e7629237c393f8df375f49c1ede2872dc2995b5d512913e51ca00bef6ad4a0748484c4f900fff2b27ec008d2c9afc2807fd7
+  metadata.gz: 2971a1b28c5e0df791e1a997829b452466f849fb05c1fac81519c8032f7d92ed94340398284727f509da94e53caeaaccdd03f5a8032d561d23e4236ea0507836
+  data.tar.gz: a94900eb41b5034ba7656ea31a8628a0a1721980a275462c12ab46e8e49ca129cc42730c3ceab8c326c27b9e5502c80476c9e09c84fb4b3814b9d8a7461f73a1

data/lib/martyr/cube.rb

@@ -71,8 +71,10 @@ module Martyr
                :has_sum_metric, :has_custom_metric, :has_custom_rollup, :main_query, # DSL
                :metrics, :find_metric, :dimension_associations, to: :main_fact # Runtime
 
-      delegate :select, :slice, :granulate, :pivot, :build, to: :new_query_context_builder
+      delegate :select, :slice, :granulate, :pivot, :build, :granulate_and_select_all, to: :new_query_context_builder
       alias_method :all, :new_query_context_builder
+
+      delegate :combined_sql, to: :granulate_and_select_all
     end
 
     def self.martyr_schema_class?

data/lib/martyr/runtime/query/query_context.rb

@@ -16,6 +16,7 @@ module Martyr
       delegate :level_scope, :level_scopes, :with_level_scope, :lowest_level_of, :lowest_level_ids_of,
         :levels_and_above_for, :level_ids_and_above_for, :level_loaded?, to: :dimension_scopes
       delegate :slice, to: :memory_slice
+      delegate :combined_sql, to: :default_cube
 
       def initialize
         @data_slice = DataSlice.new(self)

data/lib/martyr/runtime/query/query_context_builder.rb

@@ -9,7 +9,7 @@ module Martyr
       include Martyr::Translations
 
       attr_reader :cube, :scope_helper_module
-      delegate :elements, :facts, :pivot, :total, :totals, to: :build
+      delegate :elements, :facts, :pivot, :total, :totals, :combined_sql, to: :build
 
       def initialize(cube, scope_helper_module)
         @cube = cube
@@ -80,6 +80,18 @@ module Martyr
         data_dup.decorate!(*args, &block)
       end
 
+      def granulate_and_select_all
+        granulate_all.select_all_metrics
+      end
+
+      def granulate_all
+        granulate(*cube.level_associations.map(&:id))
+      end
+
+      def select_all_metrics
+        select('all')
+      end
+
       def build
         return @context if @context
         context = QueryContext.new

data/lib/martyr/version.rb

@@ -1,3 +1,3 @@
 module Martyr
-  VERSION = "0.1.84.pre"
+  VERSION = "0.1.85.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: martyr
 version: !ruby/object:Gem::Version
-  version: 0.1.84.pre
+  version: 0.1.85.pre
 platform: ruby
 authors:
 - Amit Aharoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler