diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/Rakefile | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/associations/join_model_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 09dbc5ad6d..fb3e81066c 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -86,8 +86,8 @@ task :rebuild_mysql_databases => 'mysql:rebuild_databases' namespace :postgresql do desc 'Build the PostgreSQL test databases' task :build_databases do - %x( createdb activerecord_unittest ) - %x( createdb activerecord_unittest2 ) + %x( createdb -E UTF8 activerecord_unittest ) + %x( createdb -E UTF8 activerecord_unittest2 ) end desc 'Drop the PostgreSQL test databases' diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb index c035600e69..e9af5a60d8 100644 --- a/activerecord/test/cases/associations/join_model_test.rb +++ b/activerecord/test/cases/associations/join_model_test.rb @@ -381,7 +381,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase end def test_has_many_through_polymorphic_has_one - assert_equal Tagging.find(1,2), authors(:david).tagging + assert_equal Tagging.find(1,2).sort_by { |t| t.id }, authors(:david).tagging end def test_has_many_through_polymorphic_has_many |