Merge updates from upstream #1
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ensure that the unique/unique_together constraint is reinstated exactly the same as the one that was dropped earlier in `_alter_field` This fixes both cases described on the bug report, that is when `AlterField` modifies a column which is: 1) individually `unique=True` as well as `null=True` 2) in a `unique_together` where at least 1 column is nullable
- Support for JSONField - Updates parameter structure for sql_flush - reset_sequences - Add an mssql specific feature flag - supports_order_by_is_nulls
This follows Django 3.1.x's lead in adding `deferrable` as a keyword
argument to the `_create_unique_sql` function, following their
implementation in the schema editor object. Without accepting this
keyword arg, migrations will crash like so:
```
...
File "lib/python3.8/site-packages/django/db/backends/base/schema.py", line 360, in add_constraint
sql = constraint.create_sql(model, self)
File "lib/python3.8/site-packages/django/db/models/constraints.py", line 118, in create_sql
return schema_editor._create_unique_sql(
TypeError: _create_unique_sql() got an unexpected keyword argument 'deferrable'
```
This also adjusts the implementation to call
`self_deferrable_constraint_sql(...)` with the deferrable arg; in this
backend's case the return value is an empty string (like it is currently
hardcoded). Essentially it's the same result but allows flexibility if
this backend ever supported deferrable constraints.
Backwards compatibility is maintained by checking for the passing of a
deferrable keyword argument to the create sql function (not provided on
earlier Django versions before 3.1) and that the database backend
supports deferral for unique indexes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.