rgviz-rails 0.8 → 0.9

data/lib/rgviz_rails/adapters/mysql_adapter.rb

@@ -0,0 +1,62 @@
+module Rgviz
+  class MySqlAdapter
+    def accept_scalar_function_column(node, visitor)
+      case node.function
+      when ScalarFunctionColumn::Year
+        visitor << "year("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Month
+        visitor << "month("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Day
+        visitor << "day("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Hour
+        visitor << "hour("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Minute
+        visitor << "minute("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Second
+        visitor << "second("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Millisecond
+        raise NotSupported.new "The millisecond function is not supported"
+      when ScalarFunctionColumn::Quarter
+        visitor << "quarter("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::DayOfWeek
+        visitor << "dayofweek("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Now
+        visitor << "now()"
+      when ScalarFunctionColumn::DateDiff
+        visitor << "datediff("
+        node.arguments[0].accept visitor
+        visitor << ","
+        node.arguments[1].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::ToDate
+        visitor << "date_format("
+        node.arguments[0].accept visitor
+        visitor << ", '%Y-%m-%d')"
+      when ScalarFunctionColumn::Upper
+        visitor << "upper("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Lower
+        visitor << "lower("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      end
+    end
+  end
+end

data/lib/rgviz_rails/adapters/sqlite_adapter.rb

@@ -0,0 +1,60 @@
+module Rgviz
+  class SqliteAdapter
+    def accept_scalar_function_column(node, visitor)
+      case node.function
+      when ScalarFunctionColumn::Year
+        visitor << "strftime('%Y', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Month
+        visitor << "strftime('%m', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Day
+        visitor << "strftime('%d', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Hour
+        visitor << "strftime('%H', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Minute
+        visitor << "strftime('%M', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Second
+        visitor << "strftime('%S', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Millisecond
+        raise NotSupported.new "The millisecond function is not supported"
+      when ScalarFunctionColumn::Quarter
+        raise NotSupported.new "The quarter function is not supported"
+      when ScalarFunctionColumn::DayOfWeek
+        visitor << "1 + strftime('%w', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Now
+        visitor << "strftime('%Y-%m-%d %H:%M:%S')"
+      when ScalarFunctionColumn::DateDiff
+        visitor << "julianday("
+        node.arguments[0].accept visitor
+        visitor << ") - julianday("
+        node.arguments[1].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::ToDate
+        visitor << "strftime('%Y-%m-%d', "
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Upper
+        visitor << "upper("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      when ScalarFunctionColumn::Lower
+        visitor << "lower("
+        node.arguments[0].accept visitor
+        visitor << ")"
+      end
+    end
+  end
+end

data/lib/rgviz_rails/executor.rb

@@ -1,11 +1,18 @@
 module Rgviz
   class Executor
     attr_reader :model_class
+    attr_reader :adapter
   
     def initialize(model_class, query)
       @model_class = model_class
       @query = query
       @joins = {}
+      case ActiveRecord::Base.connection.adapter_name.downcase
+      when 'sqlite'
+        @adapter = SqliteAdapter.new
+      when 'mysql'
+        @adapter = MySqlAdapter.new
+      end
     end
     
     def execute(options = {})
@@ -184,7 +191,11 @@ module Rgviz
       @executor = executor
     end
     
-    def visitIdColumn(node)
+    def <<(string)
+      @string += string
+    end
+    
+    def visit_id_column(node)
       klass, rails_col, joins = Rgviz::find_rails_col @executor.model_class, node.name
       raise "Unknown column '#{node.name}'" unless rails_col
       @string += ActiveRecord::Base.connection.quote_column_name(klass.table_name)
@@ -194,42 +205,44 @@ module Rgviz
       @executor.add_joins joins
     end
     
-    def visitNumberColumn(node)
+    def visit_number_column(node)
       @string += node.value.to_s
     end
     
-    def visitStringColumn(node)
+    def visit_string_column(node)
       @string += escaped_string(node.value)
     end
     
-    def visitBooleanColumn(node)
+    def visit_boolean_column(node)
       @string += node.value ? '1' : '0'
     end
     
-    def visitDateColumn(node)
+    def visit_date_column(node)
       @string += escaped_string(node.value.to_s)
     end
     
-    def visitDateTimeColumn(node)
+    def visit_date_time_column(node)
       @string += escaped_string(node.value.strftime "%Y-%m-%d %H:%M:%S")
     end
     
-    def visitTimeOfDayColumn(node)
+    def visit_time_of_day_column(node)
       @string += escaped_string(node.value.strftime "%H:%M:%S")
     end
     
