Changeset 7502 for django/trunk/tests/modeltests/basic

Timestamp:

04/28/08 16:15:05 (8 months ago)

Author:

adrian

Message:

Changed Query.get_columns() to quote the 'AS' column names in an extra_select situation, to match pre-queryset-refactor behavior. Added unit tests that verify this and provide an example

Files:

• django/trunk/tests/modeltests/basic/models.py (modified) (1 diff)

django/trunk/tests/modeltests/basic/models.py

@@ -399 +399 @@
->>> Article.objects.get(headline='Article 11') in s
-True
+
+# The 'select' argument to extra() supports names with dashes in them, as long
+# as you use values().
+>>> Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1'}).values('headline', 'dashed-value')
+[{'headline': u'Article 11', 'dashed-value': 1}, {'headline': u'Article 12', 'dashed-value': 1}]
+
+# If you use 'select' with extra() and names containing dashes on a query
+# that's *not* a values() query, those extra 'select' values will silently be
+# ignored.
+>>> articles = Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1', 'undashedvalue': '2'})
+>>> articles[0].undashedvalue
+2
-"""