activecube 0.1.30 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 663ae546f63257569c7692d59478ffef3c954f2c9a74f53c78ae6ee31bdf093c
-  data.tar.gz: df61b6a95415e4879d62b0eada8abcf732d9d7aeca882c72fa28ca929c567db1
+  metadata.gz: d1ec1e26cea7ad07749ac2b6545b0ad83e8aa36cf1b3a996ccced9f1977bd639
+  data.tar.gz: 8147a433dd7047ac450953b94090dd345aeb9d3e6fd4d2365aa5db5b2ff3e077
 SHA512:
-  metadata.gz: e25d8a4f05d9880c4c3acbf6854393556902e0339976701949ab5b56bc3d627f20a9790144c19f00903786fa0abd947c2cb866bdc5d41856483cd8e030a281d1
-  data.tar.gz: 418d88e3f5d6249de2781faa1f27cfc42d219538eac7c2d68611735771cf8d2413ac2a1e626559d7b8f0d0248852358a58ea5400af2a561248cb1a591126e49a
+  metadata.gz: 0ec017798d5edc0bbe41f60ac1ff90fea9ac80afb0a9652f0374b9b16aac66779ba42dc3b5531e4fcd663afbe188ad0d371e960e599483caa02326f7e3f093f3
+  data.tar.gz: dea80f006dd4073aa01cda9edd3fb61f3761fb8817879cf198f81b7cc6289f42223aa3e661a1e2a90138418d57f7ef7ecf89a161a950a284d32f4e98e9393269

data/.idea/workspace.xml

@@ -10,7 +10,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="77368870-4045-496a-9737-2c7f83086a16" name="Default Changelist" comment="initial implementation" />
+    <list default="true" id="77368870-4045-496a-9737-2c7f83086a16" name="Default Changelist" comment="initial implementation">
+      <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -26,6 +28,8 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/activecube" />
     <property name="node.js.detected.package.eslint" value="true" />
@@ -46,6 +50,7 @@
       <recent name="$PROJECT_DIR$/lib/activecube" />
     </key>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="true" RAILS_SPRING_PRE_LOADER_OPTION="true" />
   <component name="SvnConfiguration">
     <configuration />
@@ -58,6 +63,7 @@
       <option name="presentableId" value="Default" />
       <updated>1581885096407</updated>
       <workItem from="1581885099890" duration="3547000" />
+      <workItem from="1621436559886" duration="39000" />
     </task>
     <task id="LOCAL-00001" summary="initial commit">
       <created>1581885128091</created>
@@ -98,7 +104,7 @@
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="2" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
@@ -110,6 +116,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="initial commit" />

data/Gemfile.lock

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

data/lib/activecube/processor/index.rb

@@ -14,7 +14,7 @@ module Activecube
       end
 
       def matches? query, measures
-        !required ||   (fields -  query.column_names(measures)).empty?
+        !required ||   (fields -  query.column_names_required(measures)).empty?
       end
     end
   end

data/lib/activecube/query/cube_query.rb

@@ -107,6 +107,10 @@ module Activecube::Query
       (measures + slices + selectors).map(&:required_column_names).flatten.uniq
     end
 
+    def column_names_required measures = self.measures
+      (measures + slices + selectors.select{|s| !s.kind_of?(Selector::CombineSelector)}).map(&:required_column_names).flatten.uniq
+    end
+
     def selector_column_names measures = self.measures
       (measures.map(&:selectors) + slices.map(&:selectors) + selectors).flatten.map(&:required_column_names).flatten.uniq
     end

data/lib/activecube/query/item.rb

@@ -22,5 +22,37 @@ module Activecube::Query
       "#{definition.class.name}(#{key})"
     end
 
+    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
+
+    private
+
+
+
+    def try_append_with(query, key, expr)
+      expr = Arel.sql(expr) if expr.kind_of?(String)
+      query = query.where(Arel.sql('1')) unless query.respond_to?(:ast)
+      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,11 @@ module Activecube::Query
       end
 
       def append_query model, cube_query, arel_table, query
+
+        @selectors.each do |s|
+          query = s.append_with!(model, cube_query, arel_table, query)
+        end
+
         query.where expression(model, arel_table, cube_query)
       end
 
@@ -110,6 +115,7 @@ module Activecube::Query
     end
 
     def append_query model, cube_query, table, query
+      query = append_with!(model, cube_query, table, query)
       query.where(expression model, 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.34"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.34
 platform: ruby
 authors:
 - Aleksey Studnev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -126,7 +126,7 @@ homepage: https://github.com/bitquery/activecube
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Multi-Dimensional Queries with Rails
 test_files: []