Fixed #34838 -- Corrected output_field of resolved columns for GeneratedFields.

Thanks Simon Charette for the implementation idea.

1 files changed, 12 insertions, 0 deletions

diff --git a/django/db/models/fields/generated.py b/django/db/models/fields/generated.py
index 0980be98af..deb5875638 100644
--- a/django/db/models/fields/generated.py
+++ b/django/db/models/fields/generated.py
@@ -1,6 +1,7 @@
 from django.core import checks
 from django.db import connections, router
 from django.db.models.sql import Query
+from django.utils.functional import cached_property
 
 from . import NOT_PROVIDED, Field
 
@@ -32,6 +33,17 @@ class GeneratedField(Field):
         self.db_persist = db_persist
         super().__init__(**kwargs)
 
+    @cached_property
+    def cached_col(self):
+        from django.db.models.expressions import Col
+
+        return Col(self.model._meta.db_table, self, self.output_field)
+
+    def get_col(self, alias, output_field=None):
+        if alias != self.model._meta.db_table and output_field is None:
+            output_field = self.output_field
+        return super().get_col(alias, output_field)
+
     def contribute_to_class(self, *args, **kwargs):
         super().contribute_to_class(*args, **kwargs)