From 66c638925845c8dc9f44a65fad4058af2b8d05b0 Mon Sep 17 00:00:00 2001 From: Jason Pellerin Date: Mon, 4 Dec 2006 19:22:35 +0000 Subject: [PATCH] [multi-db] Updated install() to send post_syncdb when called outside of syncdb() git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4153 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/management.py | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/django/core/management.py b/django/core/management.py index c0373fcaf1..45310b91ae 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -289,8 +289,6 @@ def syncdb(verbosity=1, interactive=True): "Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created." from django.conf import settings from django.db import models, transaction - from django.db.models import signals - from django.dispatch import dispatcher disable_termcolors() @@ -313,7 +311,8 @@ def syncdb(verbosity=1, interactive=True): # Install each application (models already installed will be skipped) created, pending = _install(app, commit=False, initial_data=False, pending_allowed=True, pending=pending, - verbosity=verbosity) + verbosity=verbosity, signal=False, + interactive=interactive) if verbosity >= 1: for model in created: print "Created table %s" % model._meta.db_table @@ -328,12 +327,9 @@ def syncdb(verbosity=1, interactive=True): # Send the post_syncdb signal, so individual apps can do whatever they need # to do at this point. for app in models.get_apps(): - if verbosity >= 2: - print "Sending post-syncdb signal for application", app.__name__.split('.')[-2] - dispatcher.send(signal=signals.post_syncdb, sender=app, - app=app, created_models=created_models, - verbosity=verbosity, interactive=interactive) - + _post_syncdb(app, created_models=created_models, + verbosity=verbosity, interactive=interactive) + # Install initial data for the app (but only if this is a model we've # just created) for app in models.get_apps(): @@ -410,7 +406,7 @@ def install(app): _install(app) def _install(app, commit=True, initial_data=True, pending_allowed=False, - pending=None, verbosity=1): + pending=None, verbosity=1, signal=True, interactive=True): from django.db import connection, models, transaction import sys @@ -463,10 +459,26 @@ The full error: """ % (app_name, app_name)) + style.ERROR_OUTPUT(str(e)) + '\n') sys.exit(1) if commit: transaction.commit_unless_managed() + + if signal: + _post_syncdb(app, created_models=created_models, + verbosity=verbosity, interactive=interactive) + return created_models, pending install.help_doc = "Executes ``sqlall`` for the given app(s) in the current database." install.args = APP_ARGS +def _post_syncdb(app, created_models, verbosity=1, interactive=True): + """Send the post_syncdb signal for an application.""" + from django.dispatch import dispatcher + from django.db.models import signals + + if verbosity >= 2: + print "Sending post-syncdb signal for application", app.__name__.split('.')[-2] + dispatcher.send(signal=signals.post_syncdb, sender=app, + app=app, created_models=created_models, + verbosity=verbosity, interactive=interactive) + def reset(app, interactive=True): "Executes the equivalent of 'get_sql_reset' in the current database." from django.db import connection, transaction