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

Follow-up on #6850 #7029

Merged
merged 2 commits into from Nov 20, 2018
Merged

Follow-up on #6850 #7029

merged 2 commits into from Nov 20, 2018

Conversation

@nsoranzo
Copy link
Member

nsoranzo commented Nov 20, 2018

Only migrate distinct (input_step_id, input_name) pairs, otherwise the UNIQUE constraint on the workflow_step_input table is violated.

Reported by @mvdbeek.

Also a small simplification of SQLAlchemy session handling in 2 files (found while trying to run the migration step in a transaction and failing).

nsoranzo added 2 commits Nov 20, 2018
otherwise the UNIQUE constraint on the `workflow_step_input` table is
violated.

Follow-up on #6850.

Reported by @mvdbeek.
Copy link
Member

mvdbeek left a comment

Thanks @nsoranzo!

@jmchilton jmchilton merged commit d13792d into galaxyproject:dev Nov 20, 2018
6 checks passed
6 checks passed
api test Build finished. 442 tests run, 1 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 190 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 270 tests run, 10 skipped, 0 failed.
Details
selenium test Build finished. 151 tests run, 3 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details
@jmchilton

This comment has been minimized.

Copy link
Member

jmchilton commented Nov 20, 2018

Thanks!

@nsoranzo nsoranzo deleted the nsoranzo:followup_on_6850 branch Nov 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.