aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2012-12-15 22:42:22 +0100
committerYves Senn <yves.senn@garaio.com>2012-12-19 12:24:35 +0100
commit9f69d42860a56c585271484f49445f1b43dac357 (patch)
tree6ad4736a3358305efff45b821e5afa965bb9d546 /activerecord/lib/active_record/connection_adapters
parentdf048b574b5ab5a449a3b1dfc50dbf3baa18869e (diff)
downloadrails-9f69d42860a56c585271484f49445f1b43dac357.tar.gz
rails-9f69d42860a56c585271484f49445f1b43dac357.tar.bz2
rails-9f69d42860a56c585271484f49445f1b43dac357.zip
Backport #8522, Keep index names when using with sqlite3
Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb activerecord/test/cases/migration/rename_column_test.rb
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index e80b465bab..ca84c95bdc 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -530,7 +530,7 @@ module ActiveRecord
unless columns.empty?
# index name can't be the same
- opts = { :name => name.gsub(/_(#{from})_/, "_#{to}_") }
+ opts = { :name => name.gsub(/(^|_)(#{from})_/, "\\1#{to}_") }
opts[:unique] = true if index.unique
add_index(to, columns, opts)
end