activecube 0.1.27 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfca472f67e11b5fd57a351c506d1c5addfe242357a16baf7af7aef0993b87cf
-  data.tar.gz: b3f6c6681a821767b64970f7d94ad838a8a0f5066686d8d3a3a265e16c146df3
+  metadata.gz: bafdfeabff735168eac514c7a3fa3d80c70e74fcb43372d9110eec9dd58d2eb8
+  data.tar.gz: 45f11a99a45eafaf84a127b2e5328ae77515d835122c000669c66fe06a0777a1
 SHA512:
-  metadata.gz: ddbe93e4099b0f5cacabb7ca3686206d7378bf5f39e5a40575cbfb14684999ea4b1f7a05083772c62d7244332c154c7c424ef4927b478fc260a50d8f1fee6674
-  data.tar.gz: 10222838ad5a21399fb811ac244982d2e3c5b9dde553675804da1f78503f4ae64a89571d39c2f7bf8a968e253a330bc0b9b9ae3f8e7429434c8f75db01ee03b1
+  metadata.gz: b2faf2c565024c87ddd2045eb644ded72158ebeeec8ce200cd2937d428961a36a8f61c1d3ab83a433ab423a3270ec4af58d5b36f8d17bb99a2d7af2f0505c91a
+  data.tar.gz: 27da45c79d812fabb3d59a53d2739db1ae7dde7bd6377be3ca00a7733e0ed169719416b49c9bfefc9a6b3c572a5f4ec3d9c8518f8b78a3e9b05f99f015d8eba8

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.26)
+    activecube (0.1.31)
       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
@@ -52,7 +53,7 @@ module Activecube
 
     include DefinitionMethods
 
-    attr_reader :modifiers
+    attr_reader :modifiers, :tuple
 
     private
 
@@ -60,6 +61,9 @@ module Activecube
       (@modifiers ||= {} )[args.first.to_sym] = Modifier.new( *args)
     end
 
+    def tuple_fields *args
+      @tuple = args
+    end
   end
 
 end

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,36 @@ 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)
+      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.27"
+  VERSION = "0.1.32"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.32
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-01 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