From 46fe546c5f8bf505eb2503e0a784991c69a1d223 Mon Sep 17 00:00:00 2001 From: Stephen Blackstone Date: Fri, 11 Dec 2015 18:19:26 -0500 Subject: Allow users to pass flags from database.yml Fix white-space Add test case demonstrating flags are received by the adapter --- activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 7ca597859d..6590e0140d 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -10,9 +10,9 @@ module ActiveRecord config = config.symbolize_keys config[:username] = 'root' if config[:username].nil? - + config[:flags] ||= 0 if Mysql2::Client.const_defined? :FOUND_ROWS - config[:flags] = Mysql2::Client::FOUND_ROWS + config[:flags] |= Mysql2::Client::FOUND_ROWS end client = Mysql2::Client.new(config) -- cgit v1.2.3