Skip to content

Commit

Permalink
Merge pull request #1763 from grantneufeld/schema_column_exists_optio…
Browse files Browse the repository at this point in the history
…ns_hash

Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
  • Loading branch information
josevalim committed Jun 19, 2011
2 parents 4054435 + 3cc83a8 commit 7d46061
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 12 additions & 0 deletions activerecord/test/cases/migration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down

0 comments on commit 7d46061

Please sign in to comment.