Ticket #16092: 16092-testcase.patch

regressiontests/extra_regress/tests.py

@@ -2 +2 @@
 
 from django.utils.datastructures import SortedDict
 
+from django.db import models
 from django.contrib.auth.models import User
 from regressiontests.extra_regress.models import TestObject, Order, \
-        RevisionableModel
+        RevisionableModel, FilterModel
 
 import datetime
 
@@ -312 +313 @@
                TestObject.objects.extra(where=["id > %s"], params=[obj.pk]),
             ['<TestObject: TestObject: first,second,third>']
         )
+
+    def test_regression_16092(self):
+        f1 = FilterModel.objects.create(
+                timezone_name='America/New_York',
+                cutoff=datetime.datetime(2038, 1, 1, 0, 0, 0))
+        f2 = FilterModel.objects.create(
+                timezone_name='America/Los_Angeles',
+                cutoff=datetime.datetime(2000, 1, 1, 0, 0, 0))
+
+        qs = FilterModel.objects.extra(select={'now_in_local_tz':
+                "convert_tz(now(), 'GMT', test_model.timezone_name)"})
+        qs = qs.filter(cutoff__lte=models.F('now_in_local_tz'))
+        self.assertQuerysetEqual(qs, [f2])
+    
+ No newline at end of file

regressiontests/extra_regress/models.py

@@ -37 +37 @@
     def __unicode__(self):
         return u'TestObject: %s,%s,%s' % (self.first,self.second,self.third)
 
+class FilterModel(models.Model):
+    timezone_name = models.CharField(max_length=200)
+    cutoff = models.DateTimeField()