aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration.rb
diff options
context:
space:
mode:
authorJoao Carlos <mail@joao-carlos.com>2013-05-29 19:36:57 +0300
committerJoao Carlos <mail@joao-carlos.com>2013-05-29 19:36:57 +0300
commit40708c3670df44659235aade62f31c6c2a9af223 (patch)
tree7a82b946886500d11241a66acad73f7c51640038 /activerecord/lib/active_record/migration.rb
parentc2f3efffd905f8f21eb5ea88687b738fe8a119a2 (diff)
downloadrails-40708c3670df44659235aade62f31c6c2a9af223.tar.gz
rails-40708c3670df44659235aade62f31c6c2a9af223.tar.bz2
rails-40708c3670df44659235aade62f31c6c2a9af223.zip
Fix migrations with enable_extension
When using ActiveRecord::Base.table_name_prefix and/or table_name_suffix, extension names got the same treatment as table names when running migrations. This led to migrations that tried to call, for example, enable_extension("prefix_hstore") on the connection.
Diffstat (limited to 'activerecord/lib/active_record/migration.rb')
-rw-r--r--activerecord/lib/active_record/migration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 511a1585a7..bb195b3eb2 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -613,7 +613,7 @@ module ActiveRecord
say_with_time "#{method}(#{arg_list})" do
unless @connection.respond_to? :revert
- unless arguments.empty? || method == :execute
+ unless arguments.empty? || [:execute, :enable_extension, :disable_extension].include?(method)
arguments[0] = Migrator.proper_table_name(arguments.first)
arguments[1] = Migrator.proper_table_name(arguments.second) if method == :rename_table
end