diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2013-02-23 00:00:41 +0200 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2013-02-23 00:09:48 +0200 |
| commit | 8a99d718f7db2d018a37f78a8e5639ff2d1d2aa8 (patch) | |
| tree | 561339aebf91e1262ced9398f28c139d2279f7a5 /django/db/models | |
| parent | b17a572eb36acfa59cdf001c4ed3b965ade2b7a7 (diff) | |
[1.5.x] Fixed empty strings + to_field regression on Oracle
Querying the reverse side of nullable to_field relation, where both
sides can contain null values resulted in incorrect results. The reason
was not detecting '' as NULL.
Refs #17541, backpatch of 09fcb70c804b76fccc8fc0ac545873e5ab30c00a.
Diffstat (limited to 'django/db/models')
| -rw-r--r-- | django/db/models/fields/related.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 387d447ff6..95c865df22 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -1,6 +1,6 @@ from operator import attrgetter -from django.db import connection, router +from django.db import connection, connections, router from django.db.backends import util from django.db.models import signals, get_model from django.db.models.fields import (AutoField, Field, IntegerField, @@ -497,7 +497,8 @@ class ForeignRelatedObjectsDescriptor(object): except (AttributeError, KeyError): db = self._db or router.db_for_read(self.model, instance=self.instance) qs = super(RelatedManager, self).get_query_set().using(db).filter(**self.core_filters) - if getattr(self.instance, attname) is None: + val = getattr(self.instance, attname) + if val is None or val == '' and connections[db].features.interprets_empty_strings_as_nulls: # We don't want to use qs.none() here, see #19652 return qs.filter(pk__in=[]) qs._known_related_objects = {rel_field: {self.instance.pk: self.instance}} |
