columns method doesn't have name argument

2 files changed, 5 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
index 4e8932a695..962718da56 100644
--- a/activerecord/lib/active_record/connection_adapters/schema_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
@@ -9,7 +9,7 @@ module ActiveRecord
         @tables     = {}
 
         @columns = Hash.new do |h, table_name|
-          h[table_name] = conn.columns(table_name, "#{table_name} Columns")
+          h[table_name] = conn.columns(table_name)
         end
 
         @columns_hash = Hash.new do |h, table_name|
diff --git a/activerecord/test/cases/migration/rename_column_test.rb b/activerecord/test/cases/migration/rename_column_test.rb
index 2e7e533ed6..16e09fd80e 100644
--- a/activerecord/test/cases/migration/rename_column_test.rb
+++ b/activerecord/test/cases/migration/rename_column_test.rb
@@ -130,25 +130,24 @@ module ActiveRecord
         add_column 'test_models', 'age', :integer
         add_column 'test_models', 'approved', :boolean, :default => true
 
-        label = "test_change_column Columns"
-        old_columns = connection.columns(TestModel.table_name, label)
+        old_columns = connection.columns(TestModel.table_name)
 
         assert old_columns.find { |c| c.name == 'age' && c.type == :integer }
 
         change_column "test_models", "age", :string
 
-        new_columns = connection.columns(TestModel.table_name, label)
+        new_columns = connection.columns(TestModel.table_name)
 
         refute new_columns.find { |c| c.name == 'age' and c.type == :integer }
         assert new_columns.find { |c| c.name == 'age' and c.type == :string }
 
-        old_columns = connection.columns(TestModel.table_name, label)
+        old_columns = connection.columns(TestModel.table_name)
         assert old_columns.find { |c|
           c.name == 'approved' && c.type == :boolean && c.default == true
         }
 
         change_column :test_models, :approved, :boolean, :default => false
-        new_columns = connection.columns(TestModel.table_name, label)
+        new_columns = connection.columns(TestModel.table_name)
 
         refute new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
         assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }