mirror of
https://github.com/django/django.git
synced 2025-10-30 00:56:09 +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:
@@ -2,7 +2,7 @@
|
||||
import datetime
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
from django.db import models, DEFAULT_DB_ALIAS
|
||||
from django.utils import tzinfo
|
||||
|
||||
CHOICES = (
|
||||
@@ -149,7 +149,9 @@ datetime.datetime(2000, 1, 1, 6, 1, 1)
|
||||
|
||||
"""}
|
||||
|
||||
if settings.DATABASE_ENGINE not in ("mysql", "oracle"):
|
||||
if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] not in (
|
||||
"django.db.backends.mysql",
|
||||
"django.db.backends.oracle"):
|
||||
__test__["timezone-tests"] = """
|
||||
# Saving an updating with timezone-aware datetime Python objects. Regression
|
||||
# test for #10443.
|
||||
@@ -167,4 +169,3 @@ if settings.DATABASE_ENGINE not in ("mysql", "oracle"):
|
||||
1
|
||||
|
||||
"""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user