aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-02-15 18:20:56 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-02-15 18:20:56 -0200
commitf174e84e22f2eb3deb9a7afc08817217485fa4be (patch)
tree47a4366fd36c6f322dfa457934d0ec581641e2d9
parenta03e9c6b95b9a506fcb4c7d0d352c6b47eb6f727 (diff)
downloadrails-f174e84e22f2eb3deb9a7afc08817217485fa4be.tar.gz
rails-f174e84e22f2eb3deb9a7afc08817217485fa4be.tar.bz2
rails-f174e84e22f2eb3deb9a7afc08817217485fa4be.zip
Revert "No need to pass options which is never used"
Options is needed for some Rails extensions to determine when referential integrity should be disabled This reverts commit bcb466c543451dce69403aaae047295758589d8e. Fixes #5052
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb4
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