Commit c7a1a9f3 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Changed the handling of as_sql() versus _as_sql() in Query/QuerySet from r9928. 

This avoids inadvertently hiding AttributeError that is raised for other
reasons.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f5063914

django/db/models/fields/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -198,9 +198,9 @@ class Field(object): 
            # be invoked before the final SQL is evaluated

            if hasattr(value, 'relabel_aliases'):

                return value

            try:

            if hasattr(value, 'as_sql'):

                sql, params = value.as_sql()

            except AttributeError:

            else:

                sql, params = value._as_sql()

            return QueryWrapper(('(%s)' % sql), params)

django/db/models/fields/related.py

+2 −2
Original line number Diff line number Diff line
@@ -145,9 +145,9 @@ class RelatedField(object): 
            # be invoked before the final SQL is evaluated

            if hasattr(value, 'relabel_aliases'):

                return value

            try:

            if hasattr(value, 'as_sql'):

                sql, params = value.as_sql()

            except AttributeError:

            else:

                sql, params = value._as_sql()

            return QueryWrapper(('(%s)' % sql), params)