Changeset 3246

Timestamp:

06/30/06 20:14:41 (2 years ago)

Author:

russellm

Message:

Fixed #2217 -- Allowed raw objects to be used in exact and in query terms. Existing use of primary keys in query terms is preserved.

Files:

• django/trunk/django/db/models/fields/related.py (modified) (1 diff)
• django/trunk/django/db/models/query.py (modified) (2 diffs)
• django/trunk/django/db/models/related.py (modified) (1 diff)
• django/trunk/tests/modeltests/many_to_many/models.py (modified) (3 diffs)
• django/trunk/tests/modeltests/many_to_one/models.py (modified) (4 diffs)
• django/trunk/tests/modeltests/one_to_one/models.py (modified) (4 diffs)

django/trunk/django/db/models/fields/related.py

@@ -79 +79 @@
-        self.contribute_to_related_class(other, related)
-
+    def get_db_prep_lookup(self, lookup_type, value):
+        # If we are doing a lookup on a Related Field, we must be 
+        # comparing object instances. The value should be the PK of value, 
+        # not value itself.
+        def pk_trace(value):
+            # Value may be a primary key, or an object held in a relation. 
+            # If it is an object, then we need to get the primary key value for
+            # that object. In certain conditions (especially one-to-one relations),
+            # the primary key may itself be an object - so we need to keep drilling
+            # down until we hit a value that can be used for a comparison.
+            v = value
+            try:
+                while True:
+                    v = getattr(v, v._meta.pk.name)
+            except AttributeError:
+                pass
+            return v 
+            
+        if lookup_type == 'exact':
+            return [pk_trace(value)]
+        if lookup_type == 'in':
+            return [pk_trace(v) for v in value]
+        elif lookup_type == 'isnull':
+            return []
+        raise TypeError, "Related Field has invalid lookup: %s" % lookup_type
+            
-    def _get_related_query_name(self, opts):
-        # This method defines the name that can be used to identify this related object

django/trunk/django/db/models/query.py

@@ -842 +842 @@
-
-    if path:
+        # There are elements left in the path. More joins are required.
-        if len(path) == 1 and path[0] in (new_opts.pk.name, None) \
-            and clause in ('exact', 'isnull') and not join_required:
-
-
-
-
+
+
+
+
+
-            new_table = current_table
-        else:
@@ -873 +875 @@
-        params.extend(params2)
-    else:
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            column = current_column
-        else:
+            # Last query term was a normal field.
-            column = field.column
-

django/trunk/django/db/models/related.py

@@ -71 +71 @@
-            return [None] * self.field.rel.num_in_admin
-
+    def get_db_prep_lookup(self, lookup_type, value):
+        # Defer to the actual field definition for db prep
+        return self.field.get_db_prep_lookup(lookup_type, value)
+        
-    def editable_fields(self):
-        "Get the fields in this class that should be edited inline."

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

