diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 17:05:16 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 17:05:16 -0200 |
commit | 4b669dbb9180c7f9740bc24dea403b82c8d6ddc9 (patch) | |
tree | 3ccc754c7bf487be10b7e07f8226b6df502e890e /activerecord/test/cases/adapters | |
parent | 97e413002639c1e19503f9c9875fc83428c36f51 (diff) | |
parent | b1c19eb05299fbae2a80beb4abacacc4b5340776 (diff) | |
download | rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.tar.gz rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.tar.bz2 rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.zip |
Merge branch 'master' into merge-action-cable
Diffstat (limited to 'activerecord/test/cases/adapters')
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/connection_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
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| |