diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-02-15 13:16:35 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-02-15 13:16:35 -0800 |
commit | a5874dd118fb205f78e0becee44c4eac01127f8c (patch) | |
tree | 47a4366fd36c6f322dfa457934d0ec581641e2d9 /activerecord/lib/active_record | |
parent | a03e9c6b95b9a506fcb4c7d0d352c6b47eb6f727 (diff) | |
parent | f174e84e22f2eb3deb9a7afc08817217485fa4be (diff) | |
download | rails-a5874dd118fb205f78e0becee44c4eac01127f8c.tar.gz rails-a5874dd118fb205f78e0becee44c4eac01127f8c.tar.bz2 rails-a5874dd118fb205f78e0becee44c4eac01127f8c.zip |
Merge pull request #5055 from rafaelfranca/fix-drop-table
Revert "No need to pass options which is never used"
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index ea6071ea46..6bac05191d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -163,7 +163,7 @@ module ActiveRecord yield td if block_given? if options[:force] && table_exists?(table_name) - drop_table(table_name) + drop_table(table_name, options) end create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE " @@ -294,7 +294,7 @@ module ActiveRecord end # Drops a table from the database. - def drop_table(table_name) + def drop_table(table_name, options = {}) execute "DROP TABLE #{quote_table_name(table_name)}" end |