rgviz-rails 0.20 → 0.21

data/lib/rgviz_rails/executor.rb

@@ -168,7 +168,7 @@ module Rgviz
       else
         # A little more complicated...
       
-        # This has the grouping as a key and the pivoted selection values as a key (in a list) 
+        # This has the grouping as a key and the pivoted selection values as a value (in a list) 
         fin = ActiveSupport::OrderedHash.new
         
         # The uniq pivot values
@@ -202,9 +202,7 @@ module Rgviz
           
           # Now put all this info into fin
           fin[grouped_by] = {} unless fin[grouped_by]
-          selections.each do |selection|
-            fin[grouped_by][pivots] = selection
-          end
+          fin[grouped_by][pivots] = selections
         end
         
         # Sort the uniq pivots so the results will be sorted for a human
@@ -236,6 +234,7 @@ module Rgviz
           @table.rows << row
         
           group_i = 0
+          value_i = 0
           @original_columns.each_with_index do |original_column, i|
             if @group_bys.include?(original_column)
               hash = {}
@@ -244,10 +243,14 @@ module Rgviz
               group_i += 1
             elsif !@pivots.include?(original_column)
               uniq_pivots.each do |uniq_pivot|
+                v = value[uniq_pivot]
+                v = v[value_i] if v
+              
                 hash = {}
-                hash[:v] = value[uniq_pivot] unless @query.options && @query.options.no_values
+                hash[:v] = v unless @query.options && @query.options.no_values
                 row.c << (Cell.new hash)
               end
+              value_i += 1
             end
           end
         end
@@ -383,10 +386,12 @@ module Rgviz
     def visit_scalar_function_column(node)
       case node.function
       when ScalarFunctionColumn::Sum, ScalarFunctionColumn::Difference,
-           ScalarFunctionColumn::Product, ScalarFunctionColumn::Quotient 
+           ScalarFunctionColumn::Product, ScalarFunctionColumn::Quotient
+        @string += "(" 
         node.arguments[0].accept self
         @string += node.function.to_s
         node.arguments[1].accept self
+        @string += ")"
       else
         @string += @executor.adapter.accept_scalar_function_column(node, self)
       end
@@ -437,9 +442,11 @@ module Rgviz
   
   class WhereVisitor < ColumnVisitor
     def visit_binary_expression(node)
+      @string += "("
       node.left.accept self
       @string += " #{node.operator} "
       node.right.accept self
+      @string += ")"
       false
     end
     

data/spec/rgviz/executor_spec.rb

@@ -368,4 +368,25 @@ describe Executor do
     end
   end
   
+  it "processes pivot4" 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, month(birthday), sum(age) group by month(birthday) pivot name order by name'
+    
+    table.cols.length.should == 5
+    
+    i = 0
+    [
+      ['2000-01-12', nil, 1, 10, nil],
+      [nil, '2001-02-12', 2, nil, 20],
+    ].each do |values|
+      table.rows[i].c.length.should == 5
+      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: 35
+  hash: 33
   prerelease: false
   segments: 
   - 0
-  - 20
-  version: "0.20"
+  - 21
+  version: "0.21"
 platform: ruby
 authors: 
 - Ary Borenszweig