Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare for 1.3 release #269

Merged
merged 23 commits into from
May 31, 2023
Merged

Prepare for 1.3 release #269

merged 23 commits into from
May 31, 2023

Conversation

mShan0
Copy link
Contributor

@mShan0 mShan0 commented May 30, 2023

Adds support for Django 4.2

Skips the following tests:

'aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_empty_condition',
'aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_ref_multiple_subquery_annotation',
'aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_ref_subquery_annotation',

"aggregation.tests.AggregateAnnotationPruningTests.test_referenced_group_by_annotation_kept"

'aggregation.tests.AggregateTestCase.test_group_by_nested_expression_with_params',

'expressions.tests.BasicExpressionsTests.test_aggregate_subquery_annotation',

'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_order_with_null_first_last',
'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_with_select_related_and_order',

'expressions_window.tests.WindowFunctionTests.test_limited_filter',

'schema.tests.SchemaTests.test_remove_ignored_unique_constraint_not_create_fk_index'

maikhanhbui and others added 21 commits February 15, 2023 17:34
@maikhanhbui
Allow Django 4.2 (#227)
0a51811 
* Allow Django 4.2

* allow Django 4.2
@maikhanhbui
Fix errors with raising FullResultSet exception and with alter_column…
81018de 
…_type_sql() and collate_sql() functions (#229)

* fix error with raising fullresultset

* add django4.2 condition

* fix alter_column_type_sql and collate_sql to take 2 additional arguments

* delete argument 'old_rel_collation'

* fix arguments names
@maikhanhbui
fix last_executed_query() to properly replace placeholders with params (
06e0788 
#234)
@mShan0
disable allows_group_by_select_index
6875151
@mShan0
unskip old tests
9ac7c2f
@mShan0
unskip some tests
9816cdf
@mShan0
skip more tests
8e5c9cd
@mShan0
Merge pull request #236 from microsoft/fix-aggregate-tests
895909c 
disable allows_group_by_select_index in `features.py`
@maikhanhbui
Merge branch 'dev' of github.com:microsoft/mssql-django into django42
127838e
@mShan0
Use latest Django 4.2 beta for tox (#238)
303859c
@mShan0
use 4.2 rc1 branch (#240)
e196f5a
@maikhanhbui
allow partial support for filtering against window functions (#239)
5a630ba
@maikhanhbui
add subsecond support to Now() (#242)
adc1409
@maikhanhbui
assign value to display_size (#244)
0c4d052
@mShan0
add latest django 4.2 branch to ci
f9a1b43
@mShan0
add latest django 4.2 branch to ci
b311485
@maikhanhbui
raise an error when batch_size is zero. (#259)
4a37e32
@mShan0
replicate get or create test for mssql (#265)
3375f3a
@maikhanhbui @mShan0
Add skipped tests to Django 4.2 (#268)
0a2664a 
* skip django 4.2 failing tests

* skip schema test

* skip aggregate annotation pruning test

---------

Co-authored-by: mShan0 <mark.shan19@gmail.com>
@mShan0
Merge branch 'dev' into django42
f2d82e9
@mShan0
syntax fix
a3e895b
@mShan0 mShan0 marked this pull request as ready for review May 31, 2023 16:56
@mShan0 mShan0 changed the title Prepare for Django 4.2 release Prepare for 1.3 release May 31, 2023
absci
absci suggested changes May 31, 2023
View reviewed changes
Copy link
Contributor

@absci absci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 1.3?
https://github.com/microsoft/mssql-django/pull/269/files#diff-60f61ab7a8d1910d86d9fda2261620314edcae5894d5aaa236b821c7256badd7L29

@mShan0
Copy link
Contributor Author

mShan0 commented May 31, 2023

Should this be 1.3? https://github.com/microsoft/mssql-django/pull/269/files#diff-60f61ab7a8d1910d86d9fda2261620314edcae5894d5aaa236b821c7256badd7L29

Good point. Fixed

@mShan0 mShan0 merged commit 422cc3d into dev May 31, 2023
@sparrowt
Copy link
Contributor

These mega squash merges make the git history less useful 😢 e.g. the git blame for all the changes in this PR simply says "Prepare for 1.3 release" which is much less helpful than having the original commit message & PR.

Would it be possible to avoid this in future please? This has happened before albeit at the dev->master point (#129).

@mShan0
Copy link
Contributor Author

mShan0 commented Jun 30, 2023

@sparrowt That was a mistake on our end. Thanks for letting us know, will be fixed for next release

@mShan0 mShan0 deleted the django42 branch December 22, 2023 18:17
@mShan0 mShan0 restored the django42 branch December 22, 2023 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@absci absci absci approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mShan0 @sparrowt @absci @maikhanhbui