activecube 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 663ae546f63257569c7692d59478ffef3c954f2c9a74f53c78ae6ee31bdf093c
-  data.tar.gz: df61b6a95415e4879d62b0eada8abcf732d9d7aeca882c72fa28ca929c567db1
+  metadata.gz: 6c706faf950e642b3216ee5bce134ae45c9ad1047395825426897961a2bf357e
+  data.tar.gz: eb49f277b4fe9ade7817fd9b3d69389ec0879ae3a92004c5d2fa85a2a19a1d70
 SHA512:
-  metadata.gz: e25d8a4f05d9880c4c3acbf6854393556902e0339976701949ab5b56bc3d627f20a9790144c19f00903786fa0abd947c2cb866bdc5d41856483cd8e030a281d1
-  data.tar.gz: 418d88e3f5d6249de2781faa1f27cfc42d219538eac7c2d68611735771cf8d2413ac2a1e626559d7b8f0d0248852358a58ea5400af2a561248cb1a591126e49a
+  metadata.gz: 5754c7e2658c9456bee51c66f21ca42da0f7198bf155b06386e845745da098c282a89cd4c388d3581421d0c9e89704accd2249c45b3c30ff32e72744d0b52fbe
+  data.tar.gz: e5ff2a9a0ac8706dae669b7c0355f2e04ff5f6bb2ca7415253ada1fe76d1036dbdcd8d5b9202b3c10cd19996184b52498fecd7debf4be4547af01f3b27a0e36b

data/Gemfile.lock

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

data/lib/activecube/query/item.rb

@@ -22,5 +22,35 @@ module Activecube::Query
       "#{definition.class.name}(#{key})"
     end
 
+
+    private
+
+    def append_with! model, cube_query, table, query
+
+      if definition.respond_to?(:with_expression) &&
+        (with_expression = definition.with_expression(model, cube_query, table, query))
+        with_expression.each_pair do |key, expr|
+          query = try_append_with(query, key, expr)
+        end
+      end
+      query
+    end
+
+    def try_append_with(query, key, expr)
+      expr = Arel.sql(expr) if expr.kind_of?(String)
+      if (with = query.ast.with)
+        existing = with.expr.detect{|expr| expr.right==key }
+        if existing
+          raise "Key #{key} defined twice in WITH statement, with different expressions #{expr.to_sql} AND #{existing.left}" if existing.left!=expr.to_s
+          query
+        else
+          query.with(with.expr + [expr.as(key)])
+        end
+      else
+        query.with(expr.as(key))
+      end
+
+    end
+
   end
 end

data/lib/activecube/query/measure.rb

@@ -36,6 +36,7 @@ module Activecube::Query
     end
 
     def append_query model, cube_query, table, query
+      query = append_with!(model, cube_query, table, query)
       attr_alias = "`#{key.to_s}`"
       expr = definition.expression model, table, self, cube_query
       query.project expr.as(attr_alias)
@@ -53,6 +54,7 @@ module Activecube::Query
 
     private
 
+
     def modifier_methods!
       definition.class.modifiers.each_pair do |key, modifier|
         define_singleton_method key do |*args|

data/lib/activecube/query/selector.rb

@@ -32,6 +32,7 @@ module Activecube::Query
       end
 
       def append_query model, cube_query, arel_table, query
+        query = append_with!(model, cube_query, arel_table, query)
         query.where expression(model, arel_table, cube_query)
       end
 

data/lib/activecube/query/slice.rb

@@ -60,6 +60,8 @@ module Activecube::Query
 
     def append_query model, cube_query, table, query
 
+      query = append_with!(model, cube_query, table, query)
+
       attr_alias = "`#{key.to_s}`"
       expr = (parent || definition.respond_to?(:expression)) ?
                  Arel.sql(definition.expression( model, table, self, cube_query) ) :

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.30"
+  VERSION = "0.1.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord