Django

Code

Changeset 4770

Show
Ignore:
Timestamp:
03/21/07 17:28:48 (1 year ago)
Author:
bouldersprinters
Message:

boulder-oracle-sprint: Fix lookup unit test by catching EmptyResultSet? and
returning StopIteration?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/boulder-oracle-sprint/django/db/backends/oracle/base.py

    r4758 r4770  
    235235 
    236236    from django.db import backend, connection 
     237    from django.db.models.query import EmptyResultSet 
    237238 
    238239    class OracleQuerySet(DefaultQuerySet): 
    …… 
    249250            full_query = None 
    250251 
    251             select, sql, params, full_query = self._get_sql_clause(get_full_query=True) 
     252            try: 
     253                try: 
     254                    select, sql, params, full_query = self._get_sql_clause(get_full_query=True) 
     255                except TypeError: 
     256                    select, sql, params = self._get_sql_clause() 
     257            except EmptyResultSet: 
     258                raise StopIteration 
    252259            if not full_query: 
    253260                full_query = "SELECT %s%s\n%s" % \