mirror of
https://github.com/django/django.git
synced 2025-08-03 10:34:04 +00:00
Fixed #1142 -- Added multiple database support.
This monster of a patch is the result of Alex Gaynor's 2009 Google Summer of Code project. Congratulations to Alex for a job well done. Big thanks also go to: * Justin Bronn for keeping GIS in line with the changes, * Karen Tracey and Jani Tiainen for their help testing Oracle support * Brett Hoerner, Jon Loyens, and Craig Kimmerer for their feedback. * Malcolm Treddinick for his guidance during the GSoC submission process. * Simon Willison for driving the original design process * Cal Henderson for complaining about ponies he wanted. ... and everyone else too numerous to mention that helped to bring this feature into fruition. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
7ef212af14
commit
ff60c5f9de
231 changed files with 7860 additions and 5668 deletions
|
@ -7,7 +7,7 @@ this behavior by explicitly adding ``primary_key=True`` to a field.
|
|||
"""
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import models, transaction, IntegrityError
|
||||
from django.db import models, transaction, IntegrityError, DEFAULT_DB_ALIAS
|
||||
|
||||
from fields import MyAutoField
|
||||
|
||||
|
@ -156,7 +156,7 @@ True
|
|||
# SQLite lets objects be saved with an empty primary key, even though an
|
||||
# integer is expected. So we can't check for an error being raised in that case
|
||||
# for SQLite. Remove it from the suite for this next bit.
|
||||
if settings.DATABASE_ENGINE != 'sqlite3':
|
||||
if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] != 'django.db.backends.sqlite3':
|
||||
__test__["API_TESTS"] += """
|
||||
# The primary key must be specified, so an error is raised if you try to create
|
||||
# an object without it.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue