Ticket #2348: patch_with_test.diff

django/db/models/query.py

@@ -836 +836 @@
                 new_column = new_opts.pk.column
                 join_column = field.column
 
-            raise FieldFound
+            # If there are still items on path but this is not a related field, we're stuck.
+            # Add first element of path to current field name so the TypeError raised
+            # below properly identifies the cause of the problem.
+            if path and not field.rel:
+                name += LOOKUP_SEPARATOR + path[0]
+            else:
+                raise FieldFound
 
     except FieldFound: # Match found, loop has been shortcut.
         pass

tests/modeltests/lookup/models.py

@@ -191 +191 @@
 >>> Article.objects.filter(headline__contains='\\')
 [<Article: Article with \ backslash>]
 
-"""}
+# Test added for Ticket #2348
+# Bad lookup parm should produce "Cannot resolve keyword", not "Unbound local error"
+>>> Article.objects.filter(pub_date_year='2005').count()
+Traceback (most recent call last):
+    ...
+TypeError: Cannot resolve keyword 'pub_date_year' into field
+
+"""}