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

[Fixes #7089] Delete existing table on restore command #7090

Merged
merged 3 commits into from
Mar 17, 2021
Merged

[Fixes #7089] Delete existing table on restore command #7090

merged 3 commits into from
Mar 17, 2021

Conversation

mattiagiupponi
Copy link
Contributor

@mattiagiupponi mattiagiupponi commented Mar 16, 2021

In order to introduce the new feature #7089, now by default, the restore management command will drop the existing table before restoring them.
If the existing tables/resources need to be preserved, the following argument is required:
--soft-reset -> will preserve tables and GeoServer resources

The main code is in utils.py.

I also change this line:

        pg_rstcmd += " -c" if preserve_tables else ""

In order to remove some warnings returned by pg_restore

This strategy is more offensive than conservative, but we can discuss it

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@mattiagiupponi mattiagiupponi requested a review from afabiani March 16, 2021 16:16
@mattiagiupponi mattiagiupponi self-assigned this Mar 16, 2021
@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Mar 16, 2021
@mattiagiupponi mattiagiupponi added this to the 3.2 milestone Mar 16, 2021
@afabiani afabiani added backport 3.3.x PR should be backported to target version backport 3.2.x PR should be backported to target version labels Mar 16, 2021
@mattiagiupponi
Copy link
Contributor Author

Documentation update GeoNode/documentation#86

@afabiani afabiani merged commit 4f1d97c into GeoNode:master Mar 17, 2021
afabiani pushed a commit that referenced this pull request Mar 17, 2021
* [Fixes #7089] Delete existing table on restore command

* [Fixes #7089] Add cascade delete, --soft-restore and preserve_geoserver_resources

* [Fixes #7089] Only --soft-reset is mantained

(cherry picked from commit 4f1d97c)
afabiani pushed a commit that referenced this pull request Mar 17, 2021
* [Fixes #7089] Delete existing table on restore command

* [Fixes #7089] Add cascade delete, --soft-restore and preserve_geoserver_resources

* [Fixes #7089] Only --soft-reset is mantained

(cherry picked from commit 4f1d97c)

# Conflicts:
#	geonode/br/management/commands/utils/utils.py
afabiani pushed a commit to geosolutions-it/geonode that referenced this pull request Mar 17, 2021
…e#7090)

* [Fixes GeoNode#7089] Delete existing table on restore command

* [Fixes GeoNode#7089] Add cascade delete, --soft-restore and preserve_geoserver_resources

* [Fixes GeoNode#7089] Only --soft-reset is mantained

(cherry picked from commit 4f1d97c)

# Conflicts:
#	geonode/br/management/commands/restore.py
#	geonode/br/management/commands/utils/utils.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 3.2.x PR should be backported to target version backport 3.3.x PR should be backported to target version cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants