rgviz-rails 0.52 → 0.53

data/lib/rgviz_rails/executor.rb

@@ -275,6 +275,7 @@ module Rgviz
             if @group_bys.include?(original_column)
               hash = {}
               hash[:v] = key[group_i] unless @query.options && @query.options.no_values
+              hash[:v] = 0 if hash[:v].nil? && is_count_column(@query.select.columns[i])
 
               format = @formats[original_column]
               hash[:f] = format_value(@table.cols[i], format, hash[:v]) if format
@@ -288,6 +289,7 @@ module Rgviz
 
                 hash = {}
                 hash[:v] = v unless @query.options && @query.options.no_values
+                hash[:v] = 0 if hash[:v].nil? && is_count_column(@query.select.columns[i])
 
                 format = @formats[original_column]
                 hash[:f] = format_value(@table.cols[i], format, hash[:v]) if format
@@ -301,6 +303,10 @@ module Rgviz
       end
     end
 
+    def is_count_column(col)
+      col.is_a?(AggregateColumn) && col.function == AggregateColumn::Count
+    end
+
     def column_id(col, i)
       case col
       when IdColumn

data/spec/rgviz/executor_spec.rb

@@ -471,6 +471,42 @@ describe Executor do
     end
   end
 
+  it "processes pivot with zeros instead of nulls in count", :focus => true do
+    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 1000
+    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 500
+    Person.make :name => 'Eng', :birthday => '2000-01-13', :age => 600
+    Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 400
+    Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 350
+    Person.make :name => 'Marketing', :birthday => '2000-01-13', :age => 800
+
+    table = exec 'select name, count(age) group by name pivot birthday order by name'
+
+    table.cols.length.should == 3
+
+    i = 0
+    [['c0', :string, 'name'],
+     ['c1', :number, '2000-01-12 count(age)'],
+     ['c2', :number, '2000-01-13 count(age)']].each do |id, type, label|
+      table.cols[i].id.should == id
+      table.cols[i].type.should == type
+      table.cols[i].label.should == label
+      i += 1
+    end
+
+    table.rows.length.should == 3
+
+    i = 0
+    [['Eng', 2, 1],
+     ['Marketing', 0, 1],
+     ['Sales', 2, 0]].each do |values|
+      table.rows[i].c.length.should == 3
+      values.each_with_index do |v, j|
+        table.rows[i].c[j].v.should == v
+      end
+      i += 1
+    end
+  end
+
   # Formatting
   it_processes_single_select_column 'false format false "%s is falsey"', 'c0', :boolean, false, 'false', 'false is falsey'
   it_processes_single_select_column '1 format 1 "%.2f"', 'c0', :number, 1, '1', '1.00'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgviz-rails
 version: !ruby/object:Gem::Version
-  version: '0.52'
+  version: '0.53'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgviz
-  requirement: &70279841786980 !ruby/object:Gem::Requirement
+  requirement: &70094420919240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70279841786980
+  version_requirements: *70094420919240
 description: 
 email: aborenszweig@manas.com.ar
 executables: []