From abba61e2bbe320894ba8449ebdf778a1d2af545b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 14 Mar 2013 17:33:44 -0700
Subject: hashes are ordered, so just use the columns_hash ivar

---
 .../connection_adapters/abstract/schema_definitions.rb              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index d3abc88fd5..18ddc3c322 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -63,15 +63,16 @@ module ActiveRecord
     class TableDefinition
       # An array of ColumnDefinition objects, representing the column changes
       # that have been defined.
-      attr_accessor :columns, :indexes
+      attr_accessor :indexes
 
       def initialize(base)
-        @columns = []
         @columns_hash = {}
         @indexes = {}
         @base = base
       end
 
+      def columns; @columns_hash.values; end
+
       def xml(*args)
         raise NotImplementedError unless %w{
           sqlite mysql mysql2
@@ -301,7 +302,6 @@ module ActiveRecord
 
       def new_column_definition(base, name, type)
         definition = create_column_definition base, name, type
-        @columns << definition
         @columns_hash[name] = definition
         definition
       end
-- 
cgit v1.2.3