Merge branch 'master' of github.com:rails/arel

* 'master' of github.com:rails/arel:
  Make as factory method convert alias name to SqlLiteral
  Replace MathOperation with InfixOperation to support more operators

8 files changed, 68 insertions, 33 deletions

diff --git a/lib/arel/math.rb b/lib/arel/math.rb
index b7c2419233..f3dbc7bc49 100644
--- a/lib/arel/math.rb
+++ b/lib/arel/math.rb
@@ -5,11 +5,11 @@ module Arel
     end
 
     def +(other)
-      Arel::Nodes::Addition.new(self, other)
+      Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new(self, other))
     end
 
     def -(other)
-      Arel::Nodes::Subtraction.new(self, other)
+      Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
     end
 
     def /(other)
diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb
index 4b97e28668..cf2aeb2ddc 100644
--- a/lib/arel/nodes.rb
+++ b/lib/arel/nodes.rb
@@ -18,7 +18,7 @@ require 'arel/nodes/join_source'
 require 'arel/nodes/ordering'
 require 'arel/nodes/delete_statement'
 require 'arel/nodes/table_alias'
-require 'arel/nodes/math_operation'
+require 'arel/nodes/infix_operation'
 
 # nary
 require 'arel/nodes/and'
diff --git a/lib/arel/nodes/infix_operation.rb b/lib/arel/nodes/infix_operation.rb
new file mode 100644
index 0000000000..6847650fe4
--- /dev/null
+++ b/lib/arel/nodes/infix_operation.rb
@@ -0,0 +1,42 @@
+module Arel
+  module Nodes
+
+    class InfixOperation < Binary
+      include Arel::Expressions
+      include Arel::Predications
+      include Arel::Math
+
+      attr_reader :operator
+
+      def initialize operator, left, right
+        super(left, right)
+        @operator = operator
+      end
+    end
+
+    class Multiplication < InfixOperation
+      def initialize left, right
+        super(:*, left, right)
+      end
+    end
+
+    class Division < InfixOperation
+      def initialize left, right
+        super(:/, left, right)
+      end
+    end
+
+    class Addition < InfixOperation
+      def initialize left, right
+        super(:+, left, right)
+      end
+    end
+
+    class Subtraction < InfixOperation
+      def initialize left, right
+        super(:-, left, right)
+      end
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/nodes/math_operation.rb b/lib/arel/nodes/math_operation.rb
deleted file mode 100644
index d9820f1ece..0000000000
--- a/lib/arel/nodes/math_operation.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Arel
-  module Nodes
-    class MathOperation < Binary
-      include Arel::Expressions
-      include Arel::Predications
-      include Arel::Math
-    end
-
-    class Multiplication < MathOperation; end
-    class Division < MathOperation; end
-    class Addition < MathOperation; end
-    class Subtraction < MathOperation; end
-
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/predications.rb b/lib/arel/predications.rb
index 920a9ee374..75c4c75855 100644
--- a/lib/arel/predications.rb
+++ b/lib/arel/predications.rb
@@ -1,7 +1,7 @@
 module Arel
   module Predications
     def as other
-      Nodes::As.new self, other
+      Nodes::As.new self, Nodes::SqlLiteral.new(other)
     end
 
     def not_eq other
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 6bf5a3bb6b..1c91d7f5e6 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -374,21 +374,14 @@ key on UpdateManager using UpdateManager#key=
       alias :visit_Time                          :quoted
       alias :visit_TrueClass                     :quoted
 
-      def visit_Arel_Nodes_Multiplication o
-        "#{visit o.left} * #{visit o.right}"
+      def visit_Arel_Nodes_InfixOperation o
+        "#{visit o.left} #{o.operator} #{visit o.right}"
       end
 
-      def visit_Arel_Nodes_Division o
-        "#{visit o.left} / #{visit o.right}"
-      end
-
-      def visit_Arel_Nodes_Addition o
-        "(#{visit o.left} + #{visit o.right})"
-      end
-
-      def visit_Arel_Nodes_Subtraction o
-        "(#{visit o.left} - #{visit o.right})"
-      end
+      alias :visit_Arel_Nodes_Addition       :visit_Arel_Nodes_InfixOperation
+      alias :visit_Arel_Nodes_Subtraction    :visit_Arel_Nodes_InfixOperation
+      alias :visit_Arel_Nodes_Multiplication :visit_Arel_Nodes_InfixOperation
+      alias :visit_Arel_Nodes_Division       :visit_Arel_Nodes_InfixOperation
 
       def visit_Array o
         o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
diff --git a/test/nodes/test_as.rb b/test/nodes/test_as.rb
index 8585fbc963..02cbe5f7b0 100644
--- a/test/nodes/test_as.rb
+++ b/test/nodes/test_as.rb
@@ -10,6 +10,12 @@ module Arel
           assert_equal attr, as.left
           assert_equal 'foo', as.right
         end
+
+        it 'converts right to SqlLiteral if a string' do
+          attr = Table.new(:users)[:id]
+          as = attr.as('foo')
+          assert_kind_of Arel::Nodes::SqlLiteral, as.right
+        end
       end
     end
   end
diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb
index c47fd57a28..25ff7be3e2 100644
--- a/test/visitors/test_to_sql.rb
+++ b/test/visitors/test_to_sql.rb
@@ -194,7 +194,7 @@ module Arel
         end
       end
 
-      describe "Nodes::MathOperation" do
+      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")
@@ -214,6 +214,15 @@ module Arel
           node = Arel::Attributes::Decimal.new(Table.new(:products), :price) - 7
           @visitor.accept(node).must_equal %(("products"."price" - 7))
         end
+
+        it "should handle arbitrary operators" do
+          node = Arel::Nodes::InfixOperation.new(
+            '||',
+            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")
+        end
       end
 
       describe "Nodes::NotIn" do