unfactoring DefaultOperations

rsim · Aug 4, 2010 · 0bb00a6 · 0bb00a6
1 parent 1b4e771
commit 0bb00a6
Showing 1 changed file with 13 additions and 16 deletions.
diff --git 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