Remove ActiveRelation sub-modules and refactor specs

1 files changed, 30 insertions, 32 deletions

diff --git a/lib/active_relation/relations/table.rb b/lib/active_relation/relations/table.rb
index a370b4266d..5220087318 100644
--- a/lib/active_relation/relations/table.rb
+++ b/lib/active_relation/relations/table.rb
@@ -1,39 +1,37 @@
 module ActiveRelation
-  module Relations
-    class Table < Base
-      attr_reader :name
-  
-      def initialize(name)
-        @name = name
-      end
-  
-      def attributes
-        attributes_by_name.values
-      end
+  class Table < Relation
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+
+    def attributes
+      attributes_by_name.values
+    end
+
+    def qualify
+      Rename.new self, qualifications
+    end
   
-      def qualify
-        Rename.new self, qualifications
-      end
+    protected
+    def attribute(name)
+      attributes_by_name[name.to_s]
+    end
     
-      protected
-      def attribute(name)
-        attributes_by_name[name.to_s]
-      end
-      
-      def table_sql
-        "#{quote_table_name(name)}"
-      end
-  
-      private
-      def attributes_by_name
-        @attributes_by_name ||= connection.columns(name, "#{name} Columns").inject({}) do |attributes_by_name, column|
-          attributes_by_name.merge(column.name => Primitives::Attribute.new(self, column.name.to_sym))
-        end
-      end
-  
-      def qualifications
-        attributes.zip(attributes.collect(&:qualified_name)).to_hash
+    def table_sql
+      "#{quote_table_name(name)}"
+    end
+
+    private
+    def attributes_by_name
+      @attributes_by_name ||= connection.columns(name, "#{name} Columns").inject({}) do |attributes_by_name, column|
+        attributes_by_name.merge(column.name => Attribute.new(self, column.name.to_sym))
       end
     end
+
+    def qualifications
+      attributes.zip(attributes.collect(&:qualified_name)).to_hash
+    end
   end
 end
\ No newline at end of file