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

Try to install PostgreSQL extensions automatically (backport #1483) #1506

Merged
merged 6 commits into from
Apr 29, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 28, 2021

This is an automatic backport of pull request #1483 done by Mergify.
Cherry-pick of 7ff40fb has failed:

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

You are currently cherry-picking commit 7ff40fb85.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 14614dc has failed:

On branch mergify/bp/master/pr-1483
Your branch is ahead of 'origin/master' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 14614dcde.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   INSTALL.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out 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 check_db_extensions function will now check if the required
extensions are available to be installed and try to install them
with the database superuser role.

(cherry picked from commit 7ff40fb)

# Conflicts:
#	src/manage_pg.c
The manage_create_sql_functions function now uses check_db_extensions to
ensure all required extensions are installed.

(cherry picked from commit ce35ab2)
To ensure the superuser role name ("dba") is used consistently, it is
now defined as the macro DB_SUPERUSER_ROLE.

(cherry picked from commit d775241)
This point of the installation is now obsolete as the extensions are
installed by gvmd.

(cherry picked from commit 14614dc)

# Conflicts:
#	INSTALL.md
@mergify mergify bot requested a review from a team as a code owner April 28, 2021 10:58
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Apr 28, 2021
This addresses two conflicts:
* The numbering of the instructions in INSTALL.md had to be adjusted for
 the new pg-gvm installation step.
* The check_db_extensions function now includes the check for and the
 creation of the pg-gvm extension.
@timopollmeier timopollmeier added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Apr 29, 2021
@timopollmeier timopollmeier merged commit 5da58c4 into master Apr 29, 2021
@timopollmeier timopollmeier deleted the mergify/bp/master/pr-1483 branch April 29, 2021 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant