Changeset 5219

Timestamp:

10/02/06 20:43:13 (2 years ago)

Author:

bitsweat

Message:

MySQL: introduce Mysql::Result#all_hashes to support further optimization. Closes #5581.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (4 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* MySQL: introduce Mysql::Result#all_hashes to support further optimization.  #5581 [Stefan Kaes]
-
-* save! shouldn't validate twice.  #6324 [maiha, Bob Silva]

trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -1 +1 @@
-require 'active_record/connection_adapters/abstract_adapter'
+
+module MysqlCompat
+  # add all_hashes method to standard mysql-c bindings or pure ruby version
+  def self.define_all_hashes_method!
+    raise 'Mysql not loaded' unless defined?(::Mysql::Result)
+    return if ::Mysql::Result.instance_methods.include?('all_hashes')
+
+    # Ruby driver has a version string and returns null values in each_hash
+    # C driver >= 2.7 returns null values in each_hash
+    if Mysql.const_defined?(:VERSION)
+      if Mysql::VERSION.is_a?(String) || Mysql::VERSION >= 20700
+        ::Mysql::Result.class_eval <<-'end_eval'
+        def all_hashes
+          rows = []
+          each_hash { |row| rows << row }
+          rows
+        end
+        end_eval
+      end
+
+    # adapters before 2.7 don't have a version constant
+    # and don't return null values in each_hash
+    else
+      ::Mysql::Result.class_eval <<-'end_eval'
+      def all_hashes
+        rows = []
+        all_fields = fetch_fields.inject({}) { |fields, f| fields[f.name] = nil; fields }
+        each_hash { |row| rows << all_fields.dup.update(row) }
+        rows
+      end
+      end_eval
+    end
+  end
+end
-
-module ActiveRecord
@@ -18 +52 @@
-        end
-      end
+
+      # Define Mysql::Result.all_hashes
+      MysqlCompat.define_all_hashes_method!
-
-      config = config.symbolize_keys
@@ -84 +121 @@
-        super(connection, logger)
-        @connection_options, @config = connection_options, config
-
+
-        connect
-      end
@@ -340 +377 @@
-          @connection.query_with_result = true
-          result = execute(sql, name)
-
-
-
-
-
-
-
+
-          result.free
-          rows
-        end
-
+
-        def supports_views?
-          version[0] >= 5
-        end
-
+
-        def version
-          @version ||= @connection.server_info.scan(/^(\d+)\.(\d+)\.(\d+)/).flatten.map { |v| v.to_i }