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

Also create owner WITH clause for single resources (bp #1406) #1415

Merged
merged 3 commits into from
Feb 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 8, 2021

This is an automatic backport of pull request #1406 done by Mergify.

Cherry-pick of 69f484d has failed:

On branch mergify/bp/master/pr-1406
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 69f484d09.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/manage_acl.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/manage_sql.c

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

The function init_get_iterator2_with will now also use acl_where_owned
to generate a WITH clause in case permissions_subject is used in a
subquery.
The init_result_get_iterator_severity had to be adjusted to not generate
the same WITH clause twice.

This change fixes an error getting details pages for types use the
WITH clauses for permission checks.

(cherry picked from commit 69f484d)

# Conflicts:
#	src/manage_sql.c
@mergify mergify bot requested a review from a team as a code owner February 8, 2021 15:48
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Feb 8, 2021
@timopollmeier timopollmeier merged commit 94d5a0a into master Feb 8, 2021
@mergify mergify bot deleted the mergify/bp/master/pr-1406 branch February 8, 2021 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts This backport pull request has merge conflicts that need to be resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant