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

[automated] Merge branch 'release/8.0' => 'main' #33694

Merged
11 commits merged into from
May 15, 2024

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/8.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/8.0 by the following committers:

  • maumar

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/8.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0-to-main main
git pull https://github.com/dotnet-maestro-bot/EntityFrameworkCore merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main
or if you are using SSH
git checkout -b merge/release/8.0-to-main main
git pull [email protected]:dotnet-maestro-bot/EntityFrameworkCore merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

dotnet-bot and others added 9 commits April 2, 2024 20:10
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce
- **Build**: 20240416.15
- **Date Produced**: April 17, 2024 5:40:43 PM UTC
- **Commit**: 087e15321bb712ef6fe8b0ba6f8bd12facf92629
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.5 to 8.0.5][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.5 to 8.0.5][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdfd075b97471bd97ea70066a299d1fe92af90352&targetVersion=GC087e15321bb712ef6fe8b0ba6f8bd12facf92629&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…onException: The data is NULL at ordinal 0. This method can't be called on NULL values. Check using IsDBNull before calling. (dotnet#33692)

Problem was that we changed the way that we store complex type information in the StructuralTypeProjectionExpression, specifically after performing pushdown. We used to extract all the properties from complex types into a flat list, along with regular properties, but that was wrong - we need to uphold the nested structure. If that STPE with flattened structure would be made nullable, we go through all the properties and mark the column expressions as nullable (which included properties of a complex type). However, in the new regime, we were not making those changes to columns representing complex type in the nested structure. As a result, if those columns were later projected (after pushdown), they would seem to be non-nullable, and could cause errors.

Fix is, during MakeNullable() operation for a complex type StructuralTypeProjectionExpression, to peek inside it's ValueBufferExpression and mark all the columns found there as nullable.

Fixes dotnet#33547
Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

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

Auto-approving branch merge.

vseanreesermsft and others added 2 commits May 14, 2024 10:24
….0-2024-05-14-1024

Merging internal commits for release/8.0
@ajcvickers ajcvickers closed this pull request by merging all changes into dotnet:main in fe06014 May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants