rgviz-rails 0.30 → 0.31

data/lib/rgviz_rails/adapters/mysql_adapter.rb

@@ -56,6 +56,13 @@ module Rgviz
         visitor << "lower("
         node.arguments[0].accept visitor
         visitor << ")"
+      when ScalarFunctionColumn::Concat
+        visitor << "concat("
+        node.arguments.each_with_index do |arg, i|
+          visitor << ", " if i > 0
+          arg.accept visitor
+        end
+        visitor << ")"
       end
     end
   end

data/lib/rgviz_rails/adapters/postgresql_adapter.rb

@@ -62,6 +62,13 @@ module Rgviz
         visitor << "lower("
         node.arguments[0].accept visitor
         visitor << ")"
+      when ScalarFunctionColumn::Concat
+        visitor << "("
+        node.arguments.each_with_index do |arg, i|
+          visitor << " || " if i > 0
+          arg.accept visitor
+        end
+        visitor << ")"
       end
     end
   end

data/lib/rgviz_rails/adapters/sqlite_adapter.rb

@@ -54,6 +54,13 @@ module Rgviz
         visitor << "lower("
         node.arguments[0].accept visitor
         visitor << ")"
+      when ScalarFunctionColumn::Concat
+        visitor << "("
+        node.arguments.each_with_index do |arg, i|
+          visitor << " || " if i > 0
+          arg.accept visitor
+        end
+        visitor << ")"
       end
     end
   end

data/lib/rgviz_rails/executor.rb

@@ -6,7 +6,6 @@ module Rgviz
     def initialize(model_class, query)
       @model_class = model_class
       @query = query
-      @query = Parser.new(query).parse unless query.kind_of?(Query)
       @selects = []
       @joins = {}
       @labels = {}
@@ -24,6 +23,8 @@ module Rgviz
     end
     
     def execute(options = {})
+      @query = Parser.parse(@query, options) unless @query.kind_of?(Query)
+    
       @table = Table.new
       @extra_conditions = options[:conditions]
       
@@ -97,6 +98,8 @@ module Rgviz
       
       # Select pivot columns and group by columns
       if @query.pivot
+        @max_before_pivot_columns = @original_columns.length
+      
         @query.pivot.columns.each do |col|
           col_to_s = col.to_s
         
@@ -164,7 +167,9 @@ module Rgviz
         :offset => @query.offset,
         :joins => @joins
       
-      if @pivots.empty?
+      if @pivots.empty? || results.empty?
+        @table.cols = @table.cols[0 ... @max_before_pivot_columns] if @pivots.present?
+      
         # Simple, just convert the results to a table
         results.each do |result|
           row = Row.new
@@ -175,13 +180,13 @@ module Rgviz
             hash = {}
             hash[:v] = column_value(col, result.send("c#{i}")) unless @query.options && @query.options.no_values
             row.c << Cell.new(hash)
-            i += 1 
+            i += 1
           end
         end
       else
         # A little more complicated...
-      
-        # This has the grouping as a key and the pivoted selection values as a value (in a list) 
+        
+        # This is grouping => pivot => [selections]
         fin = ActiveSupport::OrderedHash.new
         
         # The uniq pivot values
@@ -189,7 +194,6 @@ module Rgviz
       
         # Fill fin and uniq_pivots
         results.each do |result|
-          
           # The grouping key of this result
           grouped_by = []
           
@@ -305,7 +309,7 @@ module Rgviz
           :datetime
         when ScalarFunctionColumn::ToDate
           :date
-        when ScalarFunctionColumn::Upper, ScalarFunctionColumn::Lower
+        when ScalarFunctionColumn::Upper, ScalarFunctionColumn::Lower, ScalarFunctionColumn::Concat
           :string
         else
           :number 

data/rails/init.rb

@@ -13,15 +13,17 @@ config.after_initialize do
         else
           model = hash[:rgviz]
           conditions = hash[:conditions]
+          extensions = hash[:extensions]
           query = params[:tq]
           tqx = params[:tqx] || ''
           
           tqx = Rgviz::Tqx.parse(tqx)
           
           begin
-            executor = Rgviz::Executor.new model, Rgviz::Parser.new(query).parse
+            executor = Rgviz::Executor.new model, query
             options = {}
             options[:conditions] = conditions if conditions
+            options[:extensions] = extensions if extensions
             table = executor.execute options
             
             yield table if block_given?

data/spec/rgviz/executor_spec.rb

@@ -7,13 +7,9 @@ describe Executor do
   before :each do
     [Person, City, Country].each &:delete_all
   end
-
-  def parse(string)
-    Parser.new(string).parse
-  end
   
   def exec(query, options = {})
-    exec = Executor.new Person, (parse query)
+    exec = Executor.new Person, query
     exec.execute options
   end
   
@@ -25,7 +21,7 @@ describe Executor do
     date.strftime "%Y-%m-%d"
   end
   
-  def self.it_processes_single_select_column(query, id, type, value, label)
+  def self.it_processes_single_select_column(query, id, type, value, label, options = {})
     it "processes select #{query}" do
       if block_given?
         yield
@@ -33,7 +29,7 @@ describe Executor do
         Person.make
       end
     
-      table = exec "select #{query}"
+      table = exec "select #{query}", options
       table.cols.length.should == 1
       
       table.cols[0].id.should == id
@@ -270,6 +266,14 @@ describe Executor do
     Person.make :name => 'FOO'
   end
   
+  it_processes_single_select_column "concat(age)", 'c0', :string, '20', "concat(age)", :extensions => true do
+    Person.make :age => 20
+  end
+  
+  it_processes_single_select_column "concat(name, 'bar')", 'c0', :string, 'foobar', "concat(name, 'bar')", :extensions => true do
+    Person.make :name => 'foo'
+  end
+  
   it_processes_single_select_column "name label name 'my name'", 'name', :string, 'foo', "my name" do
     Person.make :name => 'foo'
   end
@@ -393,6 +397,24 @@ describe Executor do
     end
   end
   
+  it "processes pivot with no results" 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) where 1 = 2 group by month(birthday) pivot name order by name'
+    
+    table.cols.length.should == 2
+    
+    i = 0
+    [['birthday', :date, 'birthday'], 
+     ['c1', :number, '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
+  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

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
-  - 30
-  version: "0.30"
+  - 31
+  version: "0.31"
 platform: ruby
 authors: 
 - Ary Borenszweig