aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-06-30 06:36:33 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-06-30 14:47:27 +0900
commit21d040f97d539fb292bd79453692dc02b19c23f0 (patch)
tree0ee689509ec3413683db614148f23f7fc06b3533 /activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
parentb9120d1f8cdfe8c6c88559a8029ba60452c9e5ca (diff)
downloadrails-21d040f97d539fb292bd79453692dc02b19c23f0.tar.gz
rails-21d040f97d539fb292bd79453692dc02b19c23f0.tar.bz2
rails-21d040f97d539fb292bd79453692dc02b19c23f0.zip
Don't cache queries for schema statements
`test_middleware_caches` is sometimes failed since #29454. The failure is due to schema statements are affected by query caching. Bypassing query caching for schema statements to avoid the issue.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
index f21b2546de..eff96e329f 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
@@ -47,7 +47,7 @@ module ActiveRecord
def schema_collation(column)
if column.collation && table_name = column.table_name
@table_collation_cache ||= {}
- @table_collation_cache[table_name] ||= select_one("SHOW TABLE STATUS LIKE #{quote(table_name)}")["Collation"]
+ @table_collation_cache[table_name] ||= exec_query("SHOW TABLE STATUS LIKE #{quote(table_name)}", "SCHEMA").first["Collation"]
column.collation.inspect if column.collation != @table_collation_cache[table_name]
end
end
@@ -64,7 +64,7 @@ module ActiveRecord
" WHERE table_schema = #{scope[:schema]}" \
" AND table_name = #{scope[:name]}" \
" AND column_name = #{quote(column.name)}"
- select_value(sql, "SCHEMA").inspect
+ query_value(sql, "SCHEMA").inspect
end
end
end