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

[bugfix] Fix multiple "updated_at" columns for media updates #1660

Merged
merged 2 commits into from
Mar 31, 2023

Conversation

tsmethurst
Copy link
Contributor

Description

If this is a code change, please include a summary of what you've coded, and link to the issue(s) it closes/implements.

If this is a documentation change, please briefly describe what you've changed and why.

This pull request fixes an issue where the column updated_at was being passed into media attachment updates as an extra column. This was causing double updated_at columns to be used when making db queries. SQLite doesn't mind this, but postgres does.

closes #1645

Checklist

Please put an x inside each checkbox to indicate that you've read and followed it: [ ] -> [x]

If this is a documentation change, only the first checkbox must be filled (you can delete the others if you want).

  • I/we have read the GoToSocial contribution guidelines.
  • I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat.
  • I/we have performed a self-review of added code.
  • I/we have written code that is legible and maintainable by others.
  • I/we have commented the added code, particularly in hard-to-understand areas.
  • I/we have made any necessary changes to documentation.
  • I/we have added tests that cover new code.
  • I/we have run tests and they pass locally with the changes.
  • I/we have run go fmt ./... and golangci-lint run.

@@ -88,7 +88,7 @@ func (suite *AccountTestSuite) TestAccountDeleteLocal() {

if !testrig.WaitFor(func() bool {
dbAccount, _ := suite.db.GetAccountByID(ctx, deletingAccount.ID)
return suite.WithinDuration(dbAccount.SuspendedAt, time.Now(), 30*time.Second)
return !dbAccount.SuspendedAt.IsZero()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not really related to the PR, just a silly thing that tripped up the test.

@tsmethurst tsmethurst merged commit 60639a6 into main Mar 31, 2023
@tsmethurst tsmethurst deleted the media_attachment_updated_at_fix branch March 31, 2023 13:19
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.

[bug] Media pruning throws a "multiple assignments to same column" pgsql error
1 participant