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.

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

Merge release 2.2.2 into 2.3.x #2356

Merged
merged 29 commits into from
Aug 5, 2021
Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 5, 2021

buffcode and others added 28 commits February 3, 2021 15:01
Caching / unserializing ClassMetadata broke locking functionality

Fixes #2278
Fix locking when ClassMetadata is unserialized
Detach doc text from code block
Update working-with-objects.rst
Update storage-strategies.rst
Fix invalid strict comparison when validating mappings
Fix documentation for uploadFromFile
Fix mapping of the nullable option for XML driver
* Fix initialising nullable associations

* Fix error when merging documents with uninitialised typed properties
* Comprehensively test nullable behaviour for embedOne

Co-authored-by: wuchen90 <wu.chen@agriconomie.com>

* Fix handling of nullable fields for upsert

Co-authored-by: wuchen90 <wu.chen@agriconomie.com>
* Fix handling of upserts during scheduling for deletion

* Added test
This was uncovered by Psalm testing when merging 2.2.x up into 2.3.x.
* Added a test, expecting the hint option to propagate from Query->execute to Collection->find

Changed test to move hint from options to query array

* Included hint query option for find queries.

* Added a test to Builder to make sure hints are present in both the builder and the resulting query
* 2.2.x:
  Fix wrong assertion (#2335)
  Fix handling of upserts during scheduling for deletion (#2334)
  Fix wrong handling for nullable fields in upsert and update (#2318)
  [2.2] Fix builds (#2319)
  Allow mixed value in $not operator (#2307)
  Fix errors with nullable typed associations (#2302)
  Fix using null values in partial filter expressions (#2300)
  Fix preparation of $elemMatch operators in queries (#2298)
  Fix query preparation when in elemMatch (#2299)
  Fix mapping of the nullable option for XML driver
  Fix documentation for uploadFromFile
  Correctly handle write concern specified in defaultCommitOptions (#2294)
  Fix invalid strict comparison when validating mappings
  Update storage-strategies.rst
  Update working-with-objects.rst
  Test serialization of lock/version fields
  Fix locking when ClassMetadata is unserialized
* 2.2.x:
  allow to reset hydration setting for Aggregation (#2353)
  Fix missing hint query option during find (#2351)
  Ignore unreachable statement (#2352)
@alcaeus alcaeus enabled auto-merge August 5, 2021 13:10
@alcaeus
Copy link
Member

alcaeus commented Aug 5, 2021

While I previously already merged in 2.2.x in #2350, I used the squash commit option when merging, which messed up the history. I manually rebuilt this branch using the following commands:

git checkout 2.2.x-merge-up-into-2.3.x_iA5R4YuE
git reset --hard 2.3.x
# This is the commit I had merged in the previous PR
git merge --strategy=ours 2.2.x-previously-merged
# This is the latest 2.2.x state
git merge 2.2.x

@alcaeus alcaeus requested a review from franmomu August 5, 2021 14:30
@alcaeus alcaeus merged commit 76eac01 into 2.3.x Aug 5, 2021
@alcaeus alcaeus deleted the 2.2.x-merge-up-into-2.3.x_iA5R4YuE branch August 5, 2021 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.