From 0bb00a6999c7df2ea1c641e8bd6ada3023981617 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 4 Aug 2010 16:55:53 -0700
Subject: [PATCH] unfactoring DefaultOperations

---
 lib/arel/algebra/relations/relation.rb | 29 ++++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/arel/algebra/relations/relation.rb b/lib/arel/algebra/relations/relation.rb
index 9b90142d..de48aaf0 100644
--- a/lib/arel/algebra/relations/relation.rb
+++ b/lib/arel/algebra/relations/relation.rb
@@ -194,6 +194,19 @@ def position_of(attribute)
       @position_of[attribute] = attributes.index(attributes[attribute])
     end
 
+    def attributes;             Header.new  end
+    def projections;            []          end
+    def wheres;                 []          end
+    def orders;                 []          end
+    def inserts;                []          end
+    def groupings;              []          end
+    def havings;                []          end
+    def joins(formatter = nil); nil         end # FIXME
+    def taken;                  nil         end
+    def skipped;                nil         end
+    def sources;                []          end
+    def locked;                 []          end
+
     private
     def matching_attributes(attribute)
       (@matching_attributes ||= attributes.inject({}) do |hash, a|
@@ -205,21 +218,5 @@ def matching_attributes(attribute)
     def has_attribute?(attribute)
       !matching_attributes(attribute).empty?
     end
-
-    module DefaultOperations
-      def attributes;             Header.new  end
-      def projections;            []          end
-      def wheres;                 []          end
-      def orders;                 []          end
-      def inserts;                []          end
-      def groupings;              []          end
-      def havings;                []          end
-      def joins(formatter = nil); nil         end # FIXME
-      def taken;                  nil         end
-      def skipped;                nil         end
-      def sources;                []          end
-      def locked;                 []          end
-    end
-    include DefaultOperations
   end
 end