rgviz-rails 0.21 → 0.22

data/lib/rgviz_rails/executor.rb

@@ -94,7 +94,7 @@ module Rgviz
         end
       end
       
-      # Select pivot columns
+      # Select pivot columns and group by columns
       if @query.pivot
         @query.pivot.columns.each do |col|
           col_to_s = col.to_s
@@ -104,6 +104,18 @@ module Rgviz
           @original_columns << col_to_s
           i += 1
         end
+        
+        @max_original_columns = @original_columns.length
+        
+        if @query.group_by
+          @query.group_by.columns.each do |col|
+            col_to_s = col.to_s
+          
+            @table.cols << (Column.new :id => column_id(col, i), :type => column_type(col), :label => column_label(col_to_s))
+            @selects << "(#{column_select(col)}) as c#{i}"
+            i += 1
+          end
+        end
       end
     end
     
@@ -187,9 +199,9 @@ module Rgviz
           selections = []
           
           # Fill grouped_by, pivots and selections, as well as uniq_pivots
-          @table.cols.each_with_index do |col, i|
+          @table.cols.each_with_index do |col, i| 
             val = column_value(col, result.send("c#{i}"))
-            if @group_bys.include?(@original_columns[i])
+            if i >= @max_original_columns || @group_bys.include?(@original_columns[i])
               grouped_by << val
             elsif @pivots.include?(@original_columns[i])
               pivots << val
@@ -213,6 +225,8 @@ module Rgviz
         col_i = 0
         new_cols = []
         @original_columns.each_with_index do |original_column, i|
+          break if i >= @max_original_columns
+        
           old_col = @table.cols[i] 
           if @group_bys.include?(original_column)
             old_col.id = "c#{col_i}"

data/spec/rgviz/executor_spec.rb

@@ -389,4 +389,25 @@ describe Executor do
     end
   end
   
+  it "processes pivot with group by not in select" do
+    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 10
+    Person.make :name => 'Sales', :birthday => '2001-02-12', :age => 20
+  
+    table = exec 'select birthday, sum(age) group by month(birthday) pivot name order by name'
+    
+    table.cols.length.should == 4
+    
+    i = 0
+    [
+      ['2000-01-12', nil, 10, nil],
+      [nil, '2001-02-12', nil, 20],
+    ].each do |values|
+      table.rows[i].c.length.should == 4
+      values.each_with_index do |v, j|
+        table.rows[i].c[j].v.should == v
+      end
+      i += 1
+    end
+  end
+  
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: false
   segments: 
   - 0
-  - 21
-  version: "0.21"
+  - 22
+  version: "0.22"
 platform: ruby
 authors: 
 - Ary Borenszweig