2 files changed, 11 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
index 51846e22d9..218c59247e 100644
--- a/activerecord/test/cases/adapters/postgresql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
@@ -10,13 +10,13 @@ module ActiveRecord
         end
 
         def test_type_cast_true
-          c = PostgreSQLColumn.new(nil, 1, OID::Boolean.new, 'boolean')
+          c = PostgreSQLColumn.new(nil, 1, Type::Boolean.new, 'boolean')
           assert_equal 't', @conn.type_cast(true, nil)
           assert_equal 't', @conn.type_cast(true, c)
         end
 
         def test_type_cast_false
-          c = PostgreSQLColumn.new(nil, 1, OID::Boolean.new, 'boolean')
+          c = PostgreSQLColumn.new(nil, 1, Type::Boolean.new, 'boolean')
           assert_equal 'f', @conn.type_cast(false, nil)
           assert_equal 'f', @conn.type_cast(false, c)
         end
@@ -47,9 +47,9 @@ module ActiveRecord
 
         def test_quote_cast_numeric
           fixnum = 666
-          c = PostgreSQLColumn.new(nil, nil, OID::String.new, 'varchar')
+          c = PostgreSQLColumn.new(nil, nil, Type::String.new, 'varchar')
           assert_equal "'666'", @conn.quote(fixnum, c)
-          c = PostgreSQLColumn.new(nil, nil, OID::Text.new, 'text')
+          c = PostgreSQLColumn.new(nil, nil, Type::Text.new, 'text')
           assert_equal "'666'", @conn.quote(fixnum, c)
         end
 
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 6ab1bd8c8b..fbba554e39 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -508,6 +508,13 @@ class RelationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_deep_preload
+    post = Post.preload(author: :posts, comments: :post).first
+
+    assert_predicate post.author.association(:posts), :loaded?
+    assert_predicate post.comments.first.association(:post), :loaded?
+  end
+
   def test_preload_applies_to_all_chained_preloaded_scopes
     assert_queries(3) do
       post = Post.with_comments.with_tags.first