aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-16 21:51:38 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-16 22:18:11 -0300
commit6abe0e7b4e10b8626d1a294eaa5fcaa28ec9f27d (patch)
tree5c473f97736b03eb4d031d8190d082a545cfcc56 /activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
parentdbfdd00e38019f9e52df1f74d49a460d8cc1bba5 (diff)
downloadrails-6abe0e7b4e10b8626d1a294eaa5fcaa28ec9f27d.tar.gz
rails-6abe0e7b4e10b8626d1a294eaa5fcaa28ec9f27d.tar.bz2
rails-6abe0e7b4e10b8626d1a294eaa5fcaa28ec9f27d.zip
Backport explain fixes.
* Mark as SCHEMA some schema database queries. #7648 * Don't explain queries except normal CRUD sql. #7657 Closes #6458 Closes #7544
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 00f74318c0..731f7e2049 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -359,12 +359,12 @@ module ActiveRecord
# Returns an array of indexes for the given table.
def indexes(table_name, name = nil) #:nodoc:
- exec_query("PRAGMA index_list(#{quote_table_name(table_name)})", name).map do |row|
+ exec_query("PRAGMA index_list(#{quote_table_name(table_name)})", 'SCHEMA').map do |row|
IndexDefinition.new(
table_name,
row['name'],
row['unique'] != 0,
- exec_query("PRAGMA index_info('#{row['name']}')").map { |col|
+ exec_query("PRAGMA index_info('#{row['name']}')", 'SCHEMA').map { |col|
col['name']
})
end