Luke Plant avatar Luke Plant committed abb969b

Removed some dead code.

Comments (0)

Files changed (1)


 from django.db import models
+from django.db.backends.util import typecast_timestamp
 from django.db.models.sql.compiler import SQLCompiler
 from django.db.models.sql.constants import MULTI
 from django.db.models.sql.datastructures import Date
 class DateAggregateCompiler(SQLCompiler):
     def results_iter(self):
-        resolve_columns = hasattr(self, 'resolve_columns')
-        if resolve_columns:
-            from django.db.models.fields import DateTimeField, IntegerField
-            fields = [DateTimeField(), IntegerField]
-        else:
-            from django.db.backends.util import typecast_timestamp
-            needs_string_cast = self.connection.features.needs_datetime_string_cast
+        needs_string_cast = self.connection.features.needs_datetime_string_cast
-        offset = len(self.query.extra_select)
         for rows in self.execute_sql(MULTI):
             for row in rows:
-                if resolve_columns:
-                    vals = self.resolve_columns(row, fields)
-                elif needs_string_cast:
+                if needs_string_cast:
                     vals = [typecast_timestamp(str(row[0])),
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.