ckan db upgrade fixes
#7681
Merged
ckan db upgrade fixes
#7681
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
User.last_active was introduced in CKAN 2.10. When trying to run `ckan
db ugprade` against a database that was created before that you get the
following error:
sqlalchemy.exc.ProgrammingError: (psycopg2.errors.UndefinedColumn) column user.last_active does not exist
LINE 1: ...ey AS user_reset_key, "user".about AS user_about,
"user".las..
This is caused by the `get_site_user` action call that we do on
`update_config()`. The changes detect this error and continue the
execution, similarly to how we check about a potential race condition.
Otherwise you get an `package_activity_list` action not found error
The ordering changes doesn't seem to affect the actual migration from revisions to activities, it was just copied verbatim from the old VDM code
|
Unrelated failures fixed now note: changes in environment.py don't apply to 2.10 and 2.9 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm working on an upgrade from CKAN 2.5 to 2.10 and found errors that can be solved at the CKAN level
The most potentially controversial is the first commit (8d0d3b3). Basically when calling the magic
get_site_useraction when starting upckan db upgradewe get an error because the python model definesUser.last_activeand that is not present in the database (was introduced on CKAN 2.10). I've followed the same approach that we do to avoid race conditions on that particular situation and added an exception handling.The rest of changes related to the separate script used to migrate the old revisions to activities and should be hopefully self-explanatory:
I think anything that makes life easier for those trying to upgrade it's a good think, so I'm proposing to backport this