Ticket #13935: 13935.diff

db/models/sql/subqueries.py

@@ -188 +188 @@
         """
         Converts the query into a date extraction query.
         """
-        result = self.setup_joins([field.name], self.get_meta(),
-                self.get_initial_alias(), False)
+        from django.db.models.fields import DateField
+
+        if isinstance(field, str):
+            parts = field.split(LOOKUP_SEP)
+        else:
+            parts = [field.name]
+
+        try:
+            result = self.setup_joins(parts, self.get_meta(),
+                        self.get_initial_alias(), False)
+        except FieldError:
+            from django.db.models.fields import FieldDoesNotExist
+
+            raise FieldDoesNotExist('%s has no field named %r' % (self.get_meta().object_name, parts[0]))
+
+        field = result[0]
+        assert isinstance(field, DateField), "%r isn't a DateField." \
+                    % field.name
+
         alias = result[3][-1]
         select = Date((alias, field.column), lookup_type)
         self.select = [select]
@@ -199 +216 @@
         self.distinct = True
         self.order_by = order == 'ASC' and [1] or [-1]
 
+        if field.null:
+            self.add_filter(('%s__isnull' % field.name, False))
+
 class AggregateQuery(Query):
     """
     An AggregateQuery takes another query as a parameter to the FROM

db/models/query.py

@@ -988 +988 @@
         self.query.clear_deferred_loading()
         self.query = self.query.clone(klass=sql.DateQuery, setup=True)
         self.query.select = []
-        field = self.model._meta.get_field(self._field_name, many_to_many=False)
-        assert isinstance(field, DateField), "%r isn't a DateField." \
-                % field.name
-        self.query.add_date_select(field, self._kind, self._order)
-        if field.null:
-            self.query.add_filter(('%s__isnull' % field.name, False))
 
+        # all logic is gone there, because we need to use query.setup_joins
+        # to guess the real field from something like "article__pub_date"
+        self.query.add_date_select(self._field_name, self._kind, self._order)
+
     def _clone(self, klass=None, setup=False, **kwargs):
         c = super(DateQuerySet, self)._clone(klass, False, **kwargs)
         c._field_name = self._field_name