@@ -76 +76 @@
->>> Article.objects.filter(publications__pk=1)
-[<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
+>>> Article.objects.filter(publications=1)
+[<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
+>>> Article.objects.filter(publications=p1)
+[<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
-
->>> Article.objects.filter(publications__title__startswith="Science")
@@ -90 +94 @@
-1
-
+>>> Article.objects.filter(publications__in=[1,2]).distinct()
+[<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
+>>> Article.objects.filter(publications__in=[1,p2]).distinct()
+[<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
+>>> Article.objects.filter(publications__in=[p1,p2]).distinct()
+[<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
+
-# Reverse m2m queries are supported (i.e., starting at the table that doesn't
-# have a ManyToManyField).
@@ -102 +113 @@
->>> Publication.objects.filter(article__id__exact=1)
-[<Publication: The Python Journal>]
-
->>> Publication.objects.filter(article__pk=1)
-[<Publication: The Python Journal>]
+>>> Publication.objects.filter(article=1)
+[<Publication: The Python Journal>]
+>>> Publication.objects.filter(article=a1)
+[<Publication: The Python Journal>]
+
+>>> Publication.objects.filter(article__in=[1,2]).distinct()
+[<Publication: Highlights for Children>, <Publication: Science News>, <Publication: Science Weekly>, <Publication: The Python Journal>]
+>>> Publication.objects.filter(article__in=[1,a2]).distinct()
+[<Publication: Highlights for Children>, <Publication: Science News>, <Publication: Science Weekly>, <Publication: The Python Journal>]
+>>> Publication.objects.filter(article__in=[a1,a2]).distinct()
+[<Publication: Highlights for Children>, <Publication: Science News>, <Publication: Science Weekly>, <Publication: The Python Journal>]
-
-# If we delete a Publication, its Articles won't be able to access it.

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

@@ -152 +152 @@
-
-# Find all Articles for the Reporter whose ID is 1.
+# Use direct ID check, pk check, and object comparison 
->>> Article.objects.filter(reporter__id__exact=1)
-[<Article: John's second story>, <Article: This is a test>]
->>> Article.objects.filter(reporter__pk=1)
-[<Article: John's second story>, <Article: This is a test>]
+>>> Article.objects.filter(reporter=1)
+[<Article: John's second story>, <Article: This is a test>]
+>>> Article.objects.filter(reporter=r)
+[<Article: John's second story>, <Article: This is a test>]
+
+>>> Article.objects.filter(reporter__in=[1,2]).distinct()
+[<Article: John's second story>, <Article: Paul's story>, <Article: This is a test>]
+>>> Article.objects.filter(reporter__in=[r,r2]).distinct()
+[<Article: John's second story>, <Article: Paul's story>, <Article: This is a test>]
-
-# You need two underscores between "reporter" and "id" -- not one.
@@ -169 +179 @@
-TypeError: Cannot resolve keyword 'reporter_id' into field
-
-# "pk" shortcut syntax works in a related context, too.
->>> Article.objects.filter(reporter__pk=1)
-[<Article: John's second story>, <Article: This is a test>]
-
-# You can also instantiate an Article by passing
-# the Reporter's ID instead of a Reporter object.
@@ -201 +207 @@
->>> Reporter.objects.filter(article__pk=1)
-[<Reporter: John Smith>]
+>>> Reporter.objects.filter(article=1)
+[<Reporter: John Smith>]
+>>> Reporter.objects.filter(article=a)
+[<Reporter: John Smith>]
+
+>>> Reporter.objects.filter(article__in=[1,4]).distinct()
+[<Reporter: John Smith>]
+>>> Reporter.objects.filter(article__in=[1,a3]).distinct()
+[<Reporter: John Smith>]
+>>> Reporter.objects.filter(article__in=[a,a3]).distinct()
+[<Reporter: John Smith>]
+
->>> Reporter.objects.filter(article__headline__startswith='This')
-[<Reporter: John Smith>, <Reporter: John Smith>, <Reporter: John Smith>]
@@ -216 +234 @@
-[<Reporter: John Smith>, <Reporter: John Smith>, <Reporter: John Smith>, <Reporter: John Smith>]
->>> Reporter.objects.filter(article__reporter__first_name__startswith='John').distinct()
+[<Reporter: John Smith>]
+>>> Reporter.objects.filter(article__reporter__exact=r).distinct()
-[<Reporter: John Smith>]
-

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

@@ -95 +95 @@
->>> Restaurant.objects.get(place__exact=1)
-<Restaurant: Demon Dogs the restaurant>
+>>> Restaurant.objects.get(place__exact=p1)
+<Restaurant: Demon Dogs the restaurant>
+>>> Restaurant.objects.get(place=1)
+<Restaurant: Demon Dogs the restaurant>
+>>> Restaurant.objects.get(place=p1)
+<Restaurant: Demon Dogs the restaurant>
->>> Restaurant.objects.get(place__pk=1)
-<Restaurant: Demon Dogs the restaurant>
@@ -106 +112 @@
->>> Place.objects.get(restaurant__place__exact=1)
-<Place: Demon Dogs the place>
+>>> Place.objects.get(restaurant__place__exact=p1)
+<Place: Demon Dogs the place>
->>> Place.objects.get(restaurant__pk=1)
+<Place: Demon Dogs the place>
+>>> Place.objects.get(restaurant=1)
+<Place: Demon Dogs the place>
+>>> Place.objects.get(restaurant=r)
+<Place: Demon Dogs the place>
+>>> Place.objects.get(restaurant__exact=1)
+<Place: Demon Dogs the place>
+>>> Place.objects.get(restaurant__exact=r)
-<Place: Demon Dogs the place>
-
@@ -116 +132 @@
-
-# Query the waiters
+>>> Waiter.objects.filter(restaurant__place__pk=1)
+[<Waiter: Joe the waiter at Demon Dogs the restaurant>]
->>> Waiter.objects.filter(restaurant__place__exact=1)
+[<Waiter: Joe the waiter at Demon Dogs the restaurant>]
+>>> Waiter.objects.filter(restaurant__place__exact=p1)
-[<Waiter: Joe the waiter at Demon Dogs the restaurant>]
->>> Waiter.objects.filter(restaurant__pk=1)
@@ -124 +144 @@
->>> Waiter.objects.filter(pk=1)
-[<Waiter: Joe the waiter at Demon Dogs the restaurant>]
+>>> Waiter.objects.filter(restaurant=1)
+[<Waiter: Joe the waiter at Demon Dogs the restaurant>]
+>>> Waiter.objects.filter(restaurant=r)
+[<Waiter: Joe the waiter at Demon Dogs the restaurant>]
-
-# Delete the restaurant; the waiter should also be removed