2530735d2d
Fixed a number of flake8 errors -- particularly around unused imports and local variables
2013-09-06 21:56:40 -07:00
839940f27f
Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.
2013-08-21 22:32:04 +01:00
de64c4d6e9
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/core/management/commands/flush.py
django/core/management/commands/syncdb.py
django/db/models/loading.py
docs/internals/deprecation.txt
docs/ref/django-admin.txt
docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
12e9804d16
Rename allow_syncdb to allow_migrate
2013-07-30 12:08:59 +01:00
382c53d7d8
Fixed #18213 -- Allowed empty fixtures (emit a warning rather than raising an exception).
2013-07-29 08:03:51 -04:00
31c13a99bb
Fixed #14300 -- Fixed initial SQL location if models is a package.
...
Thanks al_the_x for the report and fheinz for the draft patch.
2013-07-24 06:56:33 -04:00
c9d07d251f
Fixed loaddata for Django checkouts with non ASCII chars in the name.
2013-06-03 13:18:16 +02:00
6900cb79dc
Fixed small regression from 51aa000378.
...
A test failed if the path to the Django checkout contained a dot.
Refs #20485 .
2013-06-03 11:48:03 +02:00
51aa000378
Fixed #20485 -- Refactored loaddata for speed.
...
Thanks Anssi for reporting this performance bottleneck.
2013-06-02 20:39:45 +02:00
c44a2c40fe
Fixed #18990 -- Loaddata now complains if fixture doesn't exist
...
If the fixture doesn't exist, loaddata will output a warning.
The fixture named "initial_data" is exceptional though; if it
doesn't exist, the warning is not emitted. This allows syncdb and
flush management commands to attempt to load it without causing
spurious warnings.
Thanks to Derega, ptone, dirigeant and d1ffuz0r for contributions
to the ticket.
2013-05-19 11:31:27 +02:00
cc3b3ba93a
Fixed #18990 : Loaddata now complains if fixture doesn't exist
...
The fixture named "initial_data" is exceptional though; if it
doesn't exist, the error is not raised. This allows syncdb and
flush management commands to attempt to load it without causing
an error if it doesn't exist.
2013-05-19 10:56:09 +02:00
3f1efc44f6
Fixed loaddata command, broken in the previous merge.
2013-03-11 15:43:42 +01:00
d04964e70d
Used commit_on_success_unless_managed in loaddata.
2013-03-11 15:05:05 +01:00
ba5138b1c0
Deprecated transaction.commit/rollback_unless_managed.
...
Since "unless managed" now means "if database-level autocommit",
committing or rolling back doesn't have any effect.
Restored transactional integrity in a few places that relied on
automatically-started transactions with a transitory API.
2013-03-11 14:48:54 +01:00
7aacde84f2
Made transaction.managed a no-op and deprecated it.
...
enter_transaction_management() was nearly always followed by managed().
In three places it wasn't, but they will all be refactored eventually.
The "forced" keyword argument avoids introducing behavior changes until
then.
This is mostly backwards-compatible, except, of course, for managed
itself. There's a minor difference in _enter_transaction_management:
the top self.transaction_state now contains the new 'managed' state
rather than the previous one. Django doesn't access
self.transaction_state in _enter_transaction_management.
2013-03-11 14:48:53 +01:00
c91667338a
Fixed #19357 -- Allow non-ASCII chars in filesystem paths
...
Thanks kujiu for the report and Aymeric Augustin for the review.
2012-12-08 11:13:52 +01:00
9e7723f851
Refactor loaddata for readability.
...
Thanks Claude Paroz and Daniel Moisset for review and feedback.
2012-11-17 13:18:01 -03:00
2aac3ce0c6
Cleaned up loaddata command options help text
2012-10-01 14:46:12 -07:00
e7723683dc
Fixed #9279 -- Added ignorenonexistent option to loaddata
...
Thanks to Roman Gladkov for the initial patch and Simon Charette for review.
2012-09-30 23:40:27 -07:00
4353a6163c
Fixed #18196 -- Improved loaddata error messages.
2012-08-21 21:52:25 +02:00
c5ef65bcf3
[py3] Ported django.utils.encoding.
...
* Renamed smart_unicode to smart_text (but kept the old name under
Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
and smart_bytes under Python 2 (which is backwards compatible).
Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
want a str.
2012-08-07 12:00:22 +02:00
4a103086d5
Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
...
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
6fd1950a4e
Fixed #10200 -- Raised CommandError when errors happen in loaddata.
2012-06-07 10:32:10 +02:00
822d6d6dab
Fixed #18325 -- Wrapped self.stdout/stderr in OutputWrapper class
2012-05-19 13:51:54 +02:00
3904b74a3f
Fixed #18013 -- Use the new 'as' syntax for exceptions.
...
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
23d3459761
Fixed #17965 -- Definitely dropped support for Python 2.5. Thanks jonash for the initial patch and Aymeric Augustin for the review.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 08:24:29 +00:00
9383a2761c
Removed with_statement imports, useless in Python >= 2.6. Refs #17965 . Thanks jonash for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 08:02:08 +00:00
4e29b70b9d
Fixed #17530 - Fixture loading with deferred constraints broken for Postgres for fixtures from multiple dirs/files
...
Thanks to claudep for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-14 17:26:32 +00:00
694bc0f22b
Fixed #16397 -- Respected the --traceback flag in BaseCommand. This should make import loops easier to debug. Refs #11667 , #17369 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-11 10:03:09 +00:00
bebbc9e4a5
Made a couple of changes for readability and correctness in loaddata.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-29 22:32:28 +00:00
345be05622
Enhanced loaddata error message printed when no DB fixture is provided.
...
Fixes #7043 by fixing the last code path where a misleading 'No fixtures found.' error message was being shown.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-29 14:47:45 +00:00
59c051d170
Fixed #13760 -- Cleaned up unnecessary default option handling in a bunch of management commands. Thanks to Paul McMillan for the report and to adamv and Claude Paroz for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-23 03:43:43 +00:00
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
ddaca29d3d
Fixed a bunch of imports of the email stdlib module now that we are on Python 2.5 to ease the Python 3 port. Thanks, Martin von Löwis.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-09 16:18:38 +00:00
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
96c11b29bd
Fixed #10215 -- Ensured that there is parity between enter and leave transaction calls in loaddata when commit=False. The test case for this is the fixtures_regress unittests under MyISAM, which were failing previous to this fix. Thanks to MockSoul for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-02 13:56:09 +00:00
c2e3ba3ba0
Fixed #14068 -- Corrected error handling in loaddata when an allow_syncdb method is defined on the router. Thanks to Xavier Ordoquy for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-20 13:57:24 +00:00
72dc12ed06
Rationalized the verbosity levels (including introducing a new super-verbose level) for syncdb, test and loaddata.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 06:58:14 +00:00
5da6aeba17
Fixed #13636 -- Migrated fixtures tests to use unittests, eliminating another set of expensive flush calls. Thanks to Eric Holscher for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-05 05:26:04 +00:00
736afb4705
Fixed #13319 -- Modified the default verbosity level for "no fixtures loaded" messages. Thanks to chtito for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 06:50:53 +00:00
14116bc53e
Fixed #12672 -- Added the ability to configure which applications are available on which database.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-25 12:23:30 +00:00
ff60c5f9de
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
2009-12-22 15:18:51 +00:00
01acd99947
Fixed #6961 - loaddata fails if models is a package instead of a module
...
Thanks to pmd for report, zhaoz, mmalone and justinlilly for patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 14:27:26 +00:00
81dfd1f5f0
Fixed #8055 : Replaced use of traceback.format_exc (new in Python 2.4) with something that works as far back as 2.3.
...
Thanks to Ramiro for diagnosis and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-17 22:15:07 +00:00
4bede45816
Remove some code in loaddata that bails out of searching for fixture files (only when verbosity > 1) as soon as attempting to open any potential fixture file fails. This code looks to have been mistakenly added in r9527; loaddata ought to proceed with attempting to locate other fixture files, regardless of verbosity setting, as it did before r9527.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-14 19:31:26 +00:00
81c8b3c696
Clean up the imports in loaddata.py to match other code whilst I'm in the neighbourhood.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-01 02:21:33 +00:00
153b5a4a3a
Fixed #9723 -- Not all Python distributions contain the bz2 module, so we need to allow for that. Based on a patch from AdamG.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-01 02:20:59 +00:00
714490ba51
Fixed a bug introduced by [9527] -- empty/invalid fixtures were no longer being reported.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-24 22:33:18 +00:00
f4879af2df
Fixed a bug introduced by [9527] -- empty/invalid fixtures were no longer being reported.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-24 21:13:33 +00:00
089ab18c02
Fixed #4924 : added support for loading compressed fixtures. Thanks to Lars Yencken and Jeremy Dunck.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-24 20:42:09 +00:00
Alex Gaynor
Florian Apolloner
Andrew Godwin
Przemek Lewandowski
Tim Graham
Aymeric Augustin
Senko Rasic
Claude Paroz
Ramiro Morales
Preston Holmes
Luke Plant
Julien Phalip
Paul McMillan
Jannis Leidel
Karen Tracey
Russell Keith-Magee
Malcolm Tredinnick
Jacob Kaplan-Moss