removed more boiler-plate

2 files changed, 4 insertions, 13 deletions

diff --git a/lib/arel/relations/utilities/aggregation.rb b/lib/arel/relations/utilities/aggregation.rb
index 66150bff0a..9f5ead8f86 100644
--- a/lib/arel/relations/utilities/aggregation.rb
+++ b/lib/arel/relations/utilities/aggregation.rb
@@ -1,11 +1,9 @@
 module Arel
   class Aggregation < Compound
+    attributes :relation
+    deriving :initialize, :==
     include Recursion::BaseCase
 
-    def initialize(relation)
-      @relation = relation
-    end
-    
     def wheres
       []
     end
@@ -21,11 +19,6 @@ module Arel
     def name
       relation.name + '_aggregation'
     end
-    
-    def ==(other)
-      Aggregation   === other and
-      self.relation ==  other.relation
-    end
   end
   
   class Relation
diff --git a/lib/arel/relations/utilities/nil.rb b/lib/arel/relations/utilities/nil.rb
index 2dcfb47233..2b8dc570f8 100644
--- a/lib/arel/relations/utilities/nil.rb
+++ b/lib/arel/relations/utilities/nil.rb
@@ -1,10 +1,8 @@
 module Arel
   class Nil < Relation
+    include Singleton
+    
     def table_sql(formatter = nil); '' end
     def name; '' end
-
-    def ==(other)
-      Nil === other
-    end
   end
 end
\ No newline at end of file