activecube 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4761a4080baea000688c32cd35753b72f0fd51d7e6a0818da31c8bd5141f966
-  data.tar.gz: e5116aa48a23176bd91f4e90bbf6d83ac300c09aa3c04a951afbe8eeb3918133
+  metadata.gz: e08b7128492c4b84b982715355728b6506c0eb4dc155875ef1323bc88e9c9777
+  data.tar.gz: 856d25b480a319b11476c9d388f20aa656325f812299018c67df6b44bed322e8
 SHA512:
-  metadata.gz: 2638118ea471ff784d1689a86dde10a535dcfd0e4eabeb93a9b6206236f116017ffe5d08de03820adb45d5e4291b42ca853c755efa5cddf37d664a09e3122ea9
-  data.tar.gz: 6339c6bad22e0c0fbebbd2e8987ccac2085374fa31e274c902963b5de5b8f5dd6531b19dc95c79ccf9e1722ee277bb469a1bddc03d41d991d8fe64cafa61c63e
+  metadata.gz: 76d9c60cfba31ac7f65f819dc1e5b8b0d6689aebbb162f8677f45e7388442dfc7d581e2bec945478d058891f61fc2b7b34de5b7e79f40c510bb88c1f21647547
+  data.tar.gz: 880550994778371e8dbd416691bc252a51de37123557ee73ad4c4ac5dcdb273a2a29084787c311b7219629cf42ac782302e664a495e5870deb69e4a6a8323730

data/lib/activecube/processor/composer.rb

@@ -7,13 +7,13 @@ require 'activecube/query/measure_nothing'
 module Activecube::Processor
   class Composer
 
-    attr_reader :cube_query, :models
+    attr_reader :cube_query, :models, :query
     def initialize cube_query
       @cube_query = cube_query
     end
 
     def build_query
-      compose_queries optimize! ranked_tables
+      @query = compose_queries optimize! ranked_tables
     end
 
     def connection

data/lib/activecube/query/cube_query.rb

@@ -14,7 +14,7 @@ module Activecube::Query
 
     include ChainAppender
 
-    attr_reader :cube, :slices, :measures, :selectors, :options, :tables
+    attr_reader :cube, :slices, :measures, :selectors, :options, :tables, :sql
     def initialize cube, slices = [], measures = [], selectors = [], options = [], model_tables = nil
       @cube = cube
       @slices = slices
@@ -36,18 +36,22 @@ module Activecube::Query
     end
 
     def slice *args
+      clear_sql
       append *args, @slices, Slice, cube.dimensions
     end
 
     def measure *args
+      clear_sql
       append *args, @measures, Measure, cube.metrics
     end
 
     def when *args
+      clear_sql
       append *args, @selectors, Selector, cube.selectors
     end
 
     def desc *args
+      clear_sql
       args.each{|arg|
         options << Ordering.new(arg, :desc)
       }
@@ -55,6 +59,7 @@ module Activecube::Query
     end
 
     def asc *args
+      clear_sql
       args.each{|arg|
         options << Ordering.new( arg, :asc)
       }
@@ -62,6 +67,7 @@ module Activecube::Query
     end
 
     def offset *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :skip)
       }
@@ -69,6 +75,7 @@ module Activecube::Query
     end
 
     def limit *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :take)
       }
@@ -77,13 +84,12 @@ module Activecube::Query
 
 
     def query
-      composer = Activecube::Processor::Composer.new(self)
-      sql = composer.build_query.to_sql
-      composer.connection.exec_query(sql)
+      sql = to_query.to_sql
+      @composed.connection.exec_query(sql)
     end
 
     def to_query
-      Activecube::Processor::Composer.new(self).build_query
+      @composed.try(:query) || (@composed = Activecube::Processor::Composer.new(self)).build_query
     end
 
     def to_sql
@@ -136,5 +142,10 @@ module Activecube::Query
       options.select{|s| s.kind_of? Ordering}
     end
 
+    private
+
+    def clear_sql
+      @composed = nil
+    end
   end
 end

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.23"
+  VERSION = "0.1.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord