activecube 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b32d45c2412d7be46e4f044b3287262b5014ad617ac9929fc0f740c7c64520
-  data.tar.gz: f5c97c62544274087c0ca1cfedf403384f3dc04bb05ba327cc2c51a6a5bc9ff0
+  metadata.gz: 663ae546f63257569c7692d59478ffef3c954f2c9a74f53c78ae6ee31bdf093c
+  data.tar.gz: df61b6a95415e4879d62b0eada8abcf732d9d7aeca882c72fa28ca929c567db1
 SHA512:
-  metadata.gz: ee2dd6dc3bcb0b4f1b2acc83aceb94d677564d2c70c51646018b0b91c2e168f41459cc0e7541e5b4182aebb8bc4e288d88ae2fc017836ca2d1475afb0c28f019
-  data.tar.gz: '0709d3aa9adef226869f016a46d58a11cbfee94315fac2f22c7740ca3bf215c8ab691191a9b6ce50e69ed3ff072de84993bc313cf86f9095b41a71cf5be88072'
+  metadata.gz: e25d8a4f05d9880c4c3acbf6854393556902e0339976701949ab5b56bc3d627f20a9790144c19f00903786fa0abd947c2cb866bdc5d41856483cd8e030a281d1
+  data.tar.gz: 418d88e3f5d6249de2781faa1f27cfc42d219538eac7c2d68611735771cf8d2413ac2a1e626559d7b8f0d0248852358a58ea5400af2a561248cb1a591126e49a

data/Gemfile.lock

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

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

@@ -68,11 +68,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.29"
+  VERSION = "0.1.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-30 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