Skip to content

Rename values in SiteConfiguration/History (1/3) (retry) - #23144

Merged
pwnage101 merged 1 commit into
masterfrom
pwnage101/rename_site_configuration_siteconfiguration_values_1.1
Feb 21, 2020
Merged

Rename values in SiteConfiguration/History (1/3) (retry)#23144
pwnage101 merged 1 commit into
masterfrom
pwnage101/rename_site_configuration_siteconfiguration_values_1.1

Conversation

@pwnage101

Copy link
Copy Markdown
Contributor

This reverts commit 84de6bc
which reverts commit cebeab4
which implements the first stage of the values column rename in
SiteConfiguration. However, I included a small change:

This time, we set a default value on the new site_values column so
that the ORM will happily deserialize the JSONField without throwing a
JSONDecodeError.

DENG-18

This reverts commit 84de6bc
which reverts commit cebeab4
which implements the first stage of the `values` column rename in
SiteConfiguration.  However, I included a small change:

This time, we set a default value on the new `site_values` column so
that the ORM will happily deserialize the JSONField without throwing a
JSONDecodeError.
@pwnage101
pwnage101 requested review from a team February 19, 2020 17:04
@pwnage101
pwnage101 requested a review from a team as a code owner February 19, 2020 17:04
@pwnage101
pwnage101 requested a review from a team February 19, 2020 17:04
@pwnage101 pwnage101 changed the title Revert "Revert "This stage does the following: (#22692)"" Rename values in SiteConfiguration/History (1/3) (retry) Feb 19, 2020
@edx-status-bot

Copy link
Copy Markdown

Your PR has finished running tests. There were no failures.

# The actual default value is determined by calling the given callable.
# Therefore, the default here is just {}, since that is the result of
# calling `dict`.
default=dict,

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is the only change since #22692.

@bmedx bmedx left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't follow the original revert, but if it was just the deserialization I agree this should fix it. I assume the migration was reverted as well?

@doctoryes

Copy link
Copy Markdown
Contributor

@bmedx Yes - the migration was reverted by me.

@pwnage101
pwnage101 merged commit 3f85ba3 into master Feb 21, 2020
@pwnage101
pwnage101 deleted the pwnage101/rename_site_configuration_siteconfiguration_values_1.1 branch February 21, 2020 16:42
@edx-pipeline-bot

Copy link
Copy Markdown
Contributor

EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production.

@edx-pipeline-bot

Copy link
Copy Markdown
Contributor

EdX Release Notice: This PR may have caused e2e tests to fail on Stage. If you're a member of the edX org, please visit #e2e-troubleshooting on Slack to help diagnose the cause of these failures. Otherwise, it is the reviewer's responsibility. E2E tests have failed. https://gocd.tools.edx.org/go/tab/pipeline/history/deploy_to_stage

@edx-pipeline-bot

Copy link
Copy Markdown
Contributor

EdX Release Notice: This PR has been deployed to the production environment.

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.

5 participants