activecube 0.1.28 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d73be89ca360efa3b43a5d7995d68f900c536d4675e0aacfaab4f6b299d77986
-  data.tar.gz: a6dac69d2602c165af3125b5df873e06c15deb744013dc474adcf38280d91161
+  metadata.gz: bbaa14405e9c29b3b3eb2458f1375dcc2d932ddb86c61e0f486a07d67f838d5b
+  data.tar.gz: 0e56082c87edf486f5c189f16a20db4a7c068cf45f97aa2ae2b2fb7925b82a5b
 SHA512:
-  metadata.gz: e8b45d8a7be9b2f1c4902730c8687157475f211159dd79a69de4ab14d2faeed8904038a825c4ead3097b42434ed6f59423dbe2cba50a9b3e6870d343b8ac13e0
-  data.tar.gz: 5a51761701938e264dad5c42190ef0bf74b415dbd89b89cb5b32d68c9f3356fc4f445067168a3c2119c798cb8118b4fe31700a23c137ff37858ce83ed047aa00
+  metadata.gz: b315cbd17b2f46fa949e626eedc8cdd4c17dce3b6e7f990d513c1b9931e16d07dca70fd473b816fe949e22b25b17ab03183f4613461506df3d3cad4669b5eb01
+  data.tar.gz: 7744a85886a797315b8793edf6b65fbb7ca13d59e9a6667aa8f23187078f5f0af2a51941fac4456f09991485d9320416905092c488cd6f0e3c14c3112e24eb4b

data/Gemfile.lock

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

data/README.md

@@ -121,6 +121,12 @@ index ['currency_id'], cardinality: 4
 index ['currency_id','date'], cardinality: 6
 ```
 
+You can require using index in some cases. If required: true added, the table will be used **only** in case when this field is used
+in query metric, dimension or selector.
+```ruby
+index ['currency_id'], cardinality: 4, required: true
+```
+
 ### Query language
 
 You use the cube class to create and execute queries.

data/lib/activecube/definition_methods.rb

@@ -31,13 +31,14 @@ module Activecube
 
     include DefinitionMethods
 
-    attr_reader :identity, :fields
+    attr_reader :identity, :identity_expression, :fields
 
     private
 
     def identity_column *args
       raise "Identity already defined as #{identity} for #{self.name}" if @identity
       @identity = args.first
+      @identity_expression = args.second
     end
 
     def field *args

data/lib/activecube/processor/index.rb

@@ -2,16 +2,20 @@ module Activecube
   module Processor
     class Index
 
-      attr_reader :fields, :cardinality
+      attr_reader :fields, :cardinality, :required
       def initialize name, *args
         @fields = [name].flatten
         @cardinality = args.first && args.first[:cardinality]
+        @required = args.first && args.first[:required]
       end
 
       def indexes? query, measures
         (fields - query.selector_column_names(measures)).empty?
       end
 
+      def matches? query, measures
+        !required ||   (fields -  query.column_names(measures)).empty?
+      end
     end
   end
 end

data/lib/activecube/processor/table.rb

@@ -12,7 +12,8 @@ module Activecube::Processor
     end
 
     def matches? query, measures = query.measures
-      (query.column_names(measures)-model.attribute_types.keys).empty?
+      (query.column_names(measures)-model.attribute_types.keys).empty? &&
+          !model.activecube_indexes.detect{|index| !index.matches?(query, measures) }
     end
 
     def measures? measure

data/lib/activecube/query/cube_query.rb

@@ -1,6 +1,7 @@
 require 'activecube/query/chain_appender'
 require 'activecube/query/item'
 require 'activecube/query/limit'
+require 'activecube/query/limit_by'
 require 'activecube/query/measure'
 require 'activecube/query/ordering'
 require 'activecube/query/option'
@@ -82,6 +83,12 @@ module Activecube::Query
       self
     end
 
+    def limit_by *args
+      clear_sql
+      options << LimitBy.new(args)
+      self
+    end
+
 
     def query
       sql = to_query.to_sql

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/limit_by.rb

@@ -0,0 +1,19 @@
+module Activecube
+  module Query
+    class LimitBy
+
+      attr_reader :each, :limit, :offset
+      def initialize arguments
+        map = Hash[arguments]
+        @each = map[:each]
+        @limit = map[:limit]
+        @offset = map[:offset] || 0
+      end
+
+      def append_query _model, _cube_query, _table, query
+        query.limit_by each, limit, offset
+      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) ) :
@@ -68,11 +70,20 @@ module Activecube::Query
       query = query.project(expr.as(attr_alias))
 
       if dimension.class.identity
+        expr = dimension.class.identity_expression
         group_by_columns.each do |column|
-          if !query.projections.detect{|p| p.kind_of?(::Arel::Attributes::Attribute) && p.name==column}
-            query = query.project(table[column])
+
+          node =  if column==dimension.class.identity && expr
+                    Arel.sql(expr).as(column)
+                  else
+                    table[column]
+                  end
+
+          unless query.projections.include?(node)
+            query = query.project(node)
           end
-          query = query.group(table[column])
+
+          query = query.group( expr ? column : table[column])
         end
       else
         query = query.group(attr_alias)

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.28"
+  VERSION = "0.1.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.33
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,7 @@ files:
 - lib/activecube/query/cube_query.rb
 - lib/activecube/query/item.rb
 - lib/activecube/query/limit.rb
+- lib/activecube/query/limit_by.rb
 - lib/activecube/query/measure.rb
 - lib/activecube/query/measure_nothing.rb
 - lib/activecube/query/modification.rb