Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
17,751 Commits 26 Branches 382 Tags
Commit Graph

10804 Commits

Author SHA1 Message Date
Andrew Godwin
08218252d8 [1.7.x] Fixed #22487: Optional rollback emulation for migrated apps 
Conflicts:
	django/db/backends/creation.py
	django/test/runner.py
	docs/ref/settings.txt
	docs/topics/testing/advanced.txt
 2014-06-08 19:33:52 -07:00
Andrew Godwin
55fa4c2d34 [1.7.x] Fixed #22777: Add dependency on through for autodetected M2M adds 2014-06-08 17:13:11 -07:00
Aymeric Augustin
25f4e71ed3 [1.7.x] Gave unique names to SpatialRefSysModels. 
Prevented clashes in the app registry.

Fixed #22790. Thanks timo for the report.

Backport of 6e5651e from master
 2014-06-08 21:17:59 +02:00
Andrew Godwin
b568bdf8da [1.7.x] Fixed #22750, #22248: Model renaming now also alters field FKs 2014-06-07 18:18:18 -07:00
Tim Graham
83fe38ae30 [1.7.x] Removed usage of deprecated django.utils.importlib. 
Backport of 1e84d261d6 from master
 2014-06-07 21:11:17 -04:00
Víðir Valberg Guðmundsson
3fc4f03895 [1.7.x] Fixed #22749: Making SQL management commands migration aware. 2014-06-07 17:18:43 -07:00
Andrew Godwin
98949e3b10 [1.7.x] Fixed #22436: More careful checking on method ref'ce serialization 2014-06-07 17:06:06 -07:00
Simon Charette
2b13576c8f [1.7.x] Fixed #22772 -- Defer wizard temporary files deletion. 
Backport of e2112edd9a from master
 2014-06-07 19:57:58 -04:00
Aymeric Augustin
211ff288a0 [1.7.x] Fixed #20815 -- Don't enforce unbuffered I/O on Python 3. 
No test because this code is already deprecated (part of FastCGI support).

Backport of 5836a577 from master
 2014-06-07 22:35:29 +02:00
Tim Graham
c81847181c [1.7.x] Fixed flake8 errors. 
Backport of b5a54168f9 from master
 2014-06-06 08:29:56 -04:00
Claude Paroz
b236a55818 [1.7.x] Fixed #22773 -- Forced templatize() to return unicode 
Backport of daaeb84158 from master.
 2014-06-06 08:43:24 +02:00
Andrew Godwin
7d388956ce [1.7.x] Prevent operation pollution by later operations of fields 2014-06-05 23:34:44 -07:00
Chris Beaven
9f1c4e4d3f [1.7.x] Implement Migration.run_before 
This attribute (used for reverse dependencies) was previously declared
and mentioned in the code, but never actually used.
 2014-06-05 23:28:17 -07:00
Andrew Godwin
31fc34e447 [1.7.x] Rewrote migration autodetector to involve actual computer science. 
Fixes #22605, #22735; also lays the ground for some other fixes.

Conflicts:
	django/db/migrations/autodetector.py
 2014-06-05 23:27:21 -07:00
Aymeric Augustin
c9aedce01a Replaced an explicit vendor check by a feature flag. 2014-06-06 00:31:22 +02:00
Aymeric Augustin
342b25449d [1.7.x] Added a flag for the ability to introspect nullable fields. 
Previously this was conflated with another Oracle-specific behavior.

Backport of a03d38d from master.
 2014-06-05 17:57:48 +02:00
Alexandr Shurigin
8d6e0d4588 [1.7.x] Fixed #22681 -- Made TarArchive recognize leading directories properly. 
Backport of 083d285b82 from master
 2014-06-03 15:03:32 -04:00
Egor Semiguzov
206cb74cef [1.7.x] Removed erroneous trailing comma in OLMapWidget.js. 
Backport of c5226eb72a from master
 2014-06-03 07:44:39 -04:00
Craig de Stigter
724e600872 [1.7.x] Fixed #22690 -- Added a check for proxy models containing fields. 
Removed the FieldError raised by ModelBase.__new__ in this case.

Backport of ce993efda8 from master
 2014-06-02 09:34:31 -04:00
Tim Graham
f8dd382a48 [1.7.x] Revert "Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices" 
This reverts commit 9d1987d7679165ad3a7c2b713a8a488cc1421905.

