mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00
Code Issues 32 Releases Wiki Activity

[boulder-oracle-sprint] more management.py fixes to case-insensitive database backends (i.e. Oracle)

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@3989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2006-11-04 21:42:37 +00:00
parent c5a75d2069
commit e715476a9f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/core/management.py
View File

@ -304,6 +304,10 @@ def get_sql_delete(app):
table_names = introspection.get_table_list(cursor) table_names = introspection.get_table_list(cursor)
else: else:
table_names = [] table_names = []
if backend.uses_case_insensitive_names:
table_name_converter = str.upper
else:
table_name_converter = lambda x: x
output = [] output = []
@ -313,7 +317,7 @@ def get_sql_delete(app):
references_to_delete = {} references_to_delete = {}
app_models = models.get_models(app) app_models = models.get_models(app)
for model in app_models: for model in app_models:
if cursor and model._meta.db_table in table_names: if cursor and table_name_converter(model._meta.db_table) in table_names:
# The table exists, so it needs to be dropped # The table exists, so it needs to be dropped
opts = model._meta opts = model._meta
for f in opts.fields: for f in opts.fields:
@ -323,7 +327,7 @@ def get_sql_delete(app):
to_delete.add(model) to_delete.add(model)
for model in app_models: for model in app_models:
if cursor and model._meta.db_table in table_names: if cursor and table_name_converter(model._meta.db_table) in table_names:
# Drop the table now # Drop the table now
output.append('%s %s;' % (style.SQL_KEYWORD('DROP TABLE'), output.append('%s %s;' % (style.SQL_KEYWORD('DROP TABLE'),
style.SQL_TABLE(backend.quote_name(model._meta.db_table)))) style.SQL_TABLE(backend.quote_name(model._meta.db_table))))
@ -344,7 +348,7 @@ def get_sql_delete(app):
for model in app_models: for model in app_models:
opts = model._meta opts = model._meta
for f in opts.many_to_many: for f in opts.many_to_many:
if cursor and f.m2m_db_table() in table_names: if cursor and table_name_converter(f.m2m_db_table()) in table_names:
output.append("%s %s;" % (style.SQL_KEYWORD('DROP TABLE'), output.append("%s %s;" % (style.SQL_KEYWORD('DROP TABLE'),
style.SQL_TABLE(backend.quote_name(f.m2m_db_table())))) style.SQL_TABLE(backend.quote_name(f.m2m_db_table()))))
@ -469,7 +473,7 @@ get_sql_all.args = APP_ARGS
def syncdb(verbosity=1, interactive=True): def syncdb(verbosity=1, interactive=True):
"Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created." "Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
from django.db import connection, transaction, models, get_creation_module from django.db import backend, connection, transaction, models, get_creation_module
from django.db.models import signals from django.db.models import signals
from django.conf import settings from django.conf import settings
from django.dispatch import dispatcher from django.dispatch import dispatcher
@ -494,6 +498,10 @@ def syncdb(verbosity=1, interactive=True):
# Get a list of all existing database tables, # Get a list of all existing database tables,
# so we know what needs to be added. # so we know what needs to be added.
table_list = _get_table_list() table_list = _get_table_list()
if backend.uses_case_insensitive_names:
table_name_converter = str.upper
else:
table_name_converter = lambda x: x
# Get a list of already installed *models* so that references work right. # Get a list of already installed *models* so that references work right.
seen_models = _get_installed_models(table_list) seen_models = _get_installed_models(table_list)
@ -507,7 +515,7 @@ def syncdb(verbosity=1, interactive=True):
# Create the model's database table, if it doesn't already exist. # Create the model's database table, if it doesn't already exist.
if verbosity >= 2: if verbosity >= 2:
print "Processing %s.%s model" % (app_name, model._meta.object_name) print "Processing %s.%s model" % (app_name, model._meta.object_name)
if model._meta.db_table in table_list: if table_name_converter(model._meta.db_table) in table_list:
continue continue
sql, references = _get_sql_model_create(model, seen_models) sql, references = _get_sql_model_create(model, seen_models)
seen_models.add(model) seen_models.add(model)
@ -519,7 +527,7 @@ def syncdb(verbosity=1, interactive=True):
print "Creating table %s" % model._meta.db_table print "Creating table %s" % model._meta.db_table
for statement in sql: for statement in sql:
cursor.execute(statement) cursor.execute(statement)
table_list.append(model._meta.db_table) table_list.append(table_name_converter(model._meta.db_table))
for model in model_list: for model in model_list:
if model in created_models: if model in created_models: