code cleanup: fix up misleading member variable name.

tovodeverett · Mar 13, 2013 · 463d385 · 463d385
1 parent 035e767
commit 463d385
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/schema_plus/active_record/base.rb b/lib/schema_plus/active_record/base.rb
@@ -21,7 +21,7 @@ class << base
 
         def columns_with_schema_plus #:nodoc:
           columns = columns_without_schema_plus
-          columns.each do |column| column.connection = self end unless @schema_plus_extended_columns
+          columns.each do |column| column.model = self end unless @schema_plus_extended_columns
           columns
         end
 

diff --git a/lib/schema_plus/active_record/connection_adapters/column.rb b/lib/schema_plus/active_record/connection_adapters/column.rb
@@ -8,13 +8,13 @@ module ConnectionAdapters
       module Column
 
         attr_reader :default_expr
-        attr_writer :connection # connection gets set by SchemaPlus::ActiveRecord::Base::columns_with_schema_plus
+        attr_writer :model # model gets set by SchemaPlus::ActiveRecord::Base::columns_with_schema_plus
 
         # Returns the list of IndexDefinition instances for each index that
         # refers to this column.  Returns an empty list if there are no
         # such indexes.
         def indexes
-          @indexes ||= @connection.indexes.select{|index| index.columns.include? self.name}
+          @indexes ||= @model.indexes.select{|index| index.columns.include? self.name}
         end
 
         # If the column is in a unique index, returns a list of names of other columns in
@@ -53,9 +53,9 @@ def required_on
         end
 
         # The default as_jon includes all instance variables.  but
-        # @connection can't be dumped (it contains circular references)
+        # @model can't be dumped (it contains circular references)
         def as_json(options=nil)
-          instance_values.except "connection"
+          instance_values.except "model"
         end
       end
     end