diff options
Diffstat (limited to 'lib/arel/visitors/mysql.rb')
-rw-r--r-- | lib/arel/visitors/mysql.rb | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb index ec9d91f8ce..3b911e826f 100644 --- a/lib/arel/visitors/mysql.rb +++ b/lib/arel/visitors/mysql.rb @@ -2,19 +2,19 @@ module Arel module Visitors class MySQL < Arel::Visitors::ToSql private - def visit_Arel_Nodes_Union o, a, suppress_parens = false + def visit_Arel_Nodes_Union o, suppress_parens = false left_result = case o.left when Arel::Nodes::Union - visit_Arel_Nodes_Union o.left, a, true + visit_Arel_Nodes_Union o.left, true else - visit o.left, a + visit o.left end right_result = case o.right when Arel::Nodes::Union - visit_Arel_Nodes_Union o.right, a, true + visit_Arel_Nodes_Union o.right, true else - visit o.right, a + visit o.right end if suppress_parens @@ -24,32 +24,32 @@ module Arel end end - def visit_Arel_Nodes_Bin o, a - "BINARY #{visit o.expr, a}" + def visit_Arel_Nodes_Bin o + "BINARY #{visit o.expr}" end ### # :'( # http://dev.mysql.com/doc/refman/5.0/en/select.html#id3482214 - def visit_Arel_Nodes_SelectStatement o, a + def visit_Arel_Nodes_SelectStatement o if o.offset && !o.limit o.limit = Arel::Nodes::Limit.new(Nodes.build_quoted(18446744073709551615)) end super end - def visit_Arel_Nodes_SelectCore o, a + def visit_Arel_Nodes_SelectCore o o.froms ||= Arel.sql('DUAL') super end - def visit_Arel_Nodes_UpdateStatement o, a + def visit_Arel_Nodes_UpdateStatement o [ - "UPDATE #{visit o.relation, a}", - ("SET #{o.values.map { |value| visit value, a }.join ', '}" unless o.values.empty?), - ("WHERE #{o.wheres.map { |x| visit x, a }.join ' AND '}" unless o.wheres.empty?), - ("ORDER BY #{o.orders.map { |x| visit x, a }.join(', ')}" unless o.orders.empty?), - (visit(o.limit, a) if o.limit), + "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 ' ' end |