| 1 | diff -ru Django-1.0.2-final.orig/django/db/models/sql/query.py Django-1.0.2-final/django/db/models/sql/query.py
|
|---|
| 2 | --- Django-1.0.2-final.orig/django/db/models/sql/query.py 2008-12-02 17:44:49.219356036 -0500
|
|---|
| 3 | +++ Django-1.0.2-final/django/db/models/sql/query.py 2008-12-02 17:45:50.120229647 -0500
|
|---|
| 4 | @@ -1034,8 +1034,8 @@
|
|---|
| 5 | lhs_col = int_opts.parents[int_model].column
|
|---|
| 6 | dedupe = lhs_col in opts.duplicate_targets
|
|---|
| 7 | if dedupe:
|
|---|
| 8 | - avoid.update(self.dupe_avoidance.get(id(opts), lhs_col),
|
|---|
| 9 | - ())
|
|---|
| 10 | + avoid.update(self.dupe_avoidance.get((id(opts), lhs_col),
|
|---|
| 11 | + ()))
|
|---|
| 12 | dupe_set.add((opts, lhs_col))
|
|---|
| 13 | int_opts = int_model._meta
|
|---|
| 14 | alias = self.join((alias, int_opts.db_table, lhs_col,
|
|---|