Backport of 5046c110cf from master
 2014-06-02 07:13:03 -04:00
Claude Paroz
a2fb5c9d69 [1.7.x] Fixed #22744 -- Fixed sqlite3 get_relations introspection with views 
Thanks Tim Graham for the report and Simon Charette for the review.
Backport of 5a504a5311 from master.
 2014-06-01 22:07:22 +02:00
Vincent-Vega
d773a08b27 [1.7.x] Fixed #22711 -- Adjusted ordering checks to allow implicit relation fields. 
refs #19195.

Backport of d04e730224 from master
 2014-06-01 15:37:57 -04:00
Simon Charette
33511662dd [1.7.x] Fixed #22659 -- Prevent model states from sharing field instances. 
Thanks to Trac alias tbartelmess for the report and the test project.

Backport of 7a38f88922 from master
 2014-06-01 15:12:23 -04:00
Fabio Rueda
ad408d0985 [1.7.x] Fixed syntax error in ogrinspect.py management command. 
Backport of f384b638e2 from master
 2014-06-01 13:22:15 -04:00
Florian Apolloner
ba31e45f08 [1.7.x] Revert "Making SQL management commands migration aware." 
This reverts commit cb9c9a7b5879671053c7d2ad6e79943a8814b274.

Backport of 83e7555ffee305c1ea1e0655fd1f0aa35269533f from master.
 2014-06-01 12:01:29 +02:00
Simon Charette
c95a3fadb7 [1.7.x] Fixed #22299 -- Cleanup wizard temp files when possible. 
Thanks to @erikr for the review.

Backport of fa8b4735287c92b03d23823de8a4e1168d1951d9 from master.
 2014-05-30 22:25:17 +02:00
Florian Apolloner
e3792bb95f [1.7.x] Fixed #19905 -- Fixed leakage of file descriptors in form wizard. 
Backport of c4c2c99669ef9d58306856c47058b121bbecfe5f from master.
 2014-05-30 22:00:25 +02:00
Moayad Mardini
e4eae5df0e [1.7.x] Fixed #22682 -- makemigrations will create MIGRATION_MODULES package 
`makemigrations` will automatically create the package specified
in `MIGRATION_MODULES` if it doesn't already exist.

Thanks ovidiuc4 for the report.
 2014-05-29 15:39:02 -07:00
Andrew Godwin
4956e182ac [1.7.x] Fix test failure caused by 3149cdce32e7261b2d44128ab712c4d4f1a5d429 2014-05-29 15:36:49 -07:00
Víðir Valberg Guðmundsson
b6a960cd1d [1.7.x] Making SQL management commands migration aware. 2014-05-29 15:36:30 -07:00
Alex Gaynor
3d98941d5c [1.7.x] Fixed several typos in Django 
Backport of 1dcc603eff from master
 2014-05-29 07:53:02 -04:00
Alex Gaynor
d099c03789 [1.7.x] Simplified, very slightly, some code in the oracle backend 
Backport of e79725cdf9 from master
 2014-05-29 07:52:55 -04:00
Víðir Valberg Guðmundsson
0ee27d5b62 [1.7.x] Fixed #22720 -- Migrations attempt to create _order twice. 
Backport of 6cfa2fae39 from master
 2014-05-29 07:52:17 -04:00
Shai Berger
b8b1fbd4c1 [1.7.x] Set straight the sense of 'uppercases_column_names' feature flag 2014-05-28 21:26:08 +03:00
Shai Berger
5f135e6a0b [1.7.x] Fixed #22715: Corrected sql for defaults of BinaryField on Oracle with Python3 
While at it, fixed a problem in returning empty values
(still with BinaryField/Oracle/Python3).

Backport of fd427f1 from master
 2014-05-28 19:02:29 +03:00
Claude Paroz
91ef348bd6 [1.7.x] Fixed #21630 -- Simplified management command discovery 
Thanks Aymeric Augustin for the report end the review.
Backport of fe53bc524 from master.
 2014-05-28 09:35:43 +02:00
Aymeric Augustin
430faebe3b [1.7.x] Fixed #22699 -- Configure default settings in some management commands. 
This makes it possible to run django.setup() in management commands that
don't need a settings module. In addition it simplifies error handling.

Thanks Claude for the review.

