aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/connection_test_firebird.rb8
-rw-r--r--activerecord/test/connections/native_firebird/connection.rb3
2 files changed, 10 insertions, 1 deletions
diff --git a/activerecord/test/connection_test_firebird.rb b/activerecord/test/connection_test_firebird.rb
new file mode 100644
index 0000000000..4760a46dbc
--- /dev/null
+++ b/activerecord/test/connection_test_firebird.rb
@@ -0,0 +1,8 @@
+require 'abstract_unit'
+
+class ConnectionTest < Test::Unit::TestCase
+ def test_charset_properly_set
+ fb_conn = ActiveRecord::Base.connection.instance_variable_get(:@connection)
+ assert_equal 'UTF8', fb_conn.database.character_set
+ end
+end
diff --git a/activerecord/test/connections/native_firebird/connection.rb b/activerecord/test/connections/native_firebird/connection.rb
index c861d952d3..b7d47940f7 100644
--- a/activerecord/test/connections/native_firebird/connection.rb
+++ b/activerecord/test/connections/native_firebird/connection.rb
@@ -12,7 +12,8 @@ ActiveRecord::Base.establish_connection(
:host => "localhost",
:username => "rails",
:password => "rails",
- :database => db1
+ :database => db1,
+ :charset => "UTF8"
)
Course.establish_connection(