rgviz-rails 0.10 → 0.11

data/lib/rgviz_rails/executor.rb

@@ -6,8 +6,12 @@ module Rgviz
     def initialize(model_class, query)
       @model_class = model_class
       @query = query
+      @selects = []
       @joins = {}
       @labels = {}
+      @pivots = {}
+      @group_bys = {}
+      @original_columns = []
       case ActiveRecord::Base.connection.adapter_name.downcase
       when 'sqlite'
         @adapter = SqliteAdapter.new
@@ -20,12 +24,15 @@ module Rgviz
       @table = Table.new
       @extra_conditions = options[:conditions]
       
+      process_pivot
       process_labels
+      process_options
       
       generate_columns
       generate_conditions
       generate_group
       generate_order
+      
       generate_rows
       
       @table
@@ -39,6 +46,33 @@ module Rgviz
       end
     end
     
+    def process_options
+      return unless @query.options.present?
+      
+      @query.options.each do |option|
+        case option.option
+        when Option::NoValues
+          @no_values = true
+        when Option::NoFormat
+          @no_format = true
+        end
+      end
+    end
+    
+    def process_pivot
+      if @query.pivot
+        @query.pivot.columns.each do |column|
+          @pivots[column.to_s] = true
+        end
+      end
+      
+      if @query.group_by
+        @query.group_by.columns.each do |column|
+          @group_bys[column.to_s] = true
+        end
+      end
+    end
+    
     def add_joins(joins)
       map = @joins
       joins.each do |join|
@@ -50,14 +84,15 @@ module Rgviz
     end
     
     def generate_columns
-      @selects = []
-      
       if @query.select && @query.select.columns.present?
         # Select the specified columns
         i = 0
         @query.select.columns.each do |col|
-          @table.cols << (Column.new :id => column_id(col, i), :type => column_type(col), :label => column_label(col.to_s))
+          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}"
+          @original_columns << col_to_s
           i += 1
         end
       else
@@ -66,6 +101,19 @@ module Rgviz
         @model_class.send(:columns).each do |col|
           @table.cols << (Column.new :id => col.name, :type => (rails_column_type col), :label => column_label(col.name))
           @selects << "(#{col.name}) as c#{i}"
+          @original_columns << col_to_s
+          i += 1
+        end
+      end
+      
+      # Select pivot columns
+      if @query.pivot
+        @query.pivot.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}"          
+          @original_columns << col_to_s
           i += 1
         end
       end
@@ -77,6 +125,15 @@ module Rgviz
     
     def generate_group
       @group = to_string @query.group_by, ColumnVisitor if @query.group_by
+      pivot = to_string @query.pivot, ColumnVisitor if @query.pivot
+      
+      if pivot.present?
+        if @group.present?
+          @group += ',' + pivot 
+        else
+          @group = pivot
+        end
+      end
     end
     
     def generate_order
@@ -106,14 +163,102 @@ module Rgviz
         :offset => @query.offset,
         :joins => @joins
       
-      results.each do |result|
-        row = Row.new
-        @table.rows << row
+      if @pivots.empty?
+        # Simple, just convert the results to a table
+        results.each do |result|
+          row = Row.new
+          @table.rows << row
+          
+          i = 0
+          @table.cols.each do |col|
+            hash = {}
+            hash[:v] = column_value(col, result.send("c#{i}")) unless @no_values
+            row.c << Cell.new(hash)
+            i += 1 
+          end
+        end
+      else
+        # A little more complicated...
+      
+        # This has the grouping as a key and the pivoted selection values as a key (in a list) 
+        fin = ActiveSupport::OrderedHash.new
         
