From eb2e30ef249051713d8122a784d8fbfa378e7ae1 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 20 Jun 2007 18:30:35 +0000 Subject: MySQL: fix show_variable. Closes #8448. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7071 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/adapter_test.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'activerecord/test/adapter_test.rb') diff --git a/activerecord/test/adapter_test.rb b/activerecord/test/adapter_test.rb index 6d986d5dba..84af72bfa5 100644 --- a/activerecord/test/adapter_test.rb +++ b/activerecord/test/adapter_test.rb @@ -48,11 +48,19 @@ class AdapterTest < Test::Unit::TestCase if current_adapter?(:MysqlAdapter) def test_charset - assert @connection.charset + assert_not_nil @connection.charset + assert_not_equal 'character_set_database', @connection.charset + assert_equal @connection.show_variable('character_set_database'), @connection.charset end def test_collation - assert @connection.collation + assert_not_nil @connection.collation + assert_not_equal 'collation_database', @connection.collation + assert_equal @connection.show_variable('collation_database'), @connection.collation + end + + def test_show_nonexistent_variable_returns_nil + assert_nil @connection.show_variable('foo_bar_baz') end end -- cgit v1.2.3