1 files changed, 61 insertions, 11 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 395f28f280..5812e20a1b 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require "cases/helper"
+require 'active_support/concurrency/latch'
 require 'models/post'
 require 'models/author'
 require 'models/topic'
@@ -555,11 +558,18 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal [ Topic.find(1) ], [ Topic.find(2).topic ] & [ Topic.find(1) ]
   end
 
-  def test_comparison
-    topic_1 = Topic.create!
-    topic_2 = Topic.create!
+  def test_create_without_prepared_statement
+    topic = Topic.connection.unprepared_statement do
+      Topic.create(:title => 'foo')
+    end
+
+    assert_equal topic, Topic.find(topic.id)
+  end
 
-    assert_equal [topic_2, topic_1].sort, [topic_1, topic_2]
+  def test_blank_ids
+    one = Subscriber.new(:id => '')
+    two = Subscriber.new(:id => '')
+    assert_equal one, two
   end
 
   def test_comparison_with_different_objects
@@ -568,6 +578,13 @@ class BasicsTest < ActiveRecord::TestCase
     assert_nil topic <=> category
   end
 
+  def test_comparison_with_different_objects_in_array
+    topic = Topic.create
+    assert_raises(ArgumentError) do
+      [1, topic].sort
+    end
+  end
+
   def test_readonly_attributes
     assert_equal Set.new([ 'title' , 'comments_count' ]), ReadonlyTitlePost.readonly_attributes
 
@@ -581,6 +598,11 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal "changed", post.body
   end
 
+  def test_unicode_column_name
+    weird = Weird.create(:なまえ => 'たこ焼き仮面')
+    assert_equal 'たこ焼き仮面', weird.なまえ
+  end
+
   def test_non_valid_identifier_column_name
     weird = Weird.create('a$b' => 'value')
     weird.reload
@@ -1316,6 +1338,35 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal 1, post.comments.length
   end
 
+  def test_marshal_between_processes
+    skip "fork isn't supported" unless Process.respond_to?(:fork)
+
+    # Define a new model to ensure there are no caches
+    if self.class.const_defined?("Post", false)
+      flunk "there should be no post constant"
+    end
+
+    self.class.const_set("Post", Class.new(ActiveRecord::Base) {
+      has_many :comments
+    })
+
+    rd, wr = IO.pipe
+
+    ActiveRecord::Base.connection_handler.clear_all_connections!
+
+    fork do
+      rd.close
+      post = Post.new
+      post.comments.build
+      wr.write Marshal.dump(post)
+      wr.close
+    end
+
+    wr.close
+    assert Marshal.load rd.read
+    rd.close
+  end
+
   def test_marshalling_new_record_round_trip_with_associations
     post = Post.new
     post.comments.build
@@ -1458,21 +1509,20 @@ class BasicsTest < ActiveRecord::TestCase
     orig_handler = klass.connection_handler
     new_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
     after_handler = nil
-    is_set = false
+    latch1 = ActiveSupport::Concurrency::Latch.new
+    latch2 = ActiveSupport::Concurrency::Latch.new
 
     t = Thread.new do
       klass.connection_handler = new_handler
-      is_set = true
-      Thread.stop
+      latch1.release
+      latch2.await
       after_handler = klass.connection_handler
     end
 
-    while(!is_set)
-      Thread.pass
-    end
+    latch1.await
 
     klass.connection_handler = orig_handler
-    t.wakeup
+    latch2.release
     t.join
 
     assert_equal after_handler, new_handler