1 files changed, 20 insertions, 3 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 7e3da145e5..cc8ffb5f27 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -26,7 +26,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase
   def test_to_key_with_primary_key_after_destroy
     topic = Topic.find(1)
     topic.destroy
-    assert_equal nil, topic.to_key
+    assert_equal [1], topic.to_key
   end
 
   def test_integer_key
@@ -142,7 +142,24 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal k.connection.quote_column_name("id"), k.quoted_primary_key
     k.primary_key = "foo"
     assert_equal k.connection.quote_column_name("foo"), k.quoted_primary_key
-    k.set_primary_key "bar"
-    assert_equal k.connection.quote_column_name("bar"), k.quoted_primary_key
+  end
+end
+
+class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def test_set_primary_key_with_no_connection
+    return skip("disconnect wipes in-memory db") if in_memory_db?
+
+    connection = ActiveRecord::Base.remove_connection
+
+    model = Class.new(ActiveRecord::Base)
+    model.primary_key = 'foo'
+
+    assert_equal 'foo', model.primary_key
+
+    ActiveRecord::Base.establish_connection(connection)
+
+    assert_equal 'foo', model.primary_key
   end
 end