mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Code Issues 25 Releases Wiki Activity
11,065 Commits 28 Branches 426 Tags 666 MiB
233cdcf424
Commit Graph

617 Commits

Author SHA1 Message Date
Ramiro Morales
da5c766dbb Tweaked test added in r16873 so it also works with Oracle. 
* Changed invalid fixture from trying to insert a NULL value in a
  null=False CharField to try with a DateTimeField instead because our
  Oracle backend allows NULLs for CharFields than can be blank and that
  insert wouldn't generate an error.

* cx_Oracle raises a
  `DatabaseError: Could not load fixtures.Article(pk=1): ORA-01407: cannot update ("USER_DEFAULT"."FIXTURES_ARTICLE"."PUB_DATE") to NULL'`
  instead of an IntegrityError like the rest of the DB-API drivers we
  support, changed the error message we test for to start simply with
  'Error' to catch both messages.

  We might want to consider converting DatabaseError to IntegrityError
  in the backend when the error code is ORA-1407.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 03:29:07 +00:00
Aymeric Augustin
b7f2aba566 Fixed a test that relied on the database to reject invalid data; MySQL doesn't. Refs #17055. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 14:30:43 +00:00
Julien Phalip
d3cd9c0d06 Made an AutoField test more robust. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 06:57:25 +00:00
Aymeric Augustin
c582609c8d Modified the tablespaces tests so that they no longer rely on settings.DEFAULT_INDEX_TABLESPACE being empty. Refs #12308. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-15 15:54:53 +00:00
Aymeric Augustin
a8e1d134a5 Fixed a test failure introduced at r16987. Refs #12308. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-15 09:00:31 +00:00
Aymeric Augustin
246580573d Fixed #12308 -- Added tablespace support to the PostgreSQL backend. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 21:49:43 +00:00
Alex Gaynor
69e1e6187a Switch several assertNumQueries to use the context manager, which is much more beautiful. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 17:03:08 +00:00
Alex Gaynor
d5a45d79fe Convert all modeltests to use absolute imports, rather than relative ones. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 18:04:12 +00:00
Alex Gaynor
43920cd32e Remove a handful of import * from the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 12:53:02 +00:00
Julien Phalip
c58e5724bc Fixed a couple of assert syntax warnings mistakingly introduced in r16966 and added some tests to prevent future regressions. Thanks to Anssi Kääriäinen for the report. 
Refs #12467.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 11:53:59 +00:00
Julien Phalip
3b22c68343 Fixed #12467 -- Made the model data validation for DateField and DateTimeField more useful by actually telling what was the value that failed. Also did a bit of PEP8 cleanup in the area. Thanks to knutin for the report, to raulcd for the initial patch and to charettes for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 08:11:00 +00:00
Luke Plant
052a011ee6 Fixed #17003 - prefetch_related should support foreign keys/one-to-one 
Support for `GenericForeignKey` is also included.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 16:05:53 +00:00
Luke Plant
662eea116f Fixed #16937 - added QuerySet.prefetch_related to prefetch many related objects. 
Many thanks to akaariai for lots of review and feedback, bug finding,
additional unit tests and performance testing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 23:14:52 +00:00
Ian Kelly
21a449168b Fixed #16645: fixed a broken test to work in Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 21:40:56 +00:00
Ramiro Morales
bf05da876a Fixed #8160 -- Made sure modelformset_factory takes in account fields' and exclude` ModelForm options. 
Thanks Andrew McMurry for the report and Claude Paroz for creating these tests.

(Actually, this had been fixed in r10619 but the tests added then exercise the
code in the context of ModelAdmin. This commit adds more generic tests.)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 20:53:39 +00:00
Luke Plant
5009e45dfe Fixed #14270 - related manager classes should be cached 
Thanks to Alex Gaynor for the report and initial patch, and mrmachine for
more work on it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:41:25 +00:00
Paul McMillan
4dab2d2f6b Fixed a typo in test docstring. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 23:30:05 +00:00
Gabriel Hurley
39bbd1653a Fixed #7198 (again) -- Corrects a problem with string interpolation from r16876 and adds tests for the new error message. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 21:09:00 +00:00
Paul McMillan
0bd0bb7c22 Refs r16873 and #16026 -- Missed adding the fixture. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 05:56:47 +00:00
Paul McMillan
1d96d886e7 Fixed #16026 -- loaddata now identifies which object triggered an error. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 04:30:20 +00:00
Ramiro Morales
26b8122087 Fixed #14675 -- Completed removal of from django.conf.urls.default import * usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
Russell Keith-Magee
8d6c251731 Fixed #16592 -- More test changes and documentation to account for MySQL's casual relationship with sanity. Thanks to Jim Dalton for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 20:06:10 +00:00
Russell Keith-Magee
161c6328a0 Fixed #16490 -- Skipped a test failure that only occurs under Python 2.6.1 (it's the old iteration-eats-exceptions problem). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 18:44:33 +00:00
Russell Keith-Magee
eb297583b1 Refs #16490 - Add a commit to ensure that a fresh read is provided; this is only a problem for databases in REPEATABLE READ mode, which is MySQL InnoDB's default. Thanks to Jim Dalton for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 17:29:33 +00:00
Russell Keith-Magee
5f287f75f2 Altered the behavior of URLField to avoid a potential DOS vector, and to avoid potential leakage of local filesystem data. A security announcement will be made shortly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 00:47:00 +00:00
Malcolm Tredinnick
bb99fe46b7 Fix test from r16678 and r16681 properly for Oracle. 
Fixes #16694, with thanks to aagustin for the Oracle testing and
tweaking.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-25 09:23:49 +00:00
Malcolm Tredinnick
ec1226b83f Added another test to confirm fix in r16663. 
This is the test case from #6045, which was fixed by the above commit.
Refs #6045, #16299

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-24 03:51:33 +00:00
Malcolm Tredinnick
75ddbf77a6 Teach "django-admin.py validate" to forbid nullable primary keys. 
Fixes #15884, with thanks to JustinTArthur and Julie Pichon.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 23:43:29 +00:00
Russell Keith-Magee
8b87a94357 Corrected the setup and teardown of the refactored invalid_models test so that it guarantees that stdout is restored, and purges all the temporary models from the app cache after running the test. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 15:36:40 +00:00
Malcolm Tredinnick
7182cd2284 Allow "pk" as a field alias in QuerySet.only() calls. 
Thanks to GDorn for the patch. Fixed #15494.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 06:29:01 +00:00
Russell Keith-Magee
a39066ba0b Fixed #16299 -- Ensure that unicode strings can be used to identify classes in ForeignKey and ManyToManyFields. Unicode strings aren't actually legal as class names, but this is an issue if you use from __future__ import unicode_literals in your models.py file. Thanks to Martijn Bastiaan for the report, and Anthony Briggs for the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 05:12:31 +00:00
Russell Keith-Magee
1e72b1c5c1 Fixed #16681 -- Refactored the invalid_models unit test so that it can be invoked manually. Thanks to Anthony Briggs for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 04:25:07 +00:00
Malcolm Tredinnick
c471d471bf Improved error message display during validation errors. 
When reporting a validation error (during model validation or fixture
loading, for example), the error messages now report the bad value as
well as the expected type. This can make identifying the offending field
and problem a bit easier.