-        i = 0
-        @table.cols.each do |col|
-          row.c << (Cell.new :v => column_value(col, result.send("c#{i}")))
-          i += 1 
+        # The uniq pivot values
+        uniq_pivots = []
+      
+        # Fill fin and uniq_pivots
+        results.each do |result|
+          
+          # The grouping key of this result
+          grouped_by = []
+          
+          # The pivots of this result
+          pivots = []
+          
+          # The selections of this result
+          selections = []
+          
+          # Fill grouped_by, pivots and selections, as well as uniq_pivots
+          @table.cols.each_with_index do |col, i|
+            val = column_value(col, result.send("c#{i}"))
+            if @group_bys.include?(@original_columns[i])
+              grouped_by << val
+            elsif @pivots.include?(@original_columns[i])
+              pivots << val
+              uniq_pivots << val unless uniq_pivots.include? val
+            else
+              selections << val
+            end
+          end
+          
+          # Now put all this info into fin
+          fin[grouped_by] = {} unless fin[grouped_by]
+          pivots.each do |pivot|
+            selections.each do |selection|
+              fin[grouped_by][pivot] = selection
+            end
+          end
+        end
+        
+        # Sort the uniq pivots so the results will be sorted for a human
+        uniq_pivots.sort!
+        
+        # Regenerate the columns info: the current info has the values
+        # we needed to get the info we needed 
+        col_i = 0
+        new_cols = []
+        @original_columns.each_with_index do |original_column, i|
+          old_col = @table.cols[i] 
+          if @group_bys.include?(original_column)
+            old_col.id = "c#{col_i}"
+            new_cols << @table.cols[i]
+            col_i += 1
+          elsif !@pivots.include?(original_column)
+            uniq_pivots.each do |uniq_pivot|
+              new_cols << (Column.new :id => "c#{col_i}", :type => old_col.type, :label => "#{uniq_pivot} #{old_col.label}") 
+              col_i += 1
+            end
+          end
+        end
+        
+        @table.cols = new_cols
+        
+        # Create the rows
+        fin.each do |key, value|
+          row = Row.new
+          @table.rows << row
+        
+          group_i = 0
+          @original_columns.each_with_index do |original_column, i|
+            if @group_bys.include?(original_column)
+              row.c << (Cell.new :v => key[group_i])
+              group_i += 1
+            elsif !@pivots.include?(original_column)
+              uniq_pivots.each do |uniq_pivot|
+                row.c << (Cell.new :v => value[uniq_pivot])
+              end
+            end
+          end
         end
       end
     end

data/spec/rgviz/executor_spec.rb

@@ -202,11 +202,21 @@ describe Executor do
     Person.make :age => 3
   
     table = exec 'select age where age > 1', :conditions => 'age < 3'
+    it "processes with conditions as string" do
+    Person.make :age => 1
+    Person.make :age => 2
+    Person.make :age => 3
+  
+    table = exec 'select age', :conditions => 'age = 2'
     
     table.rows.length.should == 1
     table.rows[0].c.length.should == 1
     table.rows[0].c[0].v.should == 2
   end
+    table.rows.length.should == 1
+    table.rows[0].c.length.should == 1
+    table.rows[0].c[0].v.should == 2
+  end
   
   it "processes with conditions as array" do
     Person.make :age => 1
@@ -276,4 +286,78 @@ describe Executor do
     Person.make :age => 2
   end
   
+  it_processes_single_select_column "1 options no_values", 'c0', :number, nil, "1"
+  
+  it "processes pivot" 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, sum(age) group by name pivot birthday'
+    
+    table.cols.length.should == 3
+    
+    i = 0
+    [['c0', :string, 'name'],
+     ['c1', :number, '2000-01-12 sum(age)'], 
+     ['c2', :number, '2000-01-13 sum(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', 1500, 600],
+     ['Marketing', nil, 800],
+     ['Sales', 750, nil]].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
+  
+  it "processes pivot2" 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 sum(age), name group by name pivot birthday'
+    
+    table.cols.length.should == 3
+    
+    i = 0
+    [['c0', :number, '2000-01-12 sum(age)'], 
+     ['c1', :number, '2000-01-13 sum(age)'],
+     ['c2', :string, 'name']].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
+    [[1500, 600, 'Eng'],
+     [nil, 800, 'Marketing'],
+     [750, nil, 'Sales']].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
+  
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
-  - 10
-  version: "0.10"
+  - 11
+  version: "0.11"
 platform: ruby
 authors: 
 - Ary Borenszweig