activecube 0.1.31 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c706faf950e642b3216ee5bce134ae45c9ad1047395825426897961a2bf357e
-  data.tar.gz: eb49f277b4fe9ade7817fd9b3d69389ec0879ae3a92004c5d2fa85a2a19a1d70
+  metadata.gz: 946404c43c88aa42570d8224b1e2419298eb04f5b2ca3294e874a2ef394b26ec
+  data.tar.gz: 6e282374863673eed33448f0685360707ef0ab76e97c407dd9558ed3b4c3534c
 SHA512:
-  metadata.gz: 5754c7e2658c9456bee51c66f21ca42da0f7198bf155b06386e845745da098c282a89cd4c388d3581421d0c9e89704accd2249c45b3c30ff32e72744d0b52fbe
-  data.tar.gz: e5ff2a9a0ac8706dae669b7c0355f2e04ff5f6bb2ca7415253ada1fe76d1036dbdcd8d5b9202b3c10cd19996184b52498fecd7debf4be4547af01f3b27a0e36b
+  metadata.gz: 5e19e4c1aded7105504bf70ca2696aff4ff92b691e665685f01fd1bfca5274fe9719e2dbd07c6912d15a869a3e65b6c8b23b429177820d293511ce4641541e87
+  data.tar.gz: 74b03d055b8a68508ca2230ded3feb74d8f4a20ef5e717d73cf8c356c7d5f2c28865b9c53944956d355441d3e9af8aeba562a1a7411dd106fb22ca7b35cf931b

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.30)
+    activecube (0.1.34)
       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

@@ -16,6 +16,8 @@ module Activecube::Query
     include ChainAppender
 
     attr_reader :cube, :slices, :measures, :selectors, :options, :tables, :sql
+    attr_accessor :user_agent
+
     def initialize cube, slices = [], measures = [], selectors = [], options = [], model_tables = nil
       @cube = cube
       @slices = slices
@@ -92,7 +94,11 @@ module Activecube::Query
 
     def query
       sql = to_query.to_sql
-      @composed.connection.exec_query(sql)
+      connection = @composed.connection
+      if user_agent
+        connection.headers = {'User-Agent': user_agent}
+      end
+      connection.exec_query(sql)
     end
 
     def to_query
@@ -107,6 +113,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,9 +22,6 @@ module Activecube::Query
       "#{definition.class.name}(#{key})"
     end
 
-
-    private
-
     def append_with! model, cube_query, table, query
 
       if definition.respond_to?(:with_expression) &&
@@ -36,8 +33,13 @@ module Activecube::Query
       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

data/lib/activecube/query/selector.rb

@@ -32,7 +32,11 @@ module Activecube::Query
       end
 
       def append_query model, cube_query, arel_table, query
-        query = append_with!(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
 
@@ -111,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.35
 platform: ruby
 authors:
 - Aleksey Studnev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-11-17 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: []