Fixed #11595. Patch from raulcd and wildfire with supervision from
Russell.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-22 00:48:53 +00:00
Ramiro Morales
4df45418f2 Fixed #16644 -- Fixed one additional test that was failing in Oracle due to false assumptions about the primary keys of objects. Thanks Aymeric Augustin for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-21 18:09:08 +00:00
Jannis Leidel
351d5da69b Fixed #4617 -- Added raise_exception option to permission_required decorator to be able to raise a PermissionDenied exception instead of redirecting to the login page. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:41 +00:00
Jannis Leidel
bce890ace4 Fixed #16584 -- Fixed a bunch of typos in code comments. Thanks, Bernhard Essl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:14:15 +00:00
Ramiro Morales
e9a909e30a Fixed #16593 -- Refactored proxy_model_inheritance fixture setup to minimize the chances of leaving a modified INSTALLED_APPS setting for tests ran after it if setUp fails. Thanks Jim Dalton for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-10 22:34:45 +00:00
Karen Tracey
be87f0b0ec Fixed #3615: Added support for loading fixtures with forward references on database backends (such as MySQL/InnoDB) that do not support deferred constraint checking. Many thanks to jsdalton for coming up with a clever solution to this long-standing issue, and to jacob, ramiro, graham_king, and russellm for review/testing. (Apologies if I missed anyone else who helped here.) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-07 00:43:26 +00:00
Jannis Leidel
24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-13 09:35:51 +00:00
Ramiro Morales
87eb3a25aa Removed superflous commented-out lines. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-04 12:23:12 +00:00
Ramiro Morales
6b31300057 Renamed a test model field added in [16345] so it doesn't keep the test DB ceation process from finishing under Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 22:15:39 +00:00
Ramiro Morales
1d270ac8a3 Reverted [14563] because it introduced a dependency from core on a contrib app (contenttypes). Fixes #16283, Refs #3055. Thanks TheRoSS for the report and Aymeric Augustin for finding the problem. 
This caused models shipped with some contrib apps to pollute the namespace when user's apps had the same name (e.g. auth, sites), even when these contrib apps weren't installed.

This undesired loading of contrib apps happened when model validation was executed, for example when running management commands that set or inherit `requires_model_validation=True`:
cleanup, dumpdata, flush, loaddata, reset, runfcgi, sql, sqlall, sqlclear, sqlcustom, sqlflush, sqlindexes, sqlinitialdata, sqlreset, sqlsequencereset, syncdb, createsuperusers, ping_google, collectstatic, findstatic.

This could also cause hard to diagnose problems e.g. when performing reverse URL resolving.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16493 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 16:20:48 +00:00
Jannis Leidel
dbffffa7dc Fixed #5535 -- Allow using an explicit foreign key in get() calls. Thanks, Michal Petrucha. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-28 10:16:18 +00:00
Jannis Leidel
823bac36db Fixed #16246 -- Fixed GenericIPAddressField tests on PostgreSQL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-13 20:15:13 +00:00
Jannis Leidel
bead688a3b Shortened some test model names that were introduced in r16366 to fix running tests on PostgreSQL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-13 17:48:02 +00:00
Russell Keith-Magee
c013c07ed7 Fixed #16243 -- Corrected test suite failure in model_forms when PIL isn't installed 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-13 13:23:49 +00:00
Jannis Leidel
ce3c281090 Fixed #811 -- Added support for IPv6 to forms and model fields. Many thanks to Erik Romijn. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 13:48:24 +00:00
Russell Keith-Magee
4189561820 Fixed #16210 -- Added some missing __future__ imports to support with statements on 2.5. Thanks to Julien Phalip for the report and patch 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-10 14:49:44 +00:00
Russell Keith-Magee
aa5506d6f6 Fixed #16198 -- Ported the model_forms doctests. Our long national nightmare is over. Oh, and we have always been at war with doctests. Thanks to Peter van Kampen and Gregor Müllegger for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-10 14:08:51 +00:00
Ramiro Morales
4dac0883f0 Made with statements added in [16348] compatible with Python 2.5. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-10 12:16:56 +00:00