Backport of 4865326f from master.
 2014-05-27 21:46:30 +02:00
Moayad Mardini
c0a56001e0 [1.7.x] Fixed #22675 -- makemigrations --dry-run to output migrations to stdout. 
`makemigrations --dry-run` will output the complete migrations file
that would be written if it's used along with `--verbosity 3`.

Backport of 2e613ea5c5 from master
 2014-05-26 20:03:41 -04:00
Florian Apolloner
099625d760 [1.7.x] Removed executeable bit from a few files. 
Backport of 9d1bf8f841af27c70d1fa5817e88d893ce7c0507 from master.
 2014-05-25 23:17:18 +02:00
Claude Paroz
0c685ab64f [1.7.x] Removed code deprecated from Django 1.2 
Backport of 2779c299c8 from master.
 2014-05-25 21:26:44 +02:00
Moayad Mardini
a59870e217 [1.7.x] Fixed #22676 -- makemigrations --dry-run should not ask for defaults 
Made the fix in InteractiveMigrationQuestioner class code, rather than
MigrationAutodetector, because --dry-run shouldn't affect whether
MigrationAutodetector will detect non-nullable fields, but the
questioner should skip the question and returns a None for default
(since that won't be used anyway) if --dry-run is used.

Backport of ee14961a2a from master
 2014-05-24 09:56:43 -04:00
Marc Tamlyn
be733bf672 [1.7.x] Fixed #22510 -- Harden field removal to only None. 
Refs #8620.

If we allow any value to remove form fields then we get name clashes
with method names, media classes etc. There was a backwards
incompatibility introduced meaning ModelForm subclasses with declared
fields called media or clean would lose those fields.

Field removal is now only permitted by using the sentinel value None.
The docs have been slightly reworded to refer to removal of fields
rather than shadowing.

Thanks to gcbirzan for the report and initial patch, and several of the
core team for opinions.

Backport of 9fb0f5dddc4cf7f2d294af1bcde2c359cffd90a5 from master
 2014-05-24 13:11:50 +01:00
Claude Paroz
cdfefbec72 [1.7.x] Applied unicode_literals to makemessages command 
This also fixes #22686 as some sort of side-effect.
Backport of dbb48d2bb99 from master.
 2014-05-24 13:12:56 +02:00
Claude Paroz
e692c5818b [1.7.x] Removed translatability of PIL error messages 
Note these are no longer in master anyway.
 2014-05-24 12:19:49 +02:00
Moayad Mardini
7d4a51e239 [1.7.x] Fixed #22679 -- Fixed empty tuple serialization in MigrationWriter. 
Thanks rockallite.wulf for the report.

Backport of ad994a3c5b5911a12a5e2f2a8d06c036be1b8ad8 from master.
 2014-05-22 16:20:21 +02:00
Ramiro Morales
fb45e666c2 [1.7.x] Fixed #22421 -- Regression in fixtures loading. 
Loading fixtures were failing since the refactoring in 244e2b71f5 for
inheritance setups where the chain contains abstract models and the
root ancestor contains a M2M relation.

Thanks Stanislas Guerra for the report.

Refs #20946.

Backport of 862e1ff234 from master
 2014-05-22 07:38:39 -04:00
Andrew Godwin
fd62bc165c [1.7.x] Fixed #22432: SQLite M2M repointing now works. Thanks to xelnor. 
Backport of 03900a02d5 from master
 2014-05-21 07:04:46 -04:00
Andrew Godwin
d8c532036a [1.7.x] Fixed #22649: Beefed up quote_value 
Backport of 125b3d4407 from master
 2014-05-21 07:04:46 -04:00
Loic Bistuer
d61b6224b0 [1.7.x] Fixed #22424 -- Fixed handling of default values for TextField/BinaryField on MySQL. 
Thanks syphar for the review and suggestions.

Backport of 1d3d01b4f7 from master
 2014-05-21 07:04:38 -04:00
Raphaël Barrois
1a29675d76 [1.7.x] Fixed #22626 -- Allow BinaryField defaults with SQlite. 
Also fixes a slight issue in sqlite3.schema._remake_table where
default values where quoted with "column name" quoting rules.

Reference for quoting: http://www.sqlite.org/lang_expr.html

Thanks Shai Berger for the review. Refs #22424.

Backport of 6aacb4c991 from master
 2014-05-21 06:57:49 -04:00