mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

[multi-db] Removed unused functions from django.core.management. Updated django.core.managment.get_sql_create to allow it to work without an active db connection.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jason Pellerin 2006-08-27 20:45:32 +00:00
parent be589f7034
commit 5a58772a1e
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
django/core/management.py
View File

@ -52,21 +52,6 @@ if sys.platform == 'win32' or sys.platform == 'Pocket PC' or not sys.stdout.isat
def _is_valid_dir_name(s): def _is_valid_dir_name(s):
return bool(re.search(r'^\w+$', s)) return bool(re.search(r'^\w+$', s))
def _get_installed_models(table_list):
"Gets a set of all models that are installed, given a list of existing tables"
from django.db import models
all_models = []
for app in models.get_apps():
for model in models.get_models(app):
all_models.append(model)
return set([m for m in all_models if m._meta.db_table in table_list])
def _get_table_list():
"Gets a list of all db tables that are physically installed."
from django.db import connection, get_introspection_module
cursor = connection.cursor()
return get_introspection_module().get_table_list(cursor)
# If the foreign key points to an AutoField, a PositiveIntegerField or a # If the foreign key points to an AutoField, a PositiveIntegerField or a
# PositiveSmallIntegerField, the foreign key should be an IntegerField, not the # PositiveSmallIntegerField, the foreign key should be an IntegerField, not the
# referred field type. Otherwise, the foreign key should be the same type of # referred field type. Otherwise, the foreign key should be the same type of
@ -114,7 +99,16 @@ def get_sql_create(app):
# not generate invalid SQL (leaving models out of known_models is # not generate invalid SQL (leaving models out of known_models is
# harmless, so we can be conservative). # harmless, so we can be conservative).
manager = model._default_manager manager = model._default_manager
tables = manager.get_table_list() try:
tables = manager.get_table_list()
except (KeyboardInterrupt, SystemExit):
raise
except:
# Something else went wrong -- maybe the database isn't
# running. But we can still generate sql, so use an empty
# table list.
tables = []
installed_models = [ model for model in installed_models = [ model for model in
manager.get_installed_models(tables) manager.get_installed_models(tables)
if model not in app_models ] if model not in app_models ]