Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Optimization for Mysql selects using mysql-ruby extension greater tha…

…n 2.6.3. Closes #2426.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2529 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 31ae8121e47e69f667df1ef86bff8f61e9f860cc 1 parent 0efeeba
Marcel Molina authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3. #2426. [skaes.web.de]
+
* Speed up the setting of table_name. #2428. [skaes@web.de]
* Optimize instantiation of STI subclass records. In partial fullfilment of #1236. [skaes@web.de]
View
18 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -4,20 +4,25 @@ module ActiveRecord
class Base
# Establishes a connection to the database that's used by all Active Record objects.
def self.mysql_connection(config) # :nodoc:
+ # Only include the MySQL driver if one hasn't already been loaded
unless self.class.const_defined?(:Mysql)
begin
- # Only include the MySQL driver if one hasn't already been loaded
require_library_or_gem 'mysql'
+ # The C version of mysql returns null fields in each_hash if Mysql::VERSION is defined
+ ConnectionAdapters::MysqlAdapter.null_values_in_each_hash = Mysql.const_defined?(:VERSION)
rescue LoadError => cannot_require_mysql
# Only use the supplied backup Ruby/MySQL driver if no driver is already in place
begin
require 'active_record/vendor/mysql'
require 'active_record/vendor/mysql411'
+ # The ruby version of mysql returns null fields in each_hash
+ ConnectionAdapters::MysqlAdapter.null_values_in_each_hash = true
rescue LoadError
raise cannot_require_mysql
end
end
end
+
config = config.symbolize_keys
host = config[:host]
@@ -73,6 +78,9 @@ class MysqlAdapter < AbstractAdapter
@@emulate_booleans = true
cattr_accessor :emulate_booleans
+ cattr_accessor :null_values_in_each_hash
+ @@null_values_in_each_hash = false
+
LOST_CONNECTION_ERROR_MESSAGES = [
"Server shutdown in progress",
"Broken pipe",
@@ -288,8 +296,12 @@ def select(sql, name = nil)
@connection.query_with_result = true
result = execute(sql, name)
rows = []
- all_fields_initialized = result.fetch_fields.inject({}) { |all_fields, f| all_fields[f.name] = nil; all_fields }
- result.each_hash { |row| rows << all_fields_initialized.dup.update(row) }
+ if @@null_values_in_each_hash
+ result.each_hash { |row| rows << row }
+ else
+ all_fields = result.fetch_fields.inject({}) { |fields, f| fields[f.name] = nil; fields }
+ result.each_hash { |row| rows << all_fields.dup.update(row) }
+ end
result.free
rows
end
Please sign in to comment.
Something went wrong with that request. Please try again.