1 files changed, 47 insertions, 4 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index c91cf89f6d..5812e20a1b 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -558,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
@@ -571,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
 
@@ -1324,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