Permalink
Browse files

Merge pull request #4853 from rafaelfranca/fix-build-again

columns method doesn't have name argument
  • Loading branch information...
tenderlove committed Feb 2, 2012
2 parents 55686ae + 37ce852 commit cd3bdb388b04451c740ac09f748a2ec711f344ef
@@ -9,7 +9,7 @@ def initialize(conn)
@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|
@@ -130,25 +130,24 @@ def test_change_column
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 }

0 comments on commit cd3bdb3

Please sign in to comment.