Skip to content

Commit

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

Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
  • Loading branch information
spastorino committed Jul 6, 2011
2 parents e7ac539 + 88aa2ef commit 3a92bc7
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def column(column_name, type, options = {})
end end


# Checks to see if a column exists. See SchemaStatements#column_exists? # 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) @base.column_exists?(@table_name, column_name, type, options)
end end


Expand Down
12 changes: 12 additions & 0 deletions activerecord/test/cases/migration_test.rb
Original file line number Original file line 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 Person.connection.drop_table :testings rescue nil
end 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 def test_add_table
assert !Reminder.table_exists? assert !Reminder.table_exists?


Expand Down

0 comments on commit 3a92bc7

Please sign in to comment.