--- a/app/django/core/management/commands/syncdb.py Tue Oct 14 12:36:55 2008 +0000
+++ b/app/django/core/management/commands/syncdb.py Tue Oct 14 16:00:59 2008 +0000
@@ -10,9 +10,6 @@
class Command(NoArgsCommand):
option_list = NoArgsCommand.option_list + (
- make_option('--verbosity', action='store', dest='verbosity', default='1',
- type='choice', choices=['0', '1', '2'],
- help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
make_option('--noinput', action='store_false', dest='interactive', default=True,
help='Tells Django to NOT prompt the user for input of any kind.'),
)
@@ -21,10 +18,11 @@
def handle_noargs(self, **options):
from django.db import connection, transaction, models
from django.conf import settings
- from django.core.management.sql import table_names, installed_models, sql_model_create, sql_for_pending_references, many_to_many_sql_for_model, custom_sql_for_model, sql_indexes_for_model, emit_post_sync_signal
+ from django.core.management.sql import custom_sql_for_model, emit_post_sync_signal
verbosity = int(options.get('verbosity', 1))
interactive = options.get('interactive')
+ show_traceback = options.get('traceback', False)
self.style = no_style()
@@ -34,21 +32,24 @@
try:
__import__(app_name + '.management', {}, {}, [''])
except ImportError, exc:
- if not exc.args[0].startswith('No module named management'):
+ # This is slightly hackish. We want to ignore ImportErrors
+ # if the "management" module itself is missing -- but we don't
+ # want to ignore the exception if the management module exists
+ # but raises an ImportError for some reason. The only way we
+ # can do this is to check the text of the exception. Note that
+ # we're a bit broad in how we check the text, because different
+ # Python implementations may not use the same text.
+ # CPython uses the text "No module named management"
+ # PyPy uses "No module named myproject.myapp.management"
+ msg = exc.args[0]
+ if not msg.startswith('No module named') or 'management' not in msg:
raise
cursor = connection.cursor()
- if connection.features.uses_case_insensitive_names:
- table_name_converter = lambda x: x.upper()
- else:
- table_name_converter = lambda x: x
- # Get a list of all existing database tables, so we know what needs to
- # be added.
- tables = [table_name_converter(name) for name in table_names()]
-
# Get a list of already installed *models* so that references work right.
- seen_models = installed_models(tables)
+ tables = connection.introspection.table_names()
+ seen_models = connection.introspection.installed_models(tables)
created_models = set()
pending_references = {}
@@ -60,21 +61,21 @@
# Create the model's database table, if it doesn't already exist.
if verbosity >= 2:
print "Processing %s.%s model" % (app_name, model._meta.object_name)
- if table_name_converter(model._meta.db_table) in tables:
+ if connection.introspection.table_name_converter(model._meta.db_table) in tables:
continue
- sql, references = sql_model_create(model, self.style, seen_models)
+ sql, references = connection.creation.sql_create_model(model, self.style, seen_models)
seen_models.add(model)
created_models.add(model)
for refto, refs in references.items():
pending_references.setdefault(refto, []).extend(refs)
if refto in seen_models:
- sql.extend(sql_for_pending_references(refto, self.style, pending_references))
- sql.extend(sql_for_pending_references(model, self.style, pending_references))
+ sql.extend(connection.creation.sql_for_pending_references(refto, self.style, pending_references))
+ sql.extend(connection.creation.sql_for_pending_references(model, self.style, pending_references))
if verbosity >= 1:
print "Creating table %s" % model._meta.db_table
for statement in sql:
cursor.execute(statement)
- tables.append(table_name_converter(model._meta.db_table))
+ tables.append(connection.introspection.table_name_converter(model._meta.db_table))
# Create the m2m tables. This must be done after all tables have been created
# to ensure that all referred tables will exist.
@@ -83,7 +84,7 @@
model_list = models.get_models(app)
for model in model_list:
if model in created_models:
- sql = many_to_many_sql_for_model(model, self.style)
+ sql = connection.creation.sql_for_many_to_many(model, self.style)
if sql:
if verbosity >= 2:
print "Creating many-to-many tables for %s.%s model" % (app_name, model._meta.object_name)
@@ -96,13 +97,16 @@
# to do at this point.
emit_post_sync_signal(created_models, verbosity, interactive)
+ # The connection may have been closed by a syncdb handler.
+ cursor = connection.cursor()
+
# Install custom SQL for the app (but only if this
# is a model we've just created)
for app in models.get_apps():
app_name = app.__name__.split('.')[-2]
for model in models.get_models(app):
if model in created_models:
- custom_sql = custom_sql_for_model(model)
+ custom_sql = custom_sql_for_model(model, self.style)
if custom_sql:
if verbosity >= 1:
print "Installing custom SQL for %s.%s model" % (app_name, model._meta.object_name)
@@ -110,18 +114,23 @@
for sql in custom_sql:
cursor.execute(sql)
except Exception, e:
- sys.stderr.write("Failed to install custom SQL for %s.%s model: %s" % \
+ sys.stderr.write("Failed to install custom SQL for %s.%s model: %s\n" % \
(app_name, model._meta.object_name, e))
+ if show_traceback:
+ import traceback
+ traceback.print_exc()
transaction.rollback_unless_managed()
else:
transaction.commit_unless_managed()
-
+ else:
+ if verbosity >= 2:
+ print "No custom SQL for %s.%s model" % (app_name, model._meta.object_name)
# Install SQL indicies for all newly created models
for app in models.get_apps():
app_name = app.__name__.split('.')[-2]
for model in models.get_models(app):
if model in created_models:
- index_sql = sql_indexes_for_model(model, self.style)
+ index_sql = connection.creation.sql_indexes_for_model(model, self.style)
if index_sql:
if verbosity >= 1:
print "Installing index for %s.%s model" % (app_name, model._meta.object_name)
@@ -129,7 +138,7 @@
for sql in index_sql:
cursor.execute(sql)
except Exception, e:
- sys.stderr.write("Failed to install index for %s.%s model: %s" % \
+ sys.stderr.write("Failed to install index for %s.%s model: %s\n" % \
(app_name, model._meta.object_name, e))
transaction.rollback_unless_managed()
else: