aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/arel/collectors/sql_string.rb28
-rw-r--r--lib/arel/nodes/node.rb6
-rw-r--r--lib/arel/select_manager.rb4
-rw-r--r--lib/arel/tree_manager.rb6
-rw-r--r--lib/arel/visitors/bind_substitute.rb9
-rw-r--r--lib/arel/visitors/bind_visitor.rb12
-rw-r--r--lib/arel/visitors/dot.rb3
-rw-r--r--lib/arel/visitors/mysql.rb61
-rw-r--r--lib/arel/visitors/oracle.rb47
-rw-r--r--lib/arel/visitors/postgresql.rb21
-rw-r--r--lib/arel/visitors/reduce.rb25
-rw-r--r--lib/arel/visitors/sqlite.rb5
-rw-r--r--lib/arel/visitors/to_sql.rb555
-rw-r--r--lib/arel/visitors/where_sql.rb5
-rw-r--r--test/helper.rb9
-rw-r--r--test/test_select_manager.rb3
-rw-r--r--test/visitors/test_bind_visitor.rb22
-rw-r--r--test/visitors/test_mysql.rb18
-rw-r--r--test/visitors/test_oracle.rb42
-rw-r--r--test/visitors/test_postgres.rb30
-rw-r--r--test/visitors/test_sqlite.rb4
-rw-r--r--test/visitors/test_to_sql.rb162
22 files changed, 687 insertions, 390 deletions
diff --git a/lib/arel/collectors/sql_string.rb b/lib/arel/collectors/sql_string.rb
new file mode 100644
index 0000000000..824b0a1712
--- /dev/null
+++ b/lib/arel/collectors/sql_string.rb
@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+module Arel
+ module Collectors
+ class SQLString
+ def initialize
+ @str = ''
+ end
+
+ def value
+ @str
+ end
+
+ def << str
+ @str << str
+ self
+ end
+
+ def start; self; end
+ def finish; self; end
+
+ def add_bind bind
+ self << bind
+ self
+ end
+ end
+ end
+end
diff --git a/lib/arel/nodes/node.rb b/lib/arel/nodes/node.rb
index 36e7628612..239c4fd766 100644
--- a/lib/arel/nodes/node.rb
+++ b/lib/arel/nodes/node.rb
@@ -1,3 +1,5 @@
+require 'arel/collectors/sql_string'
+
module Arel
module Nodes
###
@@ -42,7 +44,9 @@ module Arel
#
# Maybe we should just use `Table.engine`? :'(
def to_sql engine = Table.engine
- engine.connection.visitor.accept self
+ collector = Arel::Collectors::SQLString.new
+ collector = engine.connection.visitor.accept self, collector
+ collector.value
end
# Iterate through AST, nodes will be yielded depth-first
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index a3bfa9a230..fe0d26a16e 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -1,3 +1,5 @@
+require 'arel/collectors/sql_string'
+
module Arel
class SelectManager < Arel::TreeManager
include Arel::Crud
@@ -167,7 +169,7 @@ module Arel
return if @ctx.wheres.empty?
viz = Visitors::WhereSql.new @engine.connection
- Nodes::SqlLiteral.new viz.accept @ctx
+ Nodes::SqlLiteral.new viz.accept(@ctx, Collectors::SQLString.new).value
end
def union operation, other = nil
diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb
index 1adb230991..87887800d0 100644
--- a/lib/arel/tree_manager.rb
+++ b/lib/arel/tree_manager.rb
@@ -1,3 +1,5 @@
+require 'arel/collectors/sql_string'
+
module Arel
class TreeManager
include Arel::FactoryMethods
@@ -21,7 +23,9 @@ module Arel
end
def to_sql
- visitor.accept @ast
+ collector = Arel::Collectors::SQLString.new
+ collector = visitor.accept @ast, collector
+ collector.value
end
def initialize_copy other
diff --git a/lib/arel/visitors/bind_substitute.rb b/lib/arel/visitors/bind_substitute.rb
new file mode 100644
index 0000000000..0503a9c986
--- /dev/null
+++ b/lib/arel/visitors/bind_substitute.rb
@@ -0,0 +1,9 @@
+module Arel
+ module Visitors
+ class BindSubstitute
+ def initialize delegte
+ @delegate = delegate
+ end
+ end
+ end
+end
diff --git a/lib/arel/visitors/bind_visitor.rb b/lib/arel/visitors/bind_visitor.rb
index 5cb251ffde..c316c8d702 100644
--- a/lib/arel/visitors/bind_visitor.rb
+++ b/lib/arel/visitors/bind_visitor.rb
@@ -6,24 +6,26 @@ module Arel
super
end
- def accept node, &block
+ def accept node, collector, &block
@block = block if block_given?
super
end
private
- def visit_Arel_Nodes_Assignment o
+ def visit_Arel_Nodes_Assignment o, collector
if o.right.is_a? Arel::Nodes::BindParam
- "#{visit o.left} = #{visit o.right}"
+ collector = visit o.left, collector
+ collector << " = "
+ visit o.right, collector
else
super
end
end
- def visit_Arel_Nodes_BindParam o
+ def visit_Arel_Nodes_BindParam o, collector
if @block
- @block.call
+ @block.call(collector)
else
super
end
diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb
index 99f4c467d2..ba35223ac9 100644
--- a/lib/arel/visitors/dot.rb
+++ b/lib/arel/visitors/dot.rb
@@ -23,11 +23,12 @@ module Arel
end
def accept object
- super
+ visit object
to_dot
end
private
+
def visit_Arel_Nodes_Ordering o
visit_edge o, "expr"
end
diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb
index 3b911e826f..cf590598e1 100644
--- a/lib/arel/visitors/mysql.rb
+++ b/lib/arel/visitors/mysql.rb
@@ -2,25 +2,31 @@ module Arel
module Visitors
class MySQL < Arel::Visitors::ToSql
private
- def visit_Arel_Nodes_Union o, suppress_parens = false
- left_result = case o.left
+ def visit_Arel_Nodes_Union o, collector, suppress_parens = false
+ unless suppress_parens
+ collector << "( "
+ end
+
+ collector = case o.left
when Arel::Nodes::Union
- visit_Arel_Nodes_Union o.left, true
+ visit_Arel_Nodes_Union o.left, collector, true
else
- visit o.left
+ visit o.left, collector
end
- right_result = case o.right
+ collector << " UNION "
+
+ collector = case o.right
when Arel::Nodes::Union
- visit_Arel_Nodes_Union o.right, true
+ visit_Arel_Nodes_Union o.right, collector, true
else
- visit o.right
+ visit o.right, collector
end
if suppress_parens
- "#{left_result} UNION #{right_result}"
+ collector
else
- "( #{left_result} UNION #{right_result} )"
+ collector << " )"
end
end
@@ -31,26 +37,43 @@ module Arel
###
# :'(
# http://dev.mysql.com/doc/refman/5.0/en/select.html#id3482214
- def visit_Arel_Nodes_SelectStatement o
+ def visit_Arel_Nodes_SelectStatement o, collector
if o.offset && !o.limit
o.limit = Arel::Nodes::Limit.new(Nodes.build_quoted(18446744073709551615))
end
super
end
- def visit_Arel_Nodes_SelectCore o
+ def visit_Arel_Nodes_SelectCore o, collector
o.froms ||= Arel.sql('DUAL')
super
end
- def visit_Arel_Nodes_UpdateStatement o
- [
- "UPDATE #{visit o.relation}",
- ("SET #{o.values.map { |value| visit value }.join ', '}" unless o.values.empty?),
- ("WHERE #{o.wheres.map { |x| visit x }.join ' AND '}" unless o.wheres.empty?),
- ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
- (visit(o.limit) if o.limit),
- ].compact.join ' '
+ def visit_Arel_Nodes_UpdateStatement o, collector
+ collector << "UPDATE "
+ collector = visit o.relation, collector
+
+ unless o.values.empty?
+ collector << "SET "
+ collector = inject_join o.values, collector, ', '
+ end
+
+ unless o.wheres.empty?
+ collector << "SET "
+ collector = inject_join o.wheres, collector, ' AND '
+ end
+
+ unless o.orders.empty?
+ collector << "ORDER BY "
+ collector = inject_join o.wheres, collector, ', '
+ end
+
+ if o.limit
+ collector << " "
+ visit(o.limit, collector)
+ else
+ collector
+ end
end
end
diff --git a/lib/arel/visitors/oracle.rb b/lib/arel/visitors/oracle.rb
index 0cd0179931..2cdbafadad 100644
--- a/lib/arel/visitors/oracle.rb
+++ b/lib/arel/visitors/oracle.rb
@@ -3,7 +3,7 @@ module Arel
class Oracle < Arel::Visitors::ToSql
private
- def visit_Arel_Nodes_SelectStatement o
+ def visit_Arel_Nodes_SelectStatement o, collector
o = order_hacks(o)
# if need to select first records without ORDER BY and GROUP BY and without DISTINCT
@@ -20,49 +20,58 @@ module Arel
limit = o.limit.expr.to_i
offset = o.offset
o.offset = nil
- sql = super(o)
- return <<-eosql
+ collector << "
SELECT * FROM (
SELECT raw_sql_.*, rownum raw_rnum_
- FROM (#{sql}) raw_sql_
+ FROM ("
+
+ collector = super(o, collector)
+ collector << ") raw_sql_
WHERE rownum <= #{offset.expr.to_i + limit}
)
- WHERE #{visit offset}
- eosql
+ WHERE "
+ return visit(offset, collector)
end
if o.limit
o = o.dup
limit = o.limit.expr
- return "SELECT * FROM (#{super(o)}) WHERE ROWNUM <= #{visit limit}"
+ collector << "SELECT * FROM ("
+ collector = super(o, collector)
+ collector << ") WHERE ROWNUM <= "
+ return visit limit, collector
end
if o.offset
o = o.dup
offset = o.offset
o.offset = nil
- sql = super(o)
- return <<-eosql
- SELECT * FROM (
+ collector << "SELECT * FROM (
SELECT raw_sql_.*, rownum raw_rnum_
- FROM (#{sql}) raw_sql_
+ FROM ("
+ collector = super(o, collector)
+ collector << ") raw_sql_
)
- WHERE #{visit offset}
- eosql
+ WHERE "
+ return visit offset, collector
end
super
end
- def visit_Arel_Nodes_Limit o
+ def visit_Arel_Nodes_Limit o, collector
+ collector
end
- def visit_Arel_Nodes_Offset o
- "raw_rnum_ > #{visit o.expr}"
+ def visit_Arel_Nodes_Offset o, collector
+ collector << "raw_rnum_ > "
+ visit o.expr, collector
end
- def visit_Arel_Nodes_Except o
- "( #{visit o.left } MINUS #{visit o.right} )"
+ def visit_Arel_Nodes_Except o, collector
+ collector << "( "
+ collector = infix_value o, collector, " MINUS "
+ collector << " )"
end
def visit_Arel_Nodes_UpdateStatement o
@@ -91,7 +100,7 @@ module Arel
#
# orders = o.orders.map { |x| visit x }.join(', ').split(',')
orders = o.orders.map do |x|
- string = visit x
+ string = visit(x, Arel::Collectors::SQLString.new).value
if string.include?(',')
split_order_string(string)
else
diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb
index 49f7482e7d..60878ddd20 100644
--- a/lib/arel/visitors/postgresql.rb
+++ b/lib/arel/visitors/postgresql.rb
@@ -3,24 +3,25 @@ module Arel
class PostgreSQL < Arel::Visitors::ToSql
private
- def visit_Arel_Nodes_Matches o
- "#{visit o.left} ILIKE #{visit o.right}"
+ def visit_Arel_Nodes_Matches o, collector
+ infix_value o, collector, ' ILIKE '
end
- def visit_Arel_Nodes_DoesNotMatch o
- "#{visit o.left} NOT ILIKE #{visit o.right}"
+ def visit_Arel_Nodes_DoesNotMatch o, collector
+ infix_value o, collector, ' NOT ILIKE '
end
- def visit_Arel_Nodes_Regexp o
- "#{visit o.left} ~ #{visit o.right}"
+ def visit_Arel_Nodes_Regexp o, collector
+ infix_value o, collector, ' ~ '
end
- def visit_Arel_Nodes_NotRegexp o
- "#{visit o.left} !~ #{visit o.right}"
+ def visit_Arel_Nodes_NotRegexp o, collector
+ infix_value o, collector, ' !~ '
end
- def visit_Arel_Nodes_DistinctOn o
- "DISTINCT ON ( #{visit o.expr} )"
+ def visit_Arel_Nodes_DistinctOn o, collector
+ collector << "DISTINCT ON ( "
+ visit(o.expr, collector) << " )"
end
end
end
diff --git a/lib/arel/visitors/reduce.rb b/lib/arel/visitors/reduce.rb
new file mode 100644
index 0000000000..9670cad27c
--- /dev/null
+++ b/lib/arel/visitors/reduce.rb
@@ -0,0 +1,25 @@
+require 'arel/visitors/visitor'
+
+module Arel
+ module Visitors
+ class Reduce < Arel::Visitors::Visitor
+ def accept object, collector
+ visit object, collector
+ end
+
+ private
+
+ def visit object, collector
+ send dispatch[object.class], object, collector
+ rescue NoMethodError => e
+ raise e if respond_to?(dispatch[object.class], true)
+ superklass = object.class.ancestors.find { |klass|
+ respond_to?(dispatch[klass], true)
+ }
+ raise(TypeError, "Cannot visit #{object.class}") unless superklass
+ dispatch[object.class] = dispatch[superklass]
+ retry
+ end
+ end
+ end
+end
diff --git a/lib/arel/visitors/sqlite.rb b/lib/arel/visitors/sqlite.rb
index 2a509e95b5..ff6fc1fea4 100644
--- a/lib/arel/visitors/sqlite.rb
+++ b/lib/arel/visitors/sqlite.rb
@@ -4,10 +4,11 @@ module Arel
private
# Locks are not supported in SQLite
- def visit_Arel_Nodes_Lock o
+ def visit_Arel_Nodes_Lock o, collector
+ collector
end
- def visit_Arel_Nodes_SelectStatement o
+ def visit_Arel_Nodes_SelectStatement o, collector
o.limit = Arel::Nodes::Limit.new(-1) if o.offset && !o.limit
super
end
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 84034829a5..8e254d504b 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -1,9 +1,10 @@
require 'bigdecimal'
require 'date'
+require 'arel/visitors/reduce'
module Arel
module Visitors
- class ToSql < Arel::Visitors::Visitor
+ class ToSql < Arel::Visitors::Reduce
##
# This is some roflscale crazy stuff. I'm roflscaling this because
# building SQL queries is a hotspot. I will explain the roflscale so that
@@ -66,11 +67,15 @@ module Arel
private
- def visit_Arel_Nodes_DeleteStatement o
- [
- "DELETE FROM #{visit o.relation}",
- ("WHERE #{o.wheres.map { |x| visit x }.join AND}" unless o.wheres.empty?)
- ].compact.join ' '
+ def visit_Arel_Nodes_DeleteStatement o, collector
+ collector << "DELETE FROM "
+ collector = visit o.relation, collector
+ if o.wheres.any?
+ collector << " WHERE "
+ inject_join o.wheres, collector, AND
+ else
+ collector
+ end
end
# FIXME: we should probably have a 2-pass visitor for this
@@ -85,18 +90,29 @@ module Arel
stmt
end
- def visit_Arel_Nodes_UpdateStatement o
+ def visit_Arel_Nodes_UpdateStatement o, collector
if o.orders.empty? && o.limit.nil?
wheres = o.wheres
else
wheres = [Nodes::In.new(o.key, [build_subselect(o.key, o)])]
end
- [
- "UPDATE #{visit o.relation}",
- ("SET #{o.values.map { |value| visit value }.join ', '}" unless o.values.empty?),
- ("WHERE #{wheres.map { |x| visit x }.join ' AND '}" unless wheres.empty?),
- ].compact.join ' '
+ collector << "UPDATE "
+ collector = visit o.relation, collector
+ values = false
+ unless o.values.empty?
+ values = true
+ collector << " SET "
+ collector = inject_join o.values, collector, ", "
+ end
+
+ unless wheres.empty?
+ collector << " " if values
+ collector << "WHERE "
+ collector = inject_join wheres, collector, " AND "
+ end
+
+ collector
end
def visit_Arel_Nodes_InsertStatement o
@@ -111,25 +127,31 @@ module Arel
].compact.join ' '
end
- def visit_Arel_Nodes_Exists o
- "EXISTS (#{visit o.expressions})#{
- o.alias ? " AS #{visit o.alias}" : ''}"
+ def visit_Arel_Nodes_Exists o, collector
+ collector << "EXISTS ("
+ collector = visit(o.expressions, collector) << ")"
+ if o.alias
+ collector << " AS "
+ visit o.alias, collector
+ else
+ collector
+ end
end
- def visit_Arel_Nodes_Casted o
- quoted o.val, o.attribute
+ def visit_Arel_Nodes_Casted o, collector
+ collector << quoted(o.val, o.attribute).to_s
end
- def visit_Arel_Nodes_Quoted o
- quoted o.expr, nil
+ def visit_Arel_Nodes_Quoted o, collector
+ collector << quoted(o.expr, nil).to_s
end
- def visit_Arel_Nodes_True o
- "TRUE"
+ def visit_Arel_Nodes_True o, collector
+ collector << "TRUE"
end
- def visit_Arel_Nodes_False o
- "FALSE"
+ def visit_Arel_Nodes_False o, collector
+ collector << "FALSE"
end
def table_exists? name
@@ -160,92 +182,104 @@ module Arel
}.join ', '})"
end
- def visit_Arel_Nodes_SelectStatement o
- str = ''
-
+ def visit_Arel_Nodes_SelectStatement o, collector
if o.with
- str << visit(o.with)
- str << SPACE
+ collector = visit o.with, collector
+ collector << SPACE
end
- o.cores.each { |x| str << visit_Arel_Nodes_SelectCore(x) }
+ collector = o.cores.inject(collector) { |c,x|
+ visit_Arel_Nodes_SelectCore(x, c)
+ }
unless o.orders.empty?
- str << SPACE
- str << ORDER_BY
+ collector << SPACE
+ collector << ORDER_BY
len = o.orders.length - 1
o.orders.each_with_index { |x, i|
- str << visit(x)
- str << COMMA unless len == i
+ collector = visit(x, collector)
+ collector << COMMA unless len == i
}
end
- str << " #{visit(o.limit)}" if o.limit
- str << " #{visit(o.offset)}" if o.offset
- str << " #{visit(o.lock)}" if o.lock
+ collector = maybe_visit o.limit, collector
+ collector = maybe_visit o.offset, collector
+ collector = maybe_visit o.lock, collector
- str.strip!
- str
+ collector
end
- def visit_Arel_Nodes_SelectCore o
- str = "SELECT"
+ def visit_Arel_Nodes_SelectCore o, collector
+ collector << "SELECT"
- str << " #{visit(o.top)}" if o.top
- str << " #{visit(o.set_quantifier)}" if o.set_quantifier
+ if o.top
+ collector << " "
+ collector = visit o.top, collector
+ end
+
+ if o.set_quantifier
+ collector << " "
+ collector = visit o.set_quantifier, collector
+ end
unless o.projections.empty?
- str << SPACE
+ collector << SPACE
len = o.projections.length - 1
o.projections.each_with_index do |x, i|
- str << visit(x)
- str << COMMA unless len == i
+ collector = visit(x, collector)
+ collector << COMMA unless len == i
end
end
- str << " FROM #{visit(o.source)}" if o.source && !o.source.empty?
+ if o.source && !o.source.empty?
+ collector << " FROM "
+ collector = visit o.source, collector
+ end
unless o.wheres.empty?
- str << WHERE
+ collector << WHERE
len = o.wheres.length - 1
o.wheres.each_with_index do |x, i|
- str << visit(x)
- str << AND unless len == i
+ collector = visit(x, collector)
+ collector << AND unless len == i
end
end
unless o.groups.empty?
- str << GROUP_BY
+ collector << GROUP_BY
len = o.groups.length - 1
o.groups.each_with_index do |x, i|
- str << visit(x)
- str << COMMA unless len == i
+ collector = visit(x, collector)
+ collector << COMMA unless len == i
end
end
- str << " #{visit(o.having)}" if o.having
+ if o.having
+ collector << " "
+ collector = visit(o.having, collector)
+ end
unless o.windows.empty?
- str << WINDOW
+ collector << WINDOW
len = o.windows.length - 1
o.windows.each_with_index do |x, i|
- str << visit(x)
- str << COMMA unless len == i
+ collector = visit(x, collector)
+ collector << COMMA unless len == i
end
end
- str
+ collector
end
def visit_Arel_Nodes_Bin o
visit o.expr
end
- def visit_Arel_Nodes_Distinct o
- DISTINCT
+ def visit_Arel_Nodes_Distinct o, collector
+ collector << DISTINCT
end
- def visit_Arel_Nodes_DistinctOn o
+ def visit_Arel_Nodes_DistinctOn o, collector
raise NotImplementedError, 'DISTINCT ON not implemented for this db'
end
@@ -253,64 +287,91 @@ module Arel
"WITH #{o.children.map { |x| visit x }.join(', ')}"
end
- def visit_Arel_Nodes_WithRecursive o
- "WITH RECURSIVE #{o.children.map { |x| visit x }.join(', ')}"
+ def visit_Arel_Nodes_WithRecursive o, collector
+ collector << "WITH RECURSIVE "
+ inject_join o.children, collector, ', '
end
- def visit_Arel_Nodes_Union o
- "( #{visit o.left} UNION #{visit o.right} )"
+ def visit_Arel_Nodes_Union o, collector
+ collector << "( "
+ infix_value(o, collector, " UNION ") << " )"
end
- def visit_Arel_Nodes_UnionAll o
- "( #{visit o.left} UNION ALL #{visit o.right} )"
+ def visit_Arel_Nodes_UnionAll o, collector
+ collector << "( "
+ infix_value(o, collector, " UNION ALL ") << " )"
end
- def visit_Arel_Nodes_Intersect o
- "( #{visit o.left} INTERSECT #{visit o.right} )"
+ def visit_Arel_Nodes_Intersect o, collector
+ collector << "( "
+ infix_value(o, collector, " INTERSECT ") << " )"
end
- def visit_Arel_Nodes_Except o
- "( #{visit o.left} EXCEPT #{visit o.right} )"
+ def visit_Arel_Nodes_Except o, collector
+ collector << "( "
+ infix_value(o, collector, " EXCEPT ") << " )"
end
- def visit_Arel_Nodes_NamedWindow o
- "#{quote_column_name o.name} AS #{visit_Arel_Nodes_Window o}"
+ def visit_Arel_Nodes_NamedWindow o, collector
+ collector << quote_column_name(o.name)
+ collector << " AS "
+ visit_Arel_Nodes_Window o, collector
end
- def visit_Arel_Nodes_Window o
- s = [
- ("ORDER BY #{o.orders.map { |x| visit(x) }.join(', ')}" unless o.orders.empty?),
- (visit o.framing if o.framing)
- ].compact.join ' '
- "(#{s})"
+ def visit_Arel_Nodes_Window o, collector
+ collector << "("
+ if o.orders.any?
+ collector << "ORDER BY "
+ collector = inject_join o.orders, collector, ", "
+ end
+
+ if o.framing
+ collector = visit o.framing, collector
+ end
+
+ collector << ")"
end
- def visit_Arel_Nodes_Rows o
+ def visit_Arel_Nodes_Rows o, collector
if o.expr
- "ROWS #{visit o.expr}"
+ collector << "ROWS "
+ visit o.expr, collector
else
- "ROWS"
+ collector << "ROWS"
end
end
- def visit_Arel_Nodes_Range o
+ def visit_Arel_Nodes_Range o, collector
if o.expr
- "RANGE #{visit o.expr}"
+ collector << "RANGE "
+ visit o.expr, collector
else
- "RANGE"
+ collector << "RANGE"
end
end
- def visit_Arel_Nodes_Preceding o
- "#{o.expr ? visit(o.expr) : 'UNBOUNDED'} PRECEDING"
+ def visit_Arel_Nodes_Preceding o, collector
+ collector = if o.expr
+ visit o.expr, collector
+ else
+ collector << "UNBOUNDED"
+ end
+
+ collector << " PRECEDING"
end
- def visit_Arel_Nodes_Following o
- "#{o.expr ? visit(o.expr) : 'UNBOUNDED'} FOLLOWING"
+ def visit_Arel_Nodes_Following o, collector
+ collector = if o.expr
+ visit o.expr, collector
+ else
+ collector << "UNBOUNDED"
+ end
+
+ collector << " FOLLOWING"
end
- def visit_Arel_Nodes_CurrentRow o
- "CURRENT ROW"
+ def visit_Arel_Nodes_CurrentRow o, collector
+ collector << "CURRENT ROW"
end
def visit_Arel_Nodes_Over o
@@ -326,236 +387,287 @@ module Arel
end
end
- def visit_Arel_Nodes_Having o
- "HAVING #{visit o.expr}"
+ def visit_Arel_Nodes_Having o, collector
+ collector << "HAVING "
+ visit o.expr, collector
end
- def visit_Arel_Nodes_Offset o
- "OFFSET #{visit o.expr}"
+ def visit_Arel_Nodes_Offset o, collector
+ collector << "OFFSET "
+ visit o.expr, collector
end
- def visit_Arel_Nodes_Limit o
- "LIMIT #{visit o.expr}"
+ def visit_Arel_Nodes_Limit o, collector
+ collector << "LIMIT "
+ visit o.expr, collector
end
# FIXME: this does nothing on most databases, but does on MSSQL
- def visit_Arel_Nodes_Top o
- ""
+ def visit_Arel_Nodes_Top o, collector
+ collector
end
- def visit_Arel_Nodes_Lock o
- visit o.expr
+ def visit_Arel_Nodes_Lock o, collector
+ visit o.expr, collector
end
- def visit_Arel_Nodes_Grouping o
- "(#{visit o.expr})"
+ def visit_Arel_Nodes_Grouping o, collector
+ collector << "("
+ visit(o.expr, collector) << ")"
end
- def visit_Arel_SelectManager o
- "(#{o.to_sql.rstrip})"
+ def visit_Arel_SelectManager o, collector
+ collector << "(#{o.to_sql.rstrip})"
end
- def visit_Arel_Nodes_Ascending o
- "#{visit o.expr} ASC"
+ def visit_Arel_Nodes_Ascending o, collector
+ visit(o.expr, collector) << " ASC"
end
- def visit_Arel_Nodes_Descending o
- "#{visit o.expr} DESC"
+ def visit_Arel_Nodes_Descending o, collector
+ visit(o.expr, collector) << " DESC"
end
- def visit_Arel_Nodes_Group o
- visit o.expr
+ def visit_Arel_Nodes_Group o, collector
+ visit o.expr, collector
end
- def visit_Arel_Nodes_NamedFunction o
- "#{o.name}(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
- visit x
- }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+ def visit_Arel_Nodes_NamedFunction o, collector
+ collector << o.name
+ collector << "("
+ collector << "DISTINCT " if o.distinct
+ collector = inject_join(o.expressions, collector, ", ") << ")"
+ if o.alias
+ collector << " AS "
+ visit o.alias, collector
+ else
+ collector
+ end
end
def visit_Arel_Nodes_Extract o
"EXTRACT(#{o.field.to_s.upcase} FROM #{visit o.expr})#{o.alias ? " AS #{visit o.alias}" : ''}"
end
- def visit_Arel_Nodes_Count o
- "COUNT(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
- visit x
- }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+ def visit_Arel_Nodes_Count o, collector
+ aggregate "COUNT", o, collector
end
- def visit_Arel_Nodes_Sum o
- "SUM(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
- visit x}.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+ def visit_Arel_Nodes_Sum o, collector
+ aggregate "SUM", o, collector
end
- def visit_Arel_Nodes_Max o
- "MAX(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
- visit x}.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+ def visit_Arel_Nodes_Max o, collector
+ aggregate "MAX", o, collector
end
- def visit_Arel_Nodes_Min o
- "MIN(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
- visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+ def visit_Arel_Nodes_Min o, collector
+ aggregate "MIN", o, collector
end
- def visit_Arel_Nodes_Avg o
- "AVG(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
- visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+ def visit_Arel_Nodes_Avg o, collector
+ aggregate "AVG", o, collector
end
- def visit_Arel_Nodes_TableAlias o
- "#{visit o.relation} #{quote_table_name o.name}"
+ def visit_Arel_Nodes_TableAlias o, collector
+ collector = visit o.relation, collector
+ collector << " "
+ collector << quote_table_name(o.name)
end
- def visit_Arel_Nodes_Between o
- "#{visit o.left} BETWEEN #{visit o.right}"
+ def visit_Arel_Nodes_Between o, collector
+ collector = visit o.left, collector
+ collector << " BETWEEN "
+ visit o.right, collector
end
- def visit_Arel_Nodes_GreaterThanOrEqual o
- "#{visit o.left} >= #{visit o.right}"
+ def visit_Arel_Nodes_GreaterThanOrEqual o, collector
+ collector = visit o.left, collector
+ collector << " >= "
+ visit o.right, collector
end
- def visit_Arel_Nodes_GreaterThan o
- "#{visit o.left} > #{visit o.right}"
+ def visit_Arel_Nodes_GreaterThan o, collector
+ collector = visit o.left, collector
+ collector << " > "
+ visit o.right, collector
end
- def visit_Arel_Nodes_LessThanOrEqual o
- "#{visit o.left} <= #{visit o.right}"
+ def visit_Arel_Nodes_LessThanOrEqual o, collector
+ collector = visit o.left, collector
+ collector << " <= "
+ visit o.right, collector
end
- def visit_Arel_Nodes_LessThan o
- "#{visit o.left} < #{visit o.right}"
+ def visit_Arel_Nodes_LessThan o, collector
+ collector = visit o.left, collector
+ collector << " < "
+ visit o.right, collector
end
- def visit_Arel_Nodes_Matches o
- "#{visit o.left} LIKE #{visit o.right}"
+ def visit_Arel_Nodes_Matches o, collector
+ collector = visit o.left, collector
+ collector << " LIKE "
+ visit o.right, collector
end
- def visit_Arel_Nodes_DoesNotMatch o
- "#{visit o.left} NOT LIKE #{visit o.right}"
+ def visit_Arel_Nodes_DoesNotMatch o, collector
+ collector = visit o.left, collector
+ collector << " NOT LIKE "
+ visit o.right, collector
end
- def visit_Arel_Nodes_Regexp o
- raise NotImplementedError, '~ not implemented for this db'
+ def visit_Arel_Nodes_JoinSource o, collector
+ if o.left
+ collector = visit o.left, collector
+ end
+ if o.right.any?
+ collector << " " if o.left
+ collector = inject_join o.right, collector, ' '
+ end
+ collector
end
- def visit_Arel_Nodes_NotRegexp o
- raise NotImplementedError, '!~ not implemented for this db'
+ def visit_Arel_Nodes_Regexp o, collector
+ raise NotImplementedError, '~ not implemented for this db'
end
- def visit_Arel_Nodes_JoinSource o
- [
- (visit(o.left) if o.left),
- o.right.map { |j| visit j }.join(' ')
- ].compact.join ' '
+ def visit_Arel_Nodes_NotRegexp o, collector
+ raise NotImplementedError, '!~ not implemented for this db'
end
- def visit_Arel_Nodes_StringJoin o
- visit o.left
+ def visit_Arel_Nodes_StringJoin o, collector
+ visit o.left, collector
end
def visit_Arel_Nodes_FullOuterJoin o
"FULL OUTER JOIN #{visit o.left} #{visit o.right}"
end
- def visit_Arel_Nodes_OuterJoin o
- "LEFT OUTER JOIN #{visit o.left} #{visit o.right}"
+ def visit_Arel_Nodes_OuterJoin o, collector
+ collector << "LEFT OUTER JOIN "
+ collector = visit o.left, collector
+ collector << " "
+ visit o.right, collector
end
def visit_Arel_Nodes_RightOuterJoin o
"RIGHT OUTER JOIN #{visit o.left} #{visit o.right}"
end
- def visit_Arel_Nodes_InnerJoin o
- s = "INNER JOIN #{visit o.left}"
+ def visit_Arel_Nodes_InnerJoin o, collector
+ collector << "INNER JOIN "
+ collector = visit o.left, collector
if o.right
- s << SPACE
- s << visit(o.right)
+ collector << SPACE
+ visit(o.right, collector)
+ else
+ collector
end
- s
end
- def visit_Arel_Nodes_On o
- "ON #{visit o.expr}"
+ def visit_Arel_Nodes_On o, collector
+ collector << "ON "
+ visit o.expr, collector
end
- def visit_Arel_Nodes_Not o
- "NOT (#{visit o.expr})"
+ def visit_Arel_Nodes_Not o, collector
+ collector << "NOT ("
+ visit(o.expr, collector) << ")"
end
- def visit_Arel_Table o
+ def visit_Arel_Table o, collector
if o.table_alias
- "#{quote_table_name o.name} #{quote_table_name o.table_alias}"
+ collector << "#{quote_table_name o.name} #{quote_table_name o.table_alias}"
else
- quote_table_name o.name
+ collector << quote_table_name(o.name)
end
end
- def visit_Arel_Nodes_In o
+ def visit_Arel_Nodes_In o, collector
if Array === o.right && o.right.empty?
- '1=0'
+ collector << '1=0'
else
- "#{visit o.left} IN (#{visit o.right})"
+ collector = visit o.left, collector
+ collector << " IN ("
+ visit(o.right, collector) << ")"
end
end
- def visit_Arel_Nodes_NotIn o
+ def visit_Arel_Nodes_NotIn o, collector
if Array === o.right && o.right.empty?
- '1=1'
+ collector << '1=1'
else
- "#{visit o.left} NOT IN (#{visit o.right})"
+ collector = visit o.left, collector
+ collector << " NOT IN ("
+ collector = visit o.right, collector
+ collector << ")"
end
end
- def visit_Arel_Nodes_And o
- o.children.map { |x| visit x}.join ' AND '
+ def visit_Arel_Nodes_And o, collector
+ inject_join o.children, collector, " AND "
end
- def visit_Arel_Nodes_Or o
- "#{visit o.left} OR #{visit o.right}"
+ def visit_Arel_Nodes_Or o, collector
+ collector = visit o.left, collector
+ collector << " OR "
+ visit o.right, collector
end
- def visit_Arel_Nodes_Assignment o
+ def visit_Arel_Nodes_Assignment o, collector
case o.right
when Arel::Nodes::UnqualifiedColumn, Arel::Attributes::Attribute
- "#{visit o.left} = #{visit o.right}"
+ collector = visit o.left, collector
+ collector << " = "
+ visit o.right, collector
else
- right = quote(o.right, column_for(o.left))
- "#{visit o.left} = #{right}"
+ collector = visit o.left, collector
+ collector << " = "
+ collector << quote(o.right, column_for(o.left)).to_s
end
end
- def visit_Arel_Nodes_Equality o
+ def visit_Arel_Nodes_Equality o, collector
right = o.right
+ collector = visit o.left, collector
+
if right.nil?
- "#{visit o.left} IS NULL"
+ collector << " IS NULL"
else
- "#{visit o.left} = #{visit right}"
+ collector << " = "
+ visit right, collector
end
end
- def visit_Arel_Nodes_NotEqual o
+ def visit_Arel_Nodes_NotEqual o, collector
right = o.right
+ collector = visit o.left, collector
+
if right.nil?
- "#{visit o.left} IS NOT NULL"
+ collector << " IS NOT NULL"
else
- "#{visit o.left} != #{visit right}"
+ collector << " != "
+ visit right, collector
end
end
- def visit_Arel_Nodes_As o
- "#{visit o.left} AS #{visit o.right}"
+ def visit_Arel_Nodes_As o, collector
+ collector = visit o.left, collector
+ collector << " AS "
+ visit o.right, collector
end
- def visit_Arel_Nodes_UnqualifiedColumn o
- "#{quote_column_name o.name}"
+ def visit_Arel_Nodes_UnqualifiedColumn o, collector
+ collector << "#{quote_column_name o.name}"
+ collector
end
- def visit_Arel_Attributes_Attribute o
+ def visit_Arel_Attributes_Attribute o, collector
join_name = o.relation.table_alias || o.relation.name
- "#{quote_table_name join_name}.#{quote_column_name o.name}"
+ collector << "#{quote_table_name join_name}.#{quote_column_name o.name}"
end
alias :visit_Arel_Attributes_Integer :visit_Arel_Attributes_Attribute
alias :visit_Arel_Attributes_Float :visit_Arel_Attributes_Attribute
@@ -564,7 +676,7 @@ module Arel
alias :visit_Arel_Attributes_Time :visit_Arel_Attributes_Attribute
alias :visit_Arel_Attributes_Boolean :visit_Arel_Attributes_Attribute
- def literal o; o end
+ def literal o, collector; collector << o.to_s; end
alias :visit_Arel_Nodes_BindParam :literal
alias :visit_Arel_Nodes_SqlLiteral :literal
@@ -594,8 +706,10 @@ module Arel
alias :visit_Time :unsupported
alias :visit_TrueClass :unsupported
- def visit_Arel_Nodes_InfixOperation o
- "#{visit o.left} #{o.operator} #{visit o.right}"
+ def visit_Arel_Nodes_InfixOperation o, collector
+ collector = visit o.left, collector
+ collector << " #{o.operator} "
+ visit o.right, collector
end
alias :visit_Arel_Nodes_Addition :visit_Arel_Nodes_InfixOperation
@@ -603,8 +717,8 @@ module Arel
alias :visit_Arel_Nodes_Multiplication :visit_Arel_Nodes_InfixOperation
alias :visit_Arel_Nodes_Division :visit_Arel_Nodes_InfixOperation
- def visit_Array o
- o.map { |x| visit x }.join(', ')
+ def visit_Array o, collector
+ inject_join o, collector, ", "
end
def quote value, column = nil
@@ -620,6 +734,43 @@ module Arel
def quote_column_name name
@quoted_columns[name] ||= Arel::Nodes::SqlLiteral === name ? name : @connection.quote_column_name(name)
end
+
+ def maybe_visit thing, collector
+ return collector unless thing
+ collector << " "
+ visit thing, collector
+ end
+
+ def inject_join list, collector, join_str
+ len = list.length - 1
+ list.each_with_index.inject(collector) { |c, (x,i)|
+ if i == len
+ visit x, c
+ else
+ visit(x, c) << join_str
+ end
+ }
+ end
+
+ def infix_value o, collector, value
+ collector = visit o.left, collector
+ collector << value
+ visit o.right, collector
+ end
+
+ def aggregate name, o, collector
+ collector << "#{name}("
+ if o.distinct
+ collector << "DISTINCT "
+ end
+ collector = inject_join(o.expressions, collector, ", ") << ")"
+ if o.alias
+ collector << " AS "
+ visit o.alias, collector
+ else
+ collector
+ end
+ end
end
end
end
diff --git a/lib/arel/visitors/where_sql.rb b/lib/arel/visitors/where_sql.rb
index acd84cd631..27dde73673 100644
--- a/lib/arel/visitors/where_sql.rb
+++ b/lib/arel/visitors/where_sql.rb
@@ -1,8 +1,9 @@
module Arel
module Visitors
class WhereSql < Arel::Visitors::ToSql
- def visit_Arel_Nodes_SelectCore o
- "WHERE #{o.wheres.map { |x| visit x}.join ' AND ' }"
+ def visit_Arel_Nodes_SelectCore o, collector
+ collector << "WHERE "
+ inject_join o.wheres, collector, ' AND '
end
end
end
diff --git a/test/helper.rb b/test/helper.rb
index 1292c09a08..6e8ac836fc 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -11,3 +11,12 @@ class Object
gsub(/\s+/, ' ').strip.must_equal other.gsub(/\s+/, ' ').strip
end
end
+
+module Arel
+ class Test < MiniTest::Test
+ def assert_like expected, actual
+ assert_equal expected.gsub(/\s+/, ' ').strip,
+ actual.gsub(/\s+/, ' ').strip
+ end
+ end
+end
diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb
index 6c7098b3d9..837486fb46 100644
--- a/test/test_select_manager.rb
+++ b/test/test_select_manager.rb
@@ -369,8 +369,9 @@ module Arel
table = Table.new :users
mgr = table.from table
ast = mgr.ast
- mgr.visitor.accept(ast).must_equal mgr.to_sql
+ assert ast
end
+
it 'should allow orders to work when the ast is grepped' do
table = Table.new :users
mgr = table.from table
diff --git a/test/visitors/test_bind_visitor.rb b/test/visitors/test_bind_visitor.rb
index 2bfd03c861..4563fddfd1 100644
--- a/test/visitors/test_bind_visitor.rb
+++ b/test/visitors/test_bind_visitor.rb
@@ -4,8 +4,14 @@ require 'support/fake_record'
module Arel
module Visitors
- class TestBindVisitor < Minitest::Test
-
+ class TestBindVisitor < Arel::Test
+ attr_reader :collector
+
+ def setup
+ @collector = Collectors::SQLString.new
+ super
+ end
+
##
# Tests visit_Arel_Nodes_Assignment correctly
# substitutes binds with values from block
@@ -19,8 +25,12 @@ module Arel
}.new Table.engine.connection
assignment = um.ast.values[0]
- actual = visitor.accept(assignment) { "replace" }
- actual.must_be_like "\"name\" = replace"
+ actual = visitor.accept(assignment, collector) { |collector|
+ collector << "replace"
+ }
+ assert actual
+ value = actual.value
+ assert_like "\"name\" = replace", value
end
def test_visitor_yields_on_binds
@@ -33,7 +43,7 @@ module Arel
bp = Nodes::BindParam.new 'omg'
called = false
- visitor.accept(bp) { called = true }
+ visitor.accept(bp, collector) { |collector| called = true }
assert called
end
@@ -49,7 +59,7 @@ module Arel
called = false
assert_raises(TypeError) {
- visitor.accept(bp) { called = true }
+ visitor.accept(bp, collector) { called = true }
}
refute called
end
diff --git a/test/visitors/test_mysql.rb b/test/visitors/test_mysql.rb
index 6b62ec133a..8e4b9e6861 100644
--- a/test/visitors/test_mysql.rb
+++ b/test/visitors/test_mysql.rb
@@ -7,14 +7,18 @@ module Arel
@visitor = MySQL.new Table.engine.connection
end
+ def compile node
+ @visitor.accept(node, Collectors::SQLString.new).value
+ end
+
it 'squashes parenthesis on multiple unions' do
subnode = Nodes::Union.new Arel.sql('left'), Arel.sql('right')
node = Nodes::Union.new subnode, Arel.sql('topright')
- assert_equal 1, @visitor.accept(node).scan('(').length
+ assert_equal 1, compile(node).scan('(').length
subnode = Nodes::Union.new Arel.sql('left'), Arel.sql('right')
node = Nodes::Union.new Arel.sql('topleft'), subnode
- assert_equal 1, @visitor.accept(node).scan('(').length
+ assert_equal 1, compile(node).scan('(').length
end
###
@@ -23,7 +27,7 @@ module Arel
it 'defaults limit to 18446744073709551615' do
stmt = Nodes::SelectStatement.new
stmt.offset = Nodes::Offset.new(1)
- sql = @visitor.accept(stmt)
+ sql = compile(stmt)
sql.must_be_like "SELECT FROM DUAL LIMIT 18446744073709551615 OFFSET 1"
end
@@ -31,24 +35,24 @@ module Arel
sc = Arel::Nodes::UpdateStatement.new
sc.relation = Table.new(:users)
sc.limit = Nodes::Limit.new(Nodes.build_quoted("omg"))
- assert_equal("UPDATE \"users\" LIMIT 'omg'", @visitor.accept(sc))
+ assert_equal("UPDATE \"users\" LIMIT 'omg'", compile(sc))
end
it 'uses DUAL for empty from' do
stmt = Nodes::SelectStatement.new
- sql = @visitor.accept(stmt)
+ sql = compile(stmt)
sql.must_be_like "SELECT FROM DUAL"
end
describe 'locking' do
it 'defaults to FOR UPDATE when locking' do
node = Nodes::Lock.new(Arel.sql('FOR UPDATE'))
- @visitor.accept(node).must_be_like "FOR UPDATE"
+ compile(node).must_be_like "FOR UPDATE"
end
it 'allows a custom string to be used as a lock' do
node = Nodes::Lock.new(Arel.sql('LOCK IN SHARE MODE'))
- @visitor.accept(node).must_be_like "LOCK IN SHARE MODE"
+ compile(node).must_be_like "LOCK IN SHARE MODE"
end
end
end
diff --git a/test/visitors/test_oracle.rb b/test/visitors/test_oracle.rb
index bd22822bca..bb0fe404e8 100644
--- a/test/visitors/test_oracle.rb
+++ b/test/visitors/test_oracle.rb
@@ -7,13 +7,17 @@ module Arel
@visitor = Oracle.new Table.engine.connection_pool
end
+ def compile node
+ @visitor.accept(node, Collectors::SQLString.new).value
+ end
+
it 'modifies order when there is distinct and first value' do
# *sigh*
select = "DISTINCT foo.id, FIRST_VALUE(projects.name) OVER (foo) AS alias_0__"
stmt = Nodes::SelectStatement.new
stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
stmt.orders << Nodes::SqlLiteral.new('foo')
- sql = @visitor.accept(stmt)
+ sql = compile(stmt)
sql.must_be_like %{
SELECT #{select} ORDER BY alias_0__
}
@@ -26,8 +30,8 @@ module Arel
stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
stmt.orders << Nodes::SqlLiteral.new('foo')
- sql = @visitor.accept(stmt)
- sql2 = @visitor.accept(stmt)
+ sql = compile(stmt)
+ sql2 = compile(stmt)
sql.must_equal sql2
end
@@ -37,7 +41,7 @@ module Arel
stmt = Nodes::SelectStatement.new
stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
stmt.orders << Nodes::SqlLiteral.new('foo, bar')
- sql = @visitor.accept(stmt)
+ sql = compile(stmt)
sql.must_be_like %{
SELECT #{select} ORDER BY alias_0__, alias_1__
}
@@ -49,7 +53,7 @@ module Arel
stmt = Nodes::SelectStatement.new
stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
stmt.orders << Nodes::SqlLiteral.new('NVL(LOWER(bar, foo), foo) DESC, UPPER(baz)')
- sql = @visitor.accept(stmt)
+ sql = compile(stmt)
sql.must_be_like %{
SELECT #{select} ORDER BY alias_0__ DESC, alias_1__
}
@@ -60,7 +64,7 @@ module Arel
it 'adds a rownum clause' do
stmt = Nodes::SelectStatement.new
stmt.limit = Nodes::Limit.new(10)
- sql = @visitor.accept stmt
+ sql = compile stmt
sql.must_be_like %{ SELECT WHERE ROWNUM <= 10 }
end
@@ -68,8 +72,8 @@ module Arel
stmt = Nodes::SelectStatement.new
stmt.orders << Nodes::SqlLiteral.new('foo')
stmt.limit = Nodes::Limit.new(10)
- sql = @visitor.accept stmt
- sql2 = @visitor.accept stmt
+ sql = compile stmt
+ sql2 = compile stmt
sql.must_equal sql2
end
@@ -77,9 +81,9 @@ module Arel
stmt = Nodes::SelectStatement.new
stmt.orders << Nodes::SqlLiteral.new('foo')
stmt.limit = Nodes::Limit.new(10)
- sql = @visitor.accept stmt
+ sql = compile stmt
sql.must_be_like %{
- SELECT * FROM (SELECT ORDER BY foo) WHERE ROWNUM <= 10
+ SELECT * FROM (SELECT ORDER BY foo ) WHERE ROWNUM <= 10
}
end
@@ -88,9 +92,9 @@ module Arel
stmt.cores.first.set_quantifier = Arel::Nodes::Distinct.new
stmt.cores.first.projections << Nodes::SqlLiteral.new('id')
stmt.limit = Arel::Nodes::Limit.new(10)
- sql = @visitor.accept stmt
+ sql = compile stmt
sql.must_be_like %{
- SELECT * FROM (SELECT DISTINCT id) WHERE ROWNUM <= 10
+ SELECT * FROM (SELECT DISTINCT id ) WHERE ROWNUM <= 10
}
end
@@ -98,11 +102,11 @@ module Arel
stmt = Nodes::SelectStatement.new
stmt.limit = Nodes::Limit.new(10)
stmt.offset = Nodes::Offset.new(10)
- sql = @visitor.accept stmt
+ sql = compile stmt
sql.must_be_like %{
SELECT * FROM (
SELECT raw_sql_.*, rownum raw_rnum_
- FROM (SELECT) raw_sql_
+ FROM (SELECT ) raw_sql_
WHERE rownum <= 20
)
WHERE raw_rnum_ > 10
@@ -113,8 +117,8 @@ module Arel
stmt = Nodes::SelectStatement.new
stmt.limit = Nodes::Limit.new(10)
stmt.offset = Nodes::Offset.new(10)
- sql = @visitor.accept stmt
- sql2 = @visitor.accept stmt
+ sql = compile stmt
+ sql2 = compile stmt
sql.must_equal sql2
end
end
@@ -123,7 +127,7 @@ module Arel
it 'creates a select from subquery with rownum condition' do
stmt = Nodes::SelectStatement.new
stmt.offset = Nodes::Offset.new(10)
- sql = @visitor.accept stmt
+ sql = compile stmt
sql.must_be_like %{
SELECT * FROM (
SELECT raw_sql_.*, rownum raw_rnum_
@@ -139,7 +143,7 @@ module Arel
it 'modified except to be minus' do
left = Nodes::SqlLiteral.new("SELECT * FROM users WHERE age > 10")
right = Nodes::SqlLiteral.new("SELECT * FROM users WHERE age > 20")
- sql = @visitor.accept Nodes::Except.new(left, right)
+ sql = compile Nodes::Except.new(left, right)
sql.must_be_like %{
( SELECT * FROM users WHERE age > 10 MINUS SELECT * FROM users WHERE age > 20 )
}
@@ -148,7 +152,7 @@ module Arel
describe 'locking' do
it 'defaults to FOR UPDATE when locking' do
node = Nodes::Lock.new(Arel.sql('FOR UPDATE'))
- @visitor.accept(node).must_be_like "FOR UPDATE"
+ compile(node).must_be_like "FOR UPDATE"
end
end
end
diff --git a/test/visitors/test_postgres.rb b/test/visitors/test_postgres.rb
index 995e9bf515..3d646a7324 100644
--- a/test/visitors/test_postgres.rb
+++ b/test/visitors/test_postgres.rb
@@ -9,16 +9,20 @@ module Arel
@attr = @table[:id]
end
+ def compile node
+ @visitor.accept(node, Collectors::SQLString.new).value
+ end
+
describe 'locking' do
it 'defaults to FOR UPDATE' do
- @visitor.accept(Nodes::Lock.new(Arel.sql('FOR UPDATE'))).must_be_like %{
+ compile(Nodes::Lock.new(Arel.sql('FOR UPDATE'))).must_be_like %{
FOR UPDATE
}
end
it 'allows a custom string to be used as a lock' do
node = Nodes::Lock.new(Arel.sql('FOR SHARE'))
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
FOR SHARE
}
end
@@ -29,7 +33,7 @@ module Arel
sc.limit = Nodes::Limit.new(Nodes.build_quoted("omg"))
sc.cores.first.projections << Arel.sql('DISTINCT ON')
sc.orders << Arel.sql("xyz")
- sql = @visitor.accept(sc)
+ sql = compile(sc)
assert_match(/LIMIT 'omg'/, sql)
assert_equal 1, sql.scan(/LIMIT/).length, 'should have one limit'
end
@@ -37,19 +41,19 @@ module Arel
it 'should support DISTINCT ON' do
core = Arel::Nodes::SelectCore.new
core.set_quantifier = Arel::Nodes::DistinctOn.new(Arel.sql('aaron'))
- assert_match 'DISTINCT ON ( aaron )', @visitor.accept(core)
+ assert_match 'DISTINCT ON ( aaron )', compile(core)
end
it 'should support DISTINCT' do
core = Arel::Nodes::SelectCore.new
core.set_quantifier = Arel::Nodes::Distinct.new
- assert_equal 'SELECT DISTINCT', @visitor.accept(core)
+ assert_equal 'SELECT DISTINCT', compile(core)
end
describe "Nodes::Matches" do
it "should know how to visit" do
node = @table[:name].matches('foo%')
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."name" ILIKE 'foo%'
}
end
@@ -57,7 +61,7 @@ module Arel
it 'can handle subqueries' do
subquery = @table.project(:id).where(@table[:name].matches('foo%'))
node = @attr.in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (SELECT id FROM "users" WHERE "users"."name" ILIKE 'foo%')
}
end
@@ -66,7 +70,7 @@ module Arel
describe "Nodes::DoesNotMatch" do
it "should know how to visit" do
node = @table[:name].does_not_match('foo%')
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."name" NOT ILIKE 'foo%'
}
end
@@ -74,7 +78,7 @@ module Arel
it 'can handle subqueries' do
subquery = @table.project(:id).where(@table[:name].does_not_match('foo%'))
node = @attr.in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (SELECT id FROM "users" WHERE "users"."name" NOT ILIKE 'foo%')
}
end
@@ -83,7 +87,7 @@ module Arel
describe "Nodes::Regexp" do
it "should know how to visit" do
node = Arel::Nodes::Regexp.new(@table[:name], Nodes.build_quoted('foo%'))
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."name" ~ 'foo%'
}
end
@@ -91,7 +95,7 @@ module Arel
it 'can handle subqueries' do
subquery = @table.project(:id).where(Arel::Nodes::Regexp.new(@table[:name], Nodes.build_quoted('foo%')))
node = @attr.in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (SELECT id FROM "users" WHERE "users"."name" ~ 'foo%')
}
end
@@ -100,7 +104,7 @@ module Arel
describe "Nodes::NotRegexp" do
it "should know how to visit" do
node = Arel::Nodes::NotRegexp.new(@table[:name], Nodes.build_quoted('foo%'))
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."name" !~ 'foo%'
}
end
@@ -108,7 +112,7 @@ module Arel
it 'can handle subqueries' do
subquery = @table.project(:id).where(Arel::Nodes::NotRegexp.new(@table[:name], Nodes.build_quoted('foo%')))
node = @attr.in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (SELECT id FROM "users" WHERE "users"."name" !~ 'foo%')
}
end
diff --git a/test/visitors/test_sqlite.rb b/test/visitors/test_sqlite.rb
index c06f554ea4..8fb8e76095 100644
--- a/test/visitors/test_sqlite.rb
+++ b/test/visitors/test_sqlite.rb
@@ -10,13 +10,13 @@ module Arel
it 'defaults limit to -1' do
stmt = Nodes::SelectStatement.new
stmt.offset = Nodes::Offset.new(1)
- sql = @visitor.accept(stmt)
+ sql = @visitor.accept(stmt, Collectors::SQLString.new).value
sql.must_be_like "SELECT LIMIT -1 OFFSET 1"
end
it 'does not support locking' do
node = Nodes::Lock.new(Arel.sql('FOR UPDATE'))
- @visitor.accept(node).must_be_nil
+ assert_equal '', @visitor.accept(node, Collectors::SQLString.new).value
end
end
end
diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb
index 644951d71c..eb102c1905 100644
--- a/test/visitors/test_to_sql.rb
+++ b/test/visitors/test_to_sql.rb
@@ -10,16 +10,20 @@ module Arel
@attr = @table[:id]
end
+ def compile node
+ @visitor.accept(node, Collectors::SQLString.new).value
+ end
+
it 'works with BindParams' do
node = Nodes::BindParam.new 'omg'
- sql = @visitor.accept node
+ sql = compile node
sql.must_be_like 'omg'
end
it 'can define a dispatch method' do
visited = false
- viz = Class.new(Arel::Visitors::Visitor) {
- define_method(:hello) do |node|
+ viz = Class.new(Arel::Visitors::Reduce) {
+ define_method(:hello) do |node, c|
visited = true
end
@@ -28,75 +32,75 @@ module Arel
end
}.new
- viz.accept(@table)
+ viz.accept(@table, Collectors::SQLString.new)
assert visited, 'hello method was called'
end
it 'should not quote sql literals' do
node = @table[Arel.star]
- sql = @visitor.accept node
+ sql = compile node
sql.must_be_like '"users".*'
end
it 'should visit named functions' do
function = Nodes::NamedFunction.new('omg', [Arel.star])
- assert_equal 'omg(*)', @visitor.accept(function)
+ assert_equal 'omg(*)', compile(function)
end
it 'should chain predications on named functions' do
function = Nodes::NamedFunction.new('omg', [Arel.star])
- sql = @visitor.accept(function.eq(2))
+ sql = compile(function.eq(2))
sql.must_be_like %{ omg(*) = 2 }
end
it 'should visit built-in functions' do
function = Nodes::Count.new([Arel.star])
- assert_equal 'COUNT(*)', @visitor.accept(function)
+ assert_equal 'COUNT(*)', compile(function)
function = Nodes::Sum.new([Arel.star])
- assert_equal 'SUM(*)', @visitor.accept(function)
+ assert_equal 'SUM(*)', compile(function)
function = Nodes::Max.new([Arel.star])
- assert_equal 'MAX(*)', @visitor.accept(function)
+ assert_equal 'MAX(*)', compile(function)
function = Nodes::Min.new([Arel.star])
- assert_equal 'MIN(*)', @visitor.accept(function)
+ assert_equal 'MIN(*)', compile(function)
function = Nodes::Avg.new([Arel.star])
- assert_equal 'AVG(*)', @visitor.accept(function)
+ assert_equal 'AVG(*)', compile(function)
end
it 'should visit built-in functions operating on distinct values' do
function = Nodes::Count.new([Arel.star])
function.distinct = true
- assert_equal 'COUNT(DISTINCT *)', @visitor.accept(function)
+ assert_equal 'COUNT(DISTINCT *)', compile(function)
function = Nodes::Sum.new([Arel.star])
function.distinct = true
- assert_equal 'SUM(DISTINCT *)', @visitor.accept(function)
+ assert_equal 'SUM(DISTINCT *)', compile(function)
function = Nodes::Max.new([Arel.star])
function.distinct = true
- assert_equal 'MAX(DISTINCT *)', @visitor.accept(function)
+ assert_equal 'MAX(DISTINCT *)', compile(function)
function = Nodes::Min.new([Arel.star])
function.distinct = true
- assert_equal 'MIN(DISTINCT *)', @visitor.accept(function)
+ assert_equal 'MIN(DISTINCT *)', compile(function)
function = Nodes::Avg.new([Arel.star])
function.distinct = true
- assert_equal 'AVG(DISTINCT *)', @visitor.accept(function)
+ assert_equal 'AVG(DISTINCT *)', compile(function)
end
it 'works with lists' do
function = Nodes::NamedFunction.new('omg', [Arel.star, Arel.star])
- assert_equal 'omg(*, *)', @visitor.accept(function)
+ assert_equal 'omg(*, *)', compile(function)
end
describe 'Nodes::Equality' do
it "should escape strings" do
test = Table.new(:users)[:name].eq 'Aaron Patterson'
- @visitor.accept(test).must_be_like %{
+ compile(test).must_be_like %{
"users"."name" = 'Aaron Patterson'
}
end
@@ -104,19 +108,19 @@ module Arel
it 'should handle false' do
table = Table.new(:users)
val = Nodes.build_quoted(false, table[:active])
- sql = @visitor.accept Nodes::Equality.new(val, val)
+ sql = compile Nodes::Equality.new(val, val)
sql.must_be_like %{ 'f' = 'f' }
end
it 'should use the column to quote' do
table = Table.new(:users)
val = Nodes.build_quoted('1-fooo', table[:id])
- sql = @visitor.accept Nodes::Equality.new(table[:id], val)
+ sql = compile Nodes::Equality.new(table[:id], val)
sql.must_be_like %{ "users"."id" = 1 }
end
it 'should handle nil' do
- sql = @visitor.accept Nodes::Equality.new(@table[:name], nil)
+ sql = compile Nodes::Equality.new(@table[:name], nil)
sql.must_be_like %{ "users"."name" IS NULL }
end
end
@@ -124,13 +128,13 @@ module Arel
describe 'Nodes::NotEqual' do
it 'should handle false' do
val = Nodes.build_quoted(false, @table[:active])
- sql = @visitor.accept Nodes::NotEqual.new(@table[:active], val)
+ sql = compile Nodes::NotEqual.new(@table[:active], val)
sql.must_be_like %{ "users"."active" != 'f' }
end
it 'should handle nil' do
val = Nodes.build_quoted(nil, @table[:active])
- sql = @visitor.accept Nodes::NotEqual.new(@table[:name], val)
+ sql = compile Nodes::NotEqual.new(@table[:name], val)
sql.must_be_like %{ "users"."name" IS NOT NULL }
end
end
@@ -141,19 +145,19 @@ module Arel
Class.new(Class.new(String)).new(":'("),
].each do |obj|
val = Nodes.build_quoted(obj, @table[:active])
- sql = @visitor.accept Nodes::NotEqual.new(@table[:name], val)
+ sql = compile Nodes::NotEqual.new(@table[:name], val)
sql.must_be_like %{ "users"."name" != ':\\'(' }
end
end
it "should visit_Class" do
- @visitor.accept(Nodes.build_quoted(DateTime)).must_equal "'DateTime'"
+ compile(Nodes.build_quoted(DateTime)).must_equal "'DateTime'"
end
it "should escape LIMIT" do
sc = Arel::Nodes::SelectStatement.new
sc.limit = Arel::Nodes::Limit.new(Nodes.build_quoted("omg"))
- assert_match(/LIMIT 'omg'/, @visitor.accept(sc))
+ assert_match(/LIMIT 'omg'/, compile(sc))
end
it "should visit_DateTime" do
@@ -168,7 +172,7 @@ module Arel
dt = DateTime.now
table = Table.new(:users)
test = table[:created_at].eq dt
- sql = @visitor.accept test
+ sql = compile test
assert_equal "created_at", called_with.name
sql.must_be_like %{"users"."created_at" = '#{dt.strftime("%Y-%m-%d %H:%M:%S")}'}
@@ -176,37 +180,37 @@ module Arel
it "should visit_Float" do
test = Table.new(:users)[:name].eq 2.14
- sql = @visitor.accept test
+ sql = compile test
sql.must_be_like %{"users"."name" = 2.14}
end
it "should visit_Not" do
- sql = @visitor.accept Nodes::Not.new(Arel.sql("foo"))
+ sql = compile Nodes::Not.new(Arel.sql("foo"))
sql.must_be_like "NOT (foo)"
end
it "should apply Not to the whole expression" do
node = Nodes::And.new [@attr.eq(10), @attr.eq(11)]
- sql = @visitor.accept Nodes::Not.new(node)
+ sql = compile Nodes::Not.new(node)
sql.must_be_like %{NOT ("users"."id" = 10 AND "users"."id" = 11)}
end
it "should visit_As" do
as = Nodes::As.new(Arel.sql("foo"), Arel.sql("bar"))
- sql = @visitor.accept as
+ sql = compile as
sql.must_be_like "foo AS bar"
end
it "should visit_Bignum" do
- @visitor.accept 8787878092
+ compile 8787878092
end
it "should visit_Hash" do
- @visitor.accept(Nodes.build_quoted({:a => 1}))
+ compile(Nodes.build_quoted({:a => 1}))
end
it "should visit_BigDecimal" do
- @visitor.accept Nodes.build_quoted(BigDecimal.new('2.14'))
+ compile Nodes.build_quoted(BigDecimal.new('2.14'))
end
it "should visit_Date" do
@@ -221,31 +225,31 @@ module Arel
dt = Date.today
table = Table.new(:users)
test = table[:created_at].eq dt
- sql = @visitor.accept test
+ sql = compile test
assert_equal "created_at", called_with.name
sql.must_be_like %{"users"."created_at" = '#{dt.strftime("%Y-%m-%d")}'}
end
it "should visit_NilClass" do
- @visitor.accept(Nodes.build_quoted(nil)).must_be_like "NULL"
+ compile(Nodes.build_quoted(nil)).must_be_like "NULL"
end
it "should visit_Arel_SelectManager, which is a subquery" do
mgr = Table.new(:foo).project(:bar)
- @visitor.accept(mgr).must_be_like '(SELECT bar FROM "foo")'
+ compile(mgr).must_be_like '(SELECT bar FROM "foo")'
end
it "should visit_Arel_Nodes_And" do
node = Nodes::And.new [@attr.eq(10), @attr.eq(11)]
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" = 10 AND "users"."id" = 11
}
end
it "should visit_Arel_Nodes_Or" do
node = Nodes::Or.new @attr.eq(10), @attr.eq(11)
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" = 10 OR "users"."id" = 11
}
end
@@ -256,25 +260,25 @@ module Arel
Nodes::UnqualifiedColumn.new(column),
Nodes::UnqualifiedColumn.new(column)
)
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"id" = "id"
}
end
it "should visit visit_Arel_Attributes_Time" do
attr = Attributes::Time.new(@attr.relation, @attr.name)
- @visitor.accept attr
+ compile attr
end
it "should visit_TrueClass" do
test = Table.new(:users)[:bool].eq(true)
- @visitor.accept(test).must_be_like %{ "users"."bool" = 't' }
+ compile(test).must_be_like %{ "users"."bool" = 't' }
end
describe "Nodes::Matches" do
it "should know how to visit" do
node = @table[:name].matches('foo%')
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."name" LIKE 'foo%'
}
end
@@ -282,7 +286,7 @@ module Arel
it 'can handle subqueries' do
subquery = @table.project(:id).where(@table[:name].matches('foo%'))
node = @attr.in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (SELECT id FROM "users" WHERE "users"."name" LIKE 'foo%')
}
end
@@ -291,7 +295,7 @@ module Arel
describe "Nodes::DoesNotMatch" do
it "should know how to visit" do
node = @table[:name].does_not_match('foo%')
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."name" NOT LIKE 'foo%'
}
end
@@ -299,7 +303,7 @@ module Arel
it 'can handle subqueries' do
subquery = @table.project(:id).where(@table[:name].does_not_match('foo%'))
node = @attr.in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (SELECT id FROM "users" WHERE "users"."name" NOT LIKE 'foo%')
}
end
@@ -308,7 +312,7 @@ module Arel
describe "Nodes::Ordering" do
it "should know how to visit" do
node = @attr.desc
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" DESC
}
end
@@ -317,52 +321,52 @@ module Arel
describe "Nodes::In" do
it "should know how to visit" do
node = @attr.in [1, 2, 3]
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (1, 2, 3)
}
end
it "should return 1=0 when empty right which is always false" do
node = @attr.in []
- @visitor.accept(node).must_equal '1=0'
+ compile(node).must_equal '1=0'
end
it 'can handle two dot ranges' do
node = @attr.in 1..3
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" BETWEEN 1 AND 3
}
end
it 'can handle three dot ranges' do
node = @attr.in 1...3
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" >= 1 AND "users"."id" < 3
}
end
it 'can handle ranges bounded by infinity' do
node = @attr.in 1..Float::INFINITY
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" >= 1
}
node = @attr.in(-Float::INFINITY..3)
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" <= 3
}
node = @attr.in(-Float::INFINITY...3)
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" < 3
}
node = @attr.in(-Float::INFINITY..Float::INFINITY)
- @visitor.accept(node).must_be_like %{1=1}
+ compile(node).must_be_like %{1=1}
end
it 'can handle subqueries' do
table = Table.new(:users)
subquery = table.project(:id).where(table[:name].eq('Aaron'))
node = @attr.in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" IN (SELECT id FROM "users" WHERE "users"."name" = 'Aaron')
}
end
@@ -383,29 +387,29 @@ module Arel
visitor.expected = Table.engine.connection.columns(:users).find { |x|
x.name == 'name'
}
- visitor.accept(in_node).must_equal %("users"."name" IN ('a', 'b', 'c'))
+ visitor.accept(in_node, Collectors::SQLString.new).value.must_equal %("users"."name" IN ('a', 'b', 'c'))
end
end
describe "Nodes::InfixOperation" do
it "should handle Multiplication" do
node = Arel::Attributes::Decimal.new(Table.new(:products), :price) * Arel::Attributes::Decimal.new(Table.new(:currency_rates), :rate)
- @visitor.accept(node).must_equal %("products"."price" * "currency_rates"."rate")
+ compile(node).must_equal %("products"."price" * "currency_rates"."rate")
end
it "should handle Division" do
node = Arel::Attributes::Decimal.new(Table.new(:products), :price) / 5
- @visitor.accept(node).must_equal %("products"."price" / 5)
+ compile(node).must_equal %("products"."price" / 5)
end
it "should handle Addition" do
node = Arel::Attributes::Decimal.new(Table.new(:products), :price) + 6
- @visitor.accept(node).must_equal %(("products"."price" + 6))
+ compile(node).must_equal %(("products"."price" + 6))
end
it "should handle Subtraction" do
node = Arel::Attributes::Decimal.new(Table.new(:products), :price) - 7
- @visitor.accept(node).must_equal %(("products"."price" - 7))
+ compile(node).must_equal %(("products"."price" - 7))
end
it "should handle arbitrary operators" do
@@ -414,59 +418,59 @@ module Arel
Arel::Attributes::String.new(Table.new(:products), :name),
Arel::Attributes::String.new(Table.new(:products), :name)
)
- @visitor.accept(node).must_equal %("products"."name" || "products"."name")
+ compile(node).must_equal %("products"."name" || "products"."name")
end
end
describe "Nodes::NotIn" do
it "should know how to visit" do
node = @attr.not_in [1, 2, 3]
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" NOT IN (1, 2, 3)
}
end
it "should return 1=1 when empty right which is always true" do
node = @attr.not_in []
- @visitor.accept(node).must_equal '1=1'
+ compile(node).must_equal '1=1'
end
it 'can handle two dot ranges' do
node = @attr.not_in 1..3
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" < 1 OR "users"."id" > 3
}
end
it 'can handle three dot ranges' do
node = @attr.not_in 1...3
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" < 1 OR "users"."id" >= 3
}
end
it 'can handle ranges bounded by infinity' do
node = @attr.not_in 1..Float::INFINITY
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" < 1
}
node = @attr.not_in(-Float::INFINITY..3)
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" > 3
}
node = @attr.not_in(-Float::INFINITY...3)
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" >= 3
}
node = @attr.not_in(-Float::INFINITY..Float::INFINITY)
- @visitor.accept(node).must_be_like %{1=0}
+ compile(node).must_be_like %{1=0}
end
it 'can handle subqueries' do
table = Table.new(:users)
subquery = table.project(:id).where(table[:name].eq('Aaron'))
node = @attr.not_in subquery
- @visitor.accept(node).must_be_like %{
+ compile(node).must_be_like %{
"users"."id" NOT IN (SELECT id FROM "users" WHERE "users"."name" = 'Aaron')
}
end
@@ -487,21 +491,21 @@ module Arel
visitor.expected = Table.engine.connection.columns(:users).find { |x|
x.name == 'name'
}
- visitor.accept(in_node).must_equal %("users"."name" NOT IN ('a', 'b', 'c'))
+ compile(in_node).must_equal %("users"."name" NOT IN ('a', 'b', 'c'))
end
end
describe 'Constants' do
it "should handle true" do
test = Table.new(:users).create_true
- @visitor.accept(test).must_be_like %{
+ compile(test).must_be_like %{
TRUE
}
end
it "should handle false" do
test = Table.new(:users).create_false
- @visitor.accept(test).must_be_like %{
+ compile(test).must_be_like %{
FALSE
}
end
@@ -510,7 +514,7 @@ module Arel
describe 'TableAlias' do
it "should use the underlying table for checking columns" do
test = Table.new(:users).alias('zomgusers')[:id].eq '3'
- @visitor.accept(test).must_be_like %{
+ compile(test).must_be_like %{
"zomgusers"."id" = 3
}
end
@@ -522,7 +526,7 @@ module Arel
core.set_quantifier = Arel::Nodes::DistinctOn.new(Arel.sql('aaron'))
assert_raises(NotImplementedError) do
- @visitor.accept(core)
+ compile(core)
end
end
end
@@ -532,7 +536,7 @@ module Arel
node = Arel::Nodes::Regexp.new(@table[:name], Nodes.build_quoted('foo%'))
assert_raises(NotImplementedError) do
- @visitor.accept(node)
+ compile(node)
end
end
end
@@ -542,7 +546,7 @@ module Arel
node = Arel::Nodes::NotRegexp.new(@table[:name], Nodes.build_quoted('foo%'))
assert_raises(NotImplementedError) do
- @visitor.accept(node)
+ compile(node)
end
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 03:54:07 +0000