Fixed #14030 -- Allowed annotations to accept all expressions

1 files changed, 0 insertions, 66 deletions

diff --git a/django/db/models/sql/datastructures.py b/django/db/models/sql/datastructures.py
index f9c9c259de..321451ac42 100644
--- a/django/db/models/sql/datastructures.py
+++ b/django/db/models/sql/datastructures.py
@@ -4,33 +4,6 @@ the SQL domain.
 """
 
 
-class Col(object):
-    def __init__(self, alias, target, source):
-        self.alias, self.target, self.source = alias, target, source
-
-    def as_sql(self, qn, connection):
-        return "%s.%s" % (qn(self.alias), qn(self.target.column)), []
-
-    @property
-    def output_field(self):
-        return self.source
-
-    def relabeled_clone(self, relabels):
-        return self.__class__(relabels.get(self.alias, self.alias), self.target, self.source)
-
-    def get_group_by_cols(self):
-        return [(self.alias, self.target.column)]
-
-    def get_lookup(self, name):
-        return self.output_field.get_lookup(name)
-
-    def get_transform(self, name):
-        return self.output_field.get_transform(name)
-
-    def prepare(self):
-        return self
-
-
 class EmptyResultSet(Exception):
     pass
 
@@ -49,42 +22,3 @@ class MultiJoin(Exception):
 
 class Empty(object):
     pass
-
-
-class Date(object):
-    """
-    Add a date selection column.
-    """
-    def __init__(self, col, lookup_type):
-        self.col = col
-        self.lookup_type = lookup_type
-
-    def relabeled_clone(self, change_map):
-        return self.__class__((change_map.get(self.col[0], self.col[0]), self.col[1]))
-
-    def as_sql(self, qn, connection):
-        if isinstance(self.col, (list, tuple)):
-            col = '%s.%s' % tuple(qn(c) for c in self.col)
-        else:
-            col = self.col
-        return connection.ops.date_trunc_sql(self.lookup_type, col), []
-
-
-class DateTime(object):
-    """
-    Add a datetime selection column.
-    """
-    def __init__(self, col, lookup_type, tzname):
-        self.col = col
-        self.lookup_type = lookup_type
-        self.tzname = tzname
-
-    def relabeled_clone(self, change_map):
-        return self.__class__((change_map.get(self.col[0], self.col[0]), self.col[1]))
-
-    def as_sql(self, qn, connection):
-        if isinstance(self.col, (list, tuple)):
-            col = '%s.%s' % tuple(qn(c) for c in self.col)
-        else:
-            col = self.col
-        return connection.ops.datetime_trunc_sql(self.lookup_type, col, self.tzname)