Changeset 5399

Timestamp:

06/01/07 01:19:01 (1 year ago)

Author:

mtredinnick

Message:

unicode: Merged from trunk up to [5398].

Files:

• django/branches/unicode (modified) (1 prop)
• django/branches/unicode/django/db/models/query.py (modified) (3 diffs)
• django/branches/unicode/django/oldforms/__init__.py (modified) (1 diff)
• django/branches/unicode/django/template/defaulttags.py (modified) (2 diffs)
• django/branches/unicode/django/test/_doctest.py (copied) (copied from django/trunk/django/test/_doctest.py)
• django/branches/unicode/django/test/doctest.py (deleted)
• django/branches/unicode/django/test/simple.py (modified) (1 diff)
• django/branches/unicode/django/test/testcases.py (modified) (1 diff)
• django/branches/unicode/docs/testing.txt (modified) (2 diffs)
• django/branches/unicode/tests/modeltests/lookup/models.py (modified) (1 diff)

django/branches/unicode/django/db/models/query.py

@@ -556 +556 @@
-    def __init__(self, *args, **kwargs):
-        super(ValuesQuerySet, self).__init__(*args, **kwargs)
-and select are
+is
-        self._select_related = False
-        self._select = {}
-
-    def iterator(self):
@@ -568 +567 @@
-        # self._fields is a list of field names to fetch.
-        if self._fields:
-
+
+
+
+
+
+
+
+
+
+
+
-            field_names = self._fields
-        else: # Default to all fields.
@@ -575 +584 @@
-
-        select = ['%s.%s' % (backend.quote_name(self.model._meta.db_table), backend.quote_name(c)) for c in columns]
+
+        # Add any additional SELECTs.
+        if self._select:
+            select.extend(['(%s) AS %s' % (quote_only_if_word(s[1]), backend.quote_name(s[0])) for s in self._select.items()])
+
-        cursor = connection.cursor()
-        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)

django/branches/unicode/django/oldforms/__init__.py

@@ -793 +793 @@
-            import decimal 
-        except ImportError:
-
+_decimal as 
-        try: 
-            return decimal.Decimal(data) 

django/branches/unicode/django/template/defaulttags.py

@@ -239 +239 @@
-        output = [] # list of dictionaries in the format {'grouper': 'key', 'list': [list of contents]}
-        for obj in obj_list:
-Context({'var': obj})
+obj
-            # TODO: Is this a sensible way to determine equality?
-            if output and repr(output[-1]['grouper']) == repr(grouper):
@@ -849 +849 @@
-        raise TemplateSyntaxError, "next-to-last argument to 'regroup' tag must be 'as'"
-
-'var.%s' % 
+
-
-    var_name = lastbits_reversed[0][::-1]

django/branches/unicode/django/test/simple.py

@@ -1 @@
-, doctest
+
-from django.conf import settings
+from django.test import _doctest as doctest
-from django.test.utils import setup_test_environment, teardown_test_environment
-from django.test.utils import create_test_db, destroy_test_db

django/branches/unicode/django/test/testcases.py

@@ -1 @@
-doctest, 
+
-from urlparse import urlparse
-from django.db import transaction
-from django.core import management, mail
-from django.db.models import get_apps
+from django.test import _doctest as doctest
-from django.test.client import Client
-

django/branches/unicode/docs/testing.txt

@@ -148 +148 @@
-"pythonic". It's designed to make writing tests as easy as possible, so
-there's no overhead of writing classes or methods; you simply put tests in
-en
+ing
-documentation -- well-written doctests can kill both the documentation and the
-testing bird with a single stone.
@@ -580 +580 @@
-details of these advanced settings.
-
-.txt
+/
-
-The test database is created by the user in the ``DATABASE_USER`` setting.

django/branches/unicode/tests/modeltests/lookup/models.py

@@ -132 +132 @@
-[('headline', u'Article 1'), ('id', 1)]
-
+
+# you can use values() even on extra fields
+>>> for d in Article.objects.extra( select={'id_plus_one' : 'id + 1'} ).values('id', 'id_plus_one'):
+...     i = d.items()
+...     i.sort()
+...     i
+[('id', 5), ('id_plus_one', 6)]
+[('id', 6), ('id_plus_one', 7)]
+[('id', 4), ('id_plus_one', 5)]
+[('id', 2), ('id_plus_one', 3)]
+[('id', 3), ('id_plus_one', 4)]
+[('id', 7), ('id_plus_one', 8)]
+[('id', 1), ('id_plus_one', 2)]
+
+# however, an exception FieldDoesNotExist will still be thrown 
+# if you try to access non-existent field (field that is neither on the model nor extra)
+>>> Article.objects.extra( select={'id_plus_one' : 'id + 1'} ).values('id', 'id_plus_two')
+Traceback (most recent call last):
+    ...
+FieldDoesNotExist: Article has no field named 'id_plus_two'
+
-# if you don't specify which fields, all are returned
->>> list(Article.objects.filter(id=5).values()) == [{'id': 5, 'headline': 'Article 5', 'pub_date': datetime(2005, 8, 1, 9, 0)}]