Permalink
Browse files

Merge pull request #1763 from grantneufeld/schema_column_exists_optio…

…ns_hash

Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
  • Loading branch information...
2 parents 4054435 + 3cc83a8 commit 7d4606156b9d2b1900e99b9fb5cd08529b8f95a0 @josevalim josevalim committed Jun 19, 2011
@@ -328,7 +328,7 @@ def column(column_name, type, options = {})
end
# Checks to see if a column exists. See SchemaStatements#column_exists?
- def column_exists?(column_name, type = nil, options = nil)
+ def column_exists?(column_name, type = nil, options = {})
@base.column_exists?(@table_name, column_name, type, options)
end
@@ -1071,6 +1071,18 @@ def test_column_exists_with_definition
Person.connection.drop_table :testings rescue nil
end
+ def test_column_exists_on_table_with_no_options_parameter_supplied
+ Person.connection.create_table :testings do |t|
+ t.string :foo
+ end
+ Person.connection.change_table :testings do |t|
+ assert t.column_exists?(:foo)
+ assert !(t.column_exists?(:bar))
+ end
+ ensure
+ Person.connection.drop_table :testings rescue nil
+ end
+
def test_add_table
assert !Reminder.table_exists?

0 comments on commit 7d46061

Please sign in to comment.