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

Merge down hotfixes to unstable #4071

Merged
merged 13 commits into from
May 30, 2023
Merged

Conversation

bjester
Copy link
Member

@bjester bjester commented May 11, 2023

Summary

🚨 This PR requires manual developer intervention 🚨 if you've ran migrations since f1bba23. If you see the following error when running migrations, follow one of the resolution options below.

django.db.utils.ProgrammingError: column "deleted" of relation "contentcuration_user" already exists

Here are the options for resolution:

  1. If you run Studio's postgres service through docker (make dcservicesup), and:
    a) you do not care about retaining the data in your database, run the following:
    make dcservicesdown
    make dcclean # warning: this deletes the database
    make dcservicesup
    make migrate # separate terminal
    b) you do care about retaining the data in your database, run the following:
    git checkout unstable # or working branch where you encountered the issue
    make dcservicesup # separate terminal
    git checkout v2023.05.10
    python contentcuration/manage.py migrate contentcuration 0140_delete_task
    git checkout unstable # or working branch where you encountered the issue
    make migrate
  2. If you run Studio's postgres service on your host or by another means:
git checkout v2023.05.10
python contentcuration/manage.py migrate contentcuration 0140_delete_task
git checkout unstable # or working branch where you encountered the issue
make migrate

Description of the change(s) you made

  • Merges down hotfixes to unstable
  • Corrects migration re-ordering in prior merge down (will likely cause issues on the unstable server)

Manual verification steps performed

  1. Ran migrations

Manual steps required for

References

#3936

Testing:

  • Code is clean and well-commented
  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@bjester bjester requested a review from rtibbles May 11, 2023 14:32
@bjester bjester merged commit a4cdf4f into learningequality:unstable May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants