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

fix: turns out ON CONFLICT DO NOTHING doesn't work with RETURNING #2382

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

alecthomas
Copy link
Collaborator

The workaround is to do a dummy update and return the updated id.

@alecthomas alecthomas requested review from a team and stuartwdouglas and removed request for a team August 15, 2024 09:50
@ftl-robot ftl-robot mentioned this pull request Aug 15, 2024
@@ -45,7 +45,7 @@ type serveCmd struct {
Stop bool `help:"Stop the running FTL instance. Can be used with --background to restart the server" default:"false"`
StartupTimeout time.Duration `help:"Timeout for the server to start up." default:"1m"`
ObservabilityConfig observability.Config `embed:"" prefix:"o11y-"`
DatabaseImage string `help:"The container image to start for the database" default:"postgres:15.4" env:"FTL_DATABASE_IMAGE" hidden:""`
DatabaseImage string `help:"The container image to start for the database" default:"postgres:15.8" env:"FTL_DATABASE_IMAGE" hidden:""`
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This now matches the version in the Docker compose file.

@alecthomas alecthomas added this pull request to the merge queue Aug 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 15, 2024
@stuartwdouglas stuartwdouglas added this pull request to the merge queue Aug 15, 2024
@stuartwdouglas stuartwdouglas removed this pull request from the merge queue due to a manual request Aug 15, 2024
@stuartwdouglas
Copy link
Collaborator

Maybe we should run the build all task as part of a normal PR, as it now picks up SCM changes to that happen when building.

@alecthomas
Copy link
Collaborator Author

I'm going to add a test.

@alecthomas
Copy link
Collaborator Author

Maybe we should run the build all task as part of a normal PR, as it now picks up SCM changes to that happen when building.

It's pretty slow unfortunately, which is why I excluded it :(

@alecthomas alecthomas added this pull request to the merge queue Aug 16, 2024
@alecthomas alecthomas removed this pull request from the merge queue due to a manual request Aug 16, 2024
The workaround is to do a dummy update and return the updated id. Also
added a test.
@alecthomas alecthomas added this pull request to the merge queue Aug 16, 2024
Merged via the queue into main with commit f661854 Aug 16, 2024
17 checks passed
@alecthomas alecthomas deleted the aat/fix-upload-conflict-2 branch August 16, 2024 05:50
safeer pushed a commit that referenced this pull request Aug 19, 2024
)

The workaround is to do a dummy update and return the updated id.
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