Changeset 3667

Timestamp:

08/27/06 14:40:49 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Implemented django.core.managment.syncdb using db access through managers. This required changing the progress messages from prospective ('Installing... ') to retrospective ('Installed ... ').

Files:

• django/branches/multiple-db-support/django/core/management.py (modified) (7 diffs)
• django/branches/multiple-db-support/django/db/models/manager.py (modified) (2 diffs)

django/branches/multiple-db-support/django/core/management.py

@@ -281 +281 @@
-def syncdb(verbosity=2, interactive=True):
-    "Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
-
+
+
-    from django.db.models import signals
-    from django.conf import settings
-    from django.dispatch import dispatcher
-
+
-    disable_termcolors()
-
@@ -291 +291 @@
-    _check_for_validation_errors()
-
-Import the 'management' module within each installed app, to register
-# dispatcher events.
+Create missing models for each app
+created_models = []
-    for app_name in settings.INSTALLED_APPS:
+        # Import the 'management' module within each installed app, to register
+        # dispatcher events.
-        try:
-            __import__(app_name + '.management', '', '', [''])
@@ -299 +301 @@
-            pass
-
-    data_types = get_creation_module().DATA_TYPES
-
-    cursor = connection.cursor()
-
-    # Get a list of all existing database tables,
-    # so we know what needs to be added.
-    table_list = _get_table_list()
-
-    # Get a list of already installed *models* so that references work right.
-    seen_models = _get_installed_models(table_list)
-    created_models = set()
-    pending_references = {}
-
-    for app in models.get_apps():
-        model_list = models.get_models(app)
-        for model in model_list:
-            # Create the model's database table, if it doesn't already exist.
-            if model._meta.db_table in table_list:
-                continue
-            sql, references = _get_sql_model_create(model, seen_models)
-            seen_models.add(model)
-            created_models.add(model)
-            for refto, refs in references.items():
-                try:
-                    pending_references[refto].extend(refs)
-                except KeyError:
-                    pending_references[refto] = refs
-            sql.extend(_get_sql_for_pending_references(model, pending_references))
-            if verbosity >= 2:
-                print "Creating table %s" % model._meta.db_table
-            for statement in sql:
-                cursor.execute(statement)
-            table_list.append(model._meta.db_table)
-
-        for model in model_list:
-            if model in created_models:
-                sql = _get_many_to_many_sql_for_model(model)
-                if sql:
-                    if verbosity >= 2:
-                        print "Creating many-to-many tables for %s model" % model.__name__
-                    for statement in sql:
-                        cursor.execute(statement)
-
-        transaction.commit_unless_managed()
-
-    # Send the post_syncdb signal, so individual apps can do whatever they need
-    # to do at this point.
-    for app in models.get_apps():
+        # Install each application (models already installed will be skipped)
+        created = _install(app, commit=False, initial_data=False)
+        if verbosity >= 2:
+            for model in created:
+                print "Created table %s" % model._meta.db_table
+        created_models.extend(created)
-        dispatcher.send(signal=signals.post_syncdb, sender=app,
-            app=app, created_models=created_models, 
-            verbosity=verbosity, interactive=interactive)
-
-
-
+
+
+
+
+
-        for model in models.get_models(app):
-            if model in created_models:
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-syncdb.args = ''
@@ -423 +386 @@
-def install(app):
-    "Executes the equivalent of 'get_sql_all' in the current database."
+    # Wrap _install to hide the return value so ./manage.py install
+    # doesn't complain about unprintable output.    
+    _install(app)
+
+def _install(app, commit=True, initial_data=True):
-    from django.db import connection, models, transaction
-    import sys
@@ -433 +401 @@
-    _check_for_validation_errors(app)
-
+    created_models = []
-    try:
-        pending = {}
-        for model in models.get_models(app, creation_order=True):
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            if model in pending:
-                for statement in pending.pop(model):
@@ -445 +420 @@
-        if pending:            
-            for model, statements in pending.items():
-
-
+
+
+
-                if model in models_installed:
-                    for statement in statements:
@@ -465 +441 @@
-        transaction.rollback_unless_managed()
-        sys.exit(1)
-
+
+
+
-install.help_doc = "Executes ``sqlall`` for the given app(s) in the current database."
-install.args = APP_ARGS

django/branches/multiple-db-support/django/db/models/manager.py

@@ -131 +131 @@
-        run, pending = builder.get_create_table(self.model)
-        run += builder.get_create_indexes(self.model)
-        if initial_data:
-            run += builder.get_initialdata(self.model)
-        many_many = builder.get_create_many_to_many(self.model)
-
@@ -143 +141 @@
-            else:
-                pending.setdefault(klass, []).extend(statements)
+        if initial_data:
+            self.load_initial_data()
-        return pending
-
+    def load_initial_data(self):
+        """Install initial data for model in db, Returns statements executed.
+        """
+        builder = self.db.get_creation_module().builder
+        statements = builder.get_initialdata(self.model)
+        for statement in statements:
+            statement.execute()
+        return statements
+        
-    def get_installed_models(self, table_list):
-        """Get list of models installed, given a list of tables.