aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-04-20 02:41:05 +0000
committerRick Olson <technoweenie@gmail.com>2006-04-20 02:41:05 +0000
commit2cbb5fb176f12badcc408b6fe142475e7df554f7 (patch)
tree44d3596e2eacf0f74180e0a6a8de32f82f7bf846 /activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
parentb00e61aa08f34eaf6774e53f1da16410595c2153 (diff)
downloadrails-2cbb5fb176f12badcc408b6fe142475e7df554f7.tar.gz
rails-2cbb5fb176f12badcc408b6fe142475e7df554f7.tar.bz2
rails-2cbb5fb176f12badcc408b6fe142475e7df554f7.zip
Properly quote index names in migrations (closes #4764) [John Long]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 40933d743c..ba219b9799 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -213,13 +213,7 @@ module ActiveRecord
end
def remove_index(table_name, options={}) #:nodoc:
- if Hash === options
- index_name = options[:name]
- else
- index_name = "#{table_name}_#{options}_index"
- end
-
- execute "DROP INDEX #{index_name}"
+ execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
end
def rename_table(name, new_name)