From 0420fb56475409c209193fbd45f9afffe8cd35eb Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 20 Aug 2010 10:15:52 -0700 Subject: adding FOUND_ROWS to the connect flags for mysql2 --- activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 96cf2d09db..b5bf7f46ef 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -6,6 +6,11 @@ module ActiveRecord class Base def self.mysql2_connection(config) config[:username] = 'root' if config[:username].nil? + + if Mysql2::Client.const_defined? :FOUND_ROWS + config[:flags] = Mysql2::Client::FOUND_ROWS + end + client = Mysql2::Client.new(config.symbolize_keys) options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0] ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config) -- cgit v1.2.3 From c211d904ba358d3d1ae85d56fa3a805ea505c23a Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 20 Aug 2010 18:55:02 -0700 Subject: Revert "Just add connection management middleware if running in a concurrent environment." This reverts commit 6b29dc876fe185881d46731c3ae170478a3828fe. --- activerecord/lib/active_record/railtie.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 78fdb77216..94dda4e413 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -16,7 +16,11 @@ module ActiveRecord config.generators.orm :active_record, :migration => true, :timestamps => true - config.app_middleware.insert_after "::ActionDispatch::Callbacks", "ActiveRecord::QueryCache" + config.app_middleware.insert_after "::ActionDispatch::Callbacks", + "ActiveRecord::QueryCache" + + config.app_middleware.insert_after "::ActionDispatch::Callbacks", + "ActiveRecord::ConnectionAdapters::ConnectionManagement" rake_tasks do load "active_record/railties/databases.rake" @@ -74,13 +78,6 @@ module ActiveRecord end end - initializer "active_record.add_concurrency_middleware" do |app| - if app.config.allow_concurrency - app.config.middleware.insert_after "::ActionDispatch::Callbacks", - "ActiveRecord::ConnectionAdapters::ConnectionManagement" - end - end - config.after_initialize do ActiveSupport.on_load(:active_record) do instantiate_observers -- cgit v1.2.3 From 82e389ed30fd979d4a627b1edbda52c6dde34ae6 Mon Sep 17 00:00:00 2001 From: Brian Lopez Date: Fri, 20 Aug 2010 19:46:30 -0700 Subject: reload bob after his journy to a new timezone --- activerecord/test/cases/migration_test.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activerecord') diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 186bb55c01..96b97fdd8a 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -566,6 +566,7 @@ if ActiveRecord::Base.connection.supports_migrations? if bob.moment_of_truth.is_a?(DateTime) with_env_tz 'US/Eastern' do + bob.reload assert_equal DateTime.local_offset, bob.moment_of_truth.offset assert_not_equal 0, bob.moment_of_truth.offset assert_not_equal "Z", bob.moment_of_truth.zone -- cgit v1.2.3