diff options
Diffstat (limited to 'lib/arel')
-rw-r--r-- | lib/arel/attributes/attribute.rb | 1 | ||||
-rw-r--r-- | lib/arel/math.rb | 19 | ||||
-rw-r--r-- | lib/arel/nodes.rb | 1 | ||||
-rw-r--r-- | lib/arel/nodes/math_operation.rb | 15 | ||||
-rw-r--r-- | lib/arel/visitors/to_sql.rb | 16 |
5 files changed, 52 insertions, 0 deletions
diff --git a/lib/arel/attributes/attribute.rb b/lib/arel/attributes/attribute.rb index 9a42e5a4da..5aea87ac43 100644 --- a/lib/arel/attributes/attribute.rb +++ b/lib/arel/attributes/attribute.rb @@ -3,6 +3,7 @@ module Arel class Attribute < Struct.new :relation, :name include Arel::Expressions include Arel::Predications + include Arel::Math end class String < Attribute; end diff --git a/lib/arel/math.rb b/lib/arel/math.rb new file mode 100644 index 0000000000..b7c2419233 --- /dev/null +++ b/lib/arel/math.rb @@ -0,0 +1,19 @@ +module Arel + module Math + def *(other) + Arel::Nodes::Multiplication.new(self, other) + end + + def +(other) + Arel::Nodes::Addition.new(self, other) + end + + def -(other) + Arel::Nodes::Subtraction.new(self, other) + end + + def /(other) + Arel::Nodes::Division.new(self, other) + end + end +end diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index 442b313593..4b97e28668 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -18,6 +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' # nary require 'arel/nodes/and' diff --git a/lib/arel/nodes/math_operation.rb b/lib/arel/nodes/math_operation.rb new file mode 100644 index 0000000000..d9820f1ece --- /dev/null +++ b/lib/arel/nodes/math_operation.rb @@ -0,0 +1,15 @@ +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/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index f76c1491ee..f30557e509 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -373,6 +373,22 @@ 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}" + 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 + def visit_Array o o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ') end |