From 46fe546c5f8bf505eb2503e0a784991c69a1d223 Mon Sep 17 00:00:00 2001
From: Stephen Blackstone <sblackstone@gmail.com>
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/test/cases/adapters/mysql2/connection_test.rb | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'activerecord/test')
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 507d024bb6..8fabcfb5c0 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -83,6 +83,13 @@ class Mysql2ConnectionTest < ActiveRecord::Mysql2TestCase
assert_equal [['']], result.rows
end
end
+
+ def test_passing_arbitary_flags_to_adapter
+ run_without_connection do |orig_connection|
+ ActiveRecord::Base.establish_connection(orig_connection.merge({flags: Mysql2::Client::COMPRESS}))
+ assert_equal (Mysql2::Client::COMPRESS | Mysql2::Client::FOUND_ROWS), ActiveRecord::Base.connection.raw_connection.query_options[:flags]
+ end
+ end
def test_mysql_strict_mode_specified_default
run_without_connection do |orig_connection|
--
cgit v1.2.3