Merge remote branch 'stiff/master' into omg

* stiff/master:
  implemented support for math operations in numeric attributes

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/arel/attributes/attribute.rb b/lib/arel/attributes/attribute.rb
index 9a42e5a4da..bd3f4b58f1 100644
--- a/lib/arel/attributes/attribute.rb
+++ b/lib/arel/attributes/attribute.rb
@@ -5,12 +5,16 @@ module Arel
       include Arel::Predications
     end
 
+    class NumericAttribute < Attribute
+      include Arel::Math
+    end
+
     class String    < Attribute; end
     class Time      < Attribute; end
     class Boolean   < Attribute; end
-    class Decimal   < Attribute; end
-    class Float     < Attribute; end
-    class Integer   < Attribute; end
+    class Decimal   < NumericAttribute; end
+    class Float     < NumericAttribute; end
+    class Integer   < NumericAttribute; end
     class Undefined < Attribute; end
   end