diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-06 09:46:06 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-06 09:46:06 -0800 |
| commit | ce8ac39338f86388e70356b3a470b3ea443802ae (patch) | |
| tree | 6159084babd20c3db2e1b8f02dc15b697b1aeff8 /activerecord/lib | |
| parent | b0e7b6f67c984d4b1502e801781ed75fad681633 (diff) | |
| parent | d2cc10c20000955da482e469078706793b310b01 (diff) | |
| download | rails-ce8ac39338f86388e70356b3a470b3ea443802ae.tar.gz rails-ce8ac39338f86388e70356b3a470b3ea443802ae.tar.bz2 rails-ce8ac39338f86388e70356b3a470b3ea443802ae.zip | |
Merge pull request #8439 from joshsusser/fixes
Fixes issues in test_mysql2
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/schema_migration.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb index b2ae369eb6..6c3cd5b6ba 100644 --- a/activerecord/lib/active_record/schema_migration.rb +++ b/activerecord/lib/active_record/schema_migration.rb @@ -42,10 +42,10 @@ module ActiveRecord end def self.drop_table - if connection.index_exists?(table_name, "version", :unique => true, :name => index_name) - connection.remove_index(table_name, :name => index_name) - end if connection.table_exists?(table_name) + if connection.index_exists?(table_name, "version", :unique => true, :name => index_name) + connection.remove_index(table_name, :name => index_name) + end connection.drop_table(table_name) end end |