diff options
author | Tony Miller <mcfiredrill@gmail.com> | 2015-05-06 23:49:21 +0900 |
---|---|---|
committer | Tony Miller <mcfiredrill@gmail.com> | 2015-05-06 23:51:06 +0900 |
commit | ee3f4798e267b86a64eadb8174be96e44cadbefe (patch) | |
tree | 8aa2027c983b998780aa201b860b0400f5bffcb5 /activerecord | |
parent | 71669370ae789f547311821ab880b0f19682b405 (diff) | |
download | rails-ee3f4798e267b86a64eadb8174be96e44cadbefe.tar.gz rails-ee3f4798e267b86a64eadb8174be96e44cadbefe.tar.bz2 rails-ee3f4798e267b86a64eadb8174be96e44cadbefe.zip |
make AbstractAdapter#subquery_for private
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index f4f52e85e3..e103508a13 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -830,19 +830,6 @@ module ActiveRecord MysqlTypeMetadata.new(super(sql_type), collation: collation, extra: extra, strict: strict_mode?) end - # MySQL is too stupid to create a temporary table for use subquery, so we have - # to give it some prompting in the form of a subsubquery. Ugh! - def subquery_for(key, select) - subsubselect = select.clone - subsubselect.projections = [key] - - subselect = Arel::SelectManager.new(select.engine) - subselect.project Arel.sql(key.name) - # Materialized subquery by adding distinct - # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on' - subselect.from subsubselect.distinct.as('__active_record_temp') - end - def add_index_length(option_strings, column_names, options = {}) if options.is_a?(Hash) && length = options[:length] case length @@ -943,6 +930,19 @@ module ActiveRecord private + # MySQL is too stupid to create a temporary table for use subquery, so we have + # to give it some prompting in the form of a subsubquery. Ugh! + def subquery_for(key, select) + subsubselect = select.clone + subsubselect.projections = [key] + + subselect = Arel::SelectManager.new(select.engine) + subselect.project Arel.sql(key.name) + # Materialized subquery by adding distinct + # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on' + subselect.from subsubselect.distinct.as('__active_record_temp') + end + def version @version ||= full_version.scan(/^(\d+)\.(\d+)\.(\d+)/).flatten.map(&:to_i) end |