diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-21 23:43:35 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-21 23:43:35 +0000 |
| commit | 5866875547515bd8a1f7082404414602cf112355 (patch) | |
| tree | fc77cdf8f4e39c11c06c400772ffe2ab0696e964 | |
| parent | b5dc7945bd7de5bc2784d69a5e82e7fc1f069de8 (diff) | |
Fixed #13396 -- Modified the SQLite introspection code to avoid a problem with unconsumed cursors on PyPy. Thanks to Alex Gaynor for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/backends/sqlite3/introspection.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/introspection/tests.py | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py index ce64908873..c243e58c8e 100644 --- a/django/db/backends/sqlite3/introspection.py +++ b/django/db/backends/sqlite3/introspection.py @@ -66,7 +66,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): relations = {} # Schema for this table - cursor.execute("SELECT sql FROM sqlite_master WHERE tbl_name = %s", [table_name]) + cursor.execute("SELECT sql FROM sqlite_master WHERE tbl_name = %s AND type = %s", [table_name, "table"]) results = cursor.fetchone()[0].strip() results = results[results.index('(')+1:results.rindex(')')] diff --git a/tests/regressiontests/introspection/tests.py b/tests/regressiontests/introspection/tests.py index 10250294c5..2a81aa8736 100644 --- a/tests/regressiontests/introspection/tests.py +++ b/tests/regressiontests/introspection/tests.py @@ -5,11 +5,6 @@ from django.utils import functional from models import Reporter, Article -try: - set -except NameError: - from sets import Set as set # Python 2.3 fallback - # # The introspection module is optional, so methods tested here might raise # NotImplementedError. This is perfectly acceptable behavior for the backend @@ -76,8 +71,10 @@ class IntrospectionTests(TestCase): def test_get_table_description_types(self): cursor = connection.cursor() desc = connection.introspection.get_table_description(cursor, Reporter._meta.db_table) - self.assertEqual([datatype(r[1], r) for r in desc], - ['IntegerField', 'CharField', 'CharField', 'CharField', 'BigIntegerField']) + self.assertEqual( + [datatype(r[1], r) for r in desc], + ['IntegerField', 'CharField', 'CharField', 'CharField', 'BigIntegerField'] + ) # Regression test for #9991 - 'real' types in postgres if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'].startswith('django.db.backends.postgresql'): |