Changeset 1483

Timestamp:

11/28/05 19:04:28 (3 years ago)

Author:

adrian

Message:

Fixed #490 -- Fixed incorrect handling of cursor.rowcount in yet-unused database_check functionality. Thanks, Eugene

Files:

• django/trunk/django/core/management.py (modified) (4 diffs)

django/trunk/django/core/management.py

@@ -264 +264 @@
-get_sql_all.args = APP_ARGS
-
+def has_no_records(cursor):
+    "Returns True if the cursor, having executed a query, returned no records."
+    # This is necessary due to an inconsistency in the DB-API spec.
+    # cursor.rowcount can be -1 (undetermined), according to
+    # http://www.python.org/peps/pep-0249.html
+    if cursor.rowcount < 0:
+        return cursor.fetchone() is None
+    return cursor.rowcount < 1
+
-def database_check(mod):
-    "Checks that everything is properly installed in the database for the given module."
@@ -273 +282 @@
-    cursor.execute("SELECT 1 FROM %s WHERE %s = %%s" % \
-        (db.db.quote_name('packages'), db.db.quote_name('label')), [app_label])
-cursor.rowcount < 1
+has_no_records(cursor)
-#         sys.stderr.write("The '%s' package isn't installed.\n" % app_label)
-        print _get_packages_insert(app_label)
@@ -289 +298 @@
-                (db.db.quote_name('auth_permissions'), db.db.quote_name('package'),
-                db.db.quote_name('codename')), (app_label, codename))
-cursor.rowcount < 1
+has_no_records(cursor)
-#                 sys.stderr.write("The '%s.%s' permission doesn't exist.\n" % (app_label, codename))
-                print _get_permission_insert(name, codename, opts)
@@ -295 +304 @@
-            (db.db.quote_name('content_types'), db.db.quote_name('package'),
-            db.db.quote_name('python_module_name')), (app_label, opts.module_name))
-cursor.rowcount < 1
+has_no_records(cursor)
-#             sys.stderr.write("The '%s.%s' content type doesn't exist.\n" % (app_label, opts.module_name))
-            print _get_contenttype_insert(opts)