[soc2010/query-refactor] Cleaned up a TODO in the flush management command, and the resulting landslide of bugs this unveiled in the MongoDB backend.

alex · alex · commit 8f441f09628d · 2010-06-14T19:15:11.000Z
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
@@ -63,6 +63,7 @@ class Permission(models.Model):
 
     Three basic permissions -- add, change and delete -- are automatically created for each Django model.
     """
+    id = models.NativeAutoField(primary_key=True)
     name = models.CharField(_('name'), max_length=50)
     content_type = models.ForeignKey(ContentType)
     codename = models.CharField(_('codename'), max_length=100)
diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
@@ -72,6 +72,7 @@ def _add_to_cache(self, using, ct):
         self.__class__._cache.setdefault(using, {})[ct.id] = ct
 
 class ContentType(models.Model):
+    id = models.NativeAutoField(primary_key=100)
     name = models.CharField(max_length=100)
     app_label = models.CharField(max_length=100)
     model = models.CharField(_('python model class name'), max_length=100)
diff --git a/django/contrib/mongodb/base.py b/django/contrib/mongodb/base.py
@@ -39,7 +39,7 @@ def compiler(self, compiler_name):
             )
         return self._cache[compiler_name]
     
-    def flush(self, only_django=False):
+    def flush(self, style, only_django=False):
         if only_django:
             tables = self.connection.introspection.django_table_names(only_existing=True)
         else:
@@ -68,11 +68,30 @@ def connection(self):
     @property
     def db(self):
         return self.connection[self.settings_dict["NAME"]]
+
+    def close(self):
+        self._connection.disconnect()
+        self._connection = None
     
-    def _rollback(self):
-        # TODO: ???
+    
+    ###########################
+    # TODO: Transaction stuff #
+    ###########################
+    
+    def _enter_transaction_management(self, managed):
+        pass
+
+    def _leave_transaction_management(self, managed):
         pass
     
     def _commit(self):
-        # TODO: ???
+        pass
+    
+    def _rollback(self):
+        pass
+    
+    def _savepoint(self, sid):
+        pass
+    
+    def _savepoint_commit(self, sid):
         pass
diff --git a/django/contrib/mongodb/compiler.py b/django/contrib/mongodb/compiler.py
@@ -34,7 +34,7 @@ def make_atom(self, lhs, lookup_type, value_annotation, params_or_value):
     
     def build_query(self):
         assert not self.query.aggregates
-        assert len(self.query.alias_map) == 1
+        assert len([a for a in self.query.alias_map if self.query.alias_refcount[a]]) == 1
         assert self.query.default_cols
         assert not self.query.distinct
         assert not self.query.extra
diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py
@@ -47,25 +47,20 @@ def handle_noargs(self, **options):
             confirm = 'yes'
 
         if confirm == 'yes':
-            # TODO: HACK, make this more OO.
-            if not getattr(connection.ops, "sql_ddl", True):
-                connection.ops.flush(only_django=True)
-                return
-            sql_list = sql_flush(self.style, connection, only_django=True)
             try:
-                cursor = connection.cursor()
-                for sql in sql_list:
-                    cursor.execute(sql)
+                connection.ops.flush(self.style, only_django=True)
             except Exception, e:
                 transaction.rollback_unless_managed(using=db)
+                raise
                 raise CommandError("""Database %s couldn't be flushed. Possible reasons:
-  * The database isn't running or isn't configured correctly.
-  * At least one of the expected database tables doesn't exist.
-  * The SQL was invalid.
-Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.
-The full error: %s""" % (connection.settings_dict['NAME'], e))
-            transaction.commit_unless_managed(using=db)
-
+      * The database isn't running or isn't configured correctly.
+      * At least one of the expected database tables doesn't exist.
+      * The SQL was invalid.
+    Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.
+    The full error: %s""" % (connection.settings_dict['NAME'], e))
+            else:
+                transaction.commit_unless_managed(using=db)
+            
             # Emit the post sync signal. This allows individual
             # applications to respond as if the database had been
             # sync'd from scratch.
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
@@ -55,7 +55,8 @@ def handle(self, *fixture_labels, **options):
         # Get a cursor (even though we don't need one yet). This has
         # the side effect of initializing the test database (if
         # it isn't already initialized).
-        cursor = connection.cursor()
+        if hasattr(connection, "cursor"):
+            cursor = connection.cursor()
 
         # Start transaction management. All fixtures are installed in a
         # single transaction to ensure that all references are resolved.
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
@@ -111,7 +111,8 @@ class BaseDatabaseOperations(object):
     """
     compiler_module = "django.db.models.sql.compiler"
 
-    def __init__(self):
+    def __init__(self, connection):
+        self.connection = connection
         self._cache = {}
 
     def autoinc_sql(self, table, column):
@@ -473,6 +474,14 @@ def combine_expression(self, connector, sub_expressions):
         """
         conn = ' %s ' % connector
         return conn.join(sub_expressions)
+    
+    def flush(self, style, only_django=False):
+        from django.core.management.sql import sql_flush
+        sql_list = sql_flush(style, self.connection, only_django=True)
+        cursor = self.connection.cursor()
+        for sql in sql_list:
+            cursor.execute(sql)
+
 
 class BaseDatabaseIntrospection(object):
     """
diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py
@@ -43,7 +43,7 @@ class DatabaseWrapper(object):
 
     def __init__(self, settings_dict, alias, *args, **kwargs):
         self.features = BaseDatabaseFeatures()
-        self.ops = DatabaseOperations()
+        self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
         self.creation = BaseDatabaseCreation(self)
         self.introspection = DatabaseIntrospection(self)
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
@@ -254,7 +254,7 @@ def __init__(self, *args, **kwargs):
 
         self.server_version = None
         self.features = DatabaseFeatures()
-        self.ops = DatabaseOperations()
+        self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
         self.creation = DatabaseCreation(self)
         self.introspection = DatabaseIntrospection(self)
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
@@ -332,7 +332,7 @@ def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
 
         self.features = DatabaseFeatures()
-        self.ops = DatabaseOperations()
+        self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
         self.creation = DatabaseCreation(self)
         self.introspection = DatabaseIntrospection(self)
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
@@ -154,7 +154,7 @@ def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
 
         self.features = DatabaseFeatures()
-        self.ops = DatabaseOperations()
+        self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
         self.creation = DatabaseCreation(self)
         self.introspection = DatabaseIntrospection(self)
