5 files changed, 63 insertions, 2 deletions
diff --git a/tests/backends/base/test_operations.py b/tests/backends/base/test_operations.py
index 5260344da7..9d2828c8ce 100644
--- a/tests/backends/base/test_operations.py
+++ b/tests/backends/base/test_operations.py
@@ -4,6 +4,7 @@ from django.core.management.color import no_style
 from django.db import NotSupportedError, connection, transaction
 from django.db.backends.base.operations import BaseDatabaseOperations
 from django.db.models import DurationField, Value
+from django.db.models.expressions import Col
 from django.test import (
     SimpleTestCase,
     TestCase,
@@ -159,6 +160,20 @@ class SimpleDatabaseOperationTests(SimpleTestCase):
         ):
             self.ops.datetime_extract_sql(None, None, None, None)
 
+    def test_prepare_join_on_clause(self):
+        author_table = Author._meta.db_table
+        author_id_field = Author._meta.get_field("id")
+        book_table = Book._meta.db_table
+        book_fk_field = Book._meta.get_field("author")
+        lhs_expr, rhs_expr = self.ops.prepare_join_on_clause(
+            author_table,
+            author_id_field,
+            book_table,
+            book_fk_field,
+        )
+        self.assertEqual(lhs_expr, Col(author_table, author_id_field))
+        self.assertEqual(rhs_expr, Col(book_table, book_fk_field))
+
 
 class DatabaseOperationTests(TestCase):
     def setUp(self):
diff --git a/tests/backends/postgresql/test_operations.py b/tests/backends/postgresql/test_operations.py
index c2f2417923..632928ff87 100644
--- a/tests/backends/postgresql/test_operations.py
+++ b/tests/backends/postgresql/test_operations.py
@@ -2,9 +2,11 @@ import unittest
 
 from django.core.management.color import no_style
 from django.db import connection
+from django.db.models.expressions import Col
+from django.db.models.functions import Cast
 from django.test import SimpleTestCase
 
-from ..models import Person, Tag
+from ..models import Author, Book, Person, Tag
 
 
 @unittest.skipUnless(connection.vendor == "postgresql", "PostgreSQL tests.")
@@ -48,3 +50,31 @@ class PostgreSQLOperationsTests(SimpleTestCase):
             ),
             ['TRUNCATE "backends_person", "backends_tag" RESTART IDENTITY CASCADE;'],
         )
+
+    def test_prepare_join_on_clause_same_type(self):
+        author_table = Author._meta.db_table
+        author_id_field = Author._meta.get_field("id")
+        lhs_expr, rhs_expr = connection.ops.prepare_join_on_clause(
+            author_table,
+            author_id_field,
+            author_table,
+            author_id_field,
+        )
+        self.assertEqual(lhs_expr, Col(author_table, author_id_field))
+        self.assertEqual(rhs_expr, Col(author_table, author_id_field))
+
+    def test_prepare_join_on_clause_different_types(self):
+        author_table = Author._meta.db_table
+        author_id_field = Author._meta.get_field("id")
+        book_table = Book._meta.db_table
+        book_fk_field = Book._meta.get_field("author")
+        lhs_expr, rhs_expr = connection.ops.prepare_join_on_clause(
+            author_table,
+            author_id_field,
+            book_table,
+            book_fk_field,
+        )
+        self.assertEqual(lhs_expr, Col(author_table, author_id_field))
+        self.assertEqual(
+            rhs_expr, Cast(Col(book_table, book_fk_field), author_id_field)
+        )
diff --git a/tests/foreign_object/models/empty_join.py b/tests/foreign_object/models/empty_join.py
index 9c0ada378c..4c3839dcc1 100644
--- a/tests/foreign_object/models/empty_join.py
+++ b/tests/foreign_object/models/empty_join.py
@@ -50,7 +50,7 @@ class StartsWithRelation(models.ForeignObject):
         from_field = self.model._meta.get_field(self.from_fields[0])
         return StartsWith(to_field.get_col(alias), from_field.get_col(related_alias))
 
-    def get_joining_columns(self, reverse_join=False):
+    def get_joining_fields(self, reverse_join=False):
         return ()
 
     def get_path_info(self, filtered_relation=None):
diff --git a/tests/generic_relations_regress/models.py b/tests/generic_relations_regress/models.py
index dc55b2a83b..6867747a26 100644
--- a/tests/generic_relations_regress/models.py
+++ b/tests/generic_relations_regress/models.py
@@ -64,12 +64,14 @@ class CharLink(models.Model):
     content_type = models.ForeignKey(ContentType, models.CASCADE)
     object_id = models.CharField(max_length=100)
     content_object = GenericForeignKey()
+    value = models.CharField(max_length=250)
 
 
 class TextLink(models.Model):
     content_type = models.ForeignKey(ContentType, models.CASCADE)
     object_id = models.TextField()
     content_object = GenericForeignKey()
+    value = models.CharField(max_length=250)
 
 
 class OddRelation1(models.Model):
diff --git a/tests/generic_relations_regress/tests.py b/tests/generic_relations_regress/tests.py
index 9b2f21b88b..b7ecb499eb 100644
--- a/tests/generic_relations_regress/tests.py
+++ b/tests/generic_relations_regress/tests.py
@@ -72,6 +72,20 @@ class GenericRelationTests(TestCase):
         TextLink.objects.create(content_object=oddrel)
         oddrel.delete()
 
+    def test_charlink_filter(self):
+        oddrel = OddRelation1.objects.create(name="clink")
+        CharLink.objects.create(content_object=oddrel, value="value")
+        self.assertSequenceEqual(
+            OddRelation1.objects.filter(clinks__value="value"), [oddrel]
+        )
+
+    def test_textlink_filter(self):
+        oddrel = OddRelation2.objects.create(name="clink")
+        TextLink.objects.create(content_object=oddrel, value="value")
+        self.assertSequenceEqual(
+            OddRelation2.objects.filter(tlinks__value="value"), [oddrel]
+        )
+
     def test_coerce_object_id_remote_field_cache_persistence(self):
         restaurant = Restaurant.objects.create()
         CharLink.objects.create(content_object=restaurant)