-    def visitScalarFunctionColumn(node)
+    def visit_scalar_function_column(node)
       case node.function
       when ScalarFunctionColumn::Sum, ScalarFunctionColumn::Difference,
            ScalarFunctionColumn::Product, ScalarFunctionColumn::Quotient 
         node.arguments[0].accept self
         @string += node.function.to_s
         node.arguments[1].accept self
+      else
+        @string += @executor.adapter.accept_scalar_function_column(node, self)
       end
       false
     end
     
-    def visitAggregateColumn(node)
+    def visit_aggregate_column(node)
       @string += node.function.to_s
       @string += '('
       node.argument.accept self
@@ -237,15 +250,15 @@ module Rgviz
       false
     end
     
-    def visitLabel(node)
+    def visit_label(node)
       false
     end
     
-    def visitFormat(node)
+    def visit_format(node)
       false
     end
     
-    def visitOption(node)
+    def visit_option(node)
       false
     end
     
@@ -256,14 +269,14 @@ module Rgviz
   end
   
   class WhereVisitor < ColumnVisitor
-    def visitBinaryExpression(node)
+    def visit_binary_expression(node)
       node.left.accept self
       @string += " #{node.operator} "
       node.right.accept self
       false
     end
     
-    def visitUnaryExpression(node)
+    def visit_unary_expression(node)
       case node.operator
       when UnaryExpression::Not
         @string += 'not ('
@@ -281,7 +294,7 @@ module Rgviz
   end
   
   class OrderVisitor < ColumnVisitor
-    def visitOrderBy(node)
+    def visit_order_by(node)
       i = 0
       node.sorts.each do |sort|
         @string += ',' if i > 0
@@ -290,7 +303,7 @@ module Rgviz
       false
     end
     
-    def visitSort(node)
+    def visit_sort(node)
       node.column.accept self
       @string += node.order == Sort::Asc ? ' asc' : ' desc'
       false
@@ -316,4 +329,7 @@ module Rgviz
       joins << assoc
     end
   end
+  
+  class NotSupported < ::Exception
+  end
 end

data/lib/rgviz_rails.rb

@@ -1 +1,3 @@
 require 'rgviz_rails/executor.rb'
+require 'rgviz_rails/adapters/mysql_adapter.rb'
+require 'rgviz_rails/adapters/sqlite_adapter.rb'

data/spec/rgviz/executor_spec.rb

@@ -230,4 +230,40 @@ describe Executor do
     table.rows[0].c[0].v.should == 2
   end
   
+  [['year', 2006], ['month', 5], ['day', 2], 
+   ['hour', 3], ['minute', 4], ['second', 9],
+   ['quarter', 2], ['dayOfWeek', 3]].each do |str, val|
+    it_processes_single_select_column "#{str}(created_at)", 'c0', :number, val do
+      Person.make :created_at => Time.parse('2006-05-02 3:04:09') 
+    end
+  end
+  
+  it_processes_single_select_column "dateDiff(date '2008-03-13', date '2008-03-10')", 'c0', :number, 3 do
+    Person.make
+  end
+  
+  it_processes_single_select_column "now()", 'c0', :datetime, Time.now.utc.strftime("%Y-%m-%d %H:%M:%S") do
+    Person.make :created_at => Time.parse('2006-05-02 3:04:09') 
+  end
+
+  it_processes_single_select_column "toDate('2008-03-13')", 'c0', :date, Date.parse('2008-03-13').to_s do
+    Person.make
+  end
+  
+  it_processes_single_select_column "toDate(created_at)", 'c0', :date, Date.parse('2008-03-13').to_s do
+    Person.make :created_at => Time.parse('2008-03-13 3:04:09') 
+  end
+  
+  it_processes_single_select_column "toDate(1234567890000)", 'c0', :date, Date.parse('2009-02-13').to_s do
+    Person.make
+  end
+  
+  it_processes_single_select_column "upper(name)", 'c0', :string, 'FOO' do
+    Person.make :name => 'foo'
+  end
+  
+  it_processes_single_select_column "lower(name)", 'c0', :string, 'foo' do
+    Person.make :name => 'FOO'
+  end
+  
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'logger'
 require 'active_record'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+#ActiveRecord::Base.establish_connection(:adapter => 'mysql', :database => 'rgviz_rails', :username => 'root', :password => 'root')
 
 ActiveRecord::Schema.define do
   create_table "cities", :force => true do |t|

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 8
-  version: "0.8"
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +07:00
+date: 2010-08-17 00:00:00 +07:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,8 @@ extra_rdoc_files:
 files: 
 - lib/rgviz_rails.rb
 - lib/rgviz_rails/executor.rb
+- lib/rgviz_rails/adapters/mysql_adapter.rb
+- lib/rgviz_rails/adapters/sqlite_adapter.rb
 - rails/init.rb
 - spec/blueprints.rb
 - spec/spec.opts