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

SQLAlchemy 2.0 upgrades (part 2) #16724

Merged
merged 28 commits into from
Oct 17, 2023
Merged

Conversation

jdavcs
Copy link
Member

@jdavcs jdavcs commented Sep 22, 2023

Follow-up to #16434. Covers ORM usage (ref). This PR is ready for review.

For follow-up PRs:

  • lib/galaxy/datatypes
  • lib/galaxy/jobs
  • lib/galaxy/managers
  • lib/galaxy/metadata
  • lib/galaxy/tool_shed
  • lib/galaxy/web
  • lib/galaxy/webapps/galaxy/controllers
  • lib/galaxy_test
  • lib/tool_shed
  • build_initial_query and friends (web/framework/*, webapps/*)
  • Fix bug in User.all_roles query + use SA2.0 #16761
  • model.DatasetCollection._get_nested_collection_attributes()
  • model.DatasetCollection.populated_optimized
  • managers.users (tags: convert from Query, apply union correctly)

Ref: #12541

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

@jdavcs jdavcs added kind/refactoring cleanup or refactoring of existing code, no functional changes area/database Galaxy's database or data access layer labels Sep 22, 2023
@jdavcs jdavcs added this to the 23.2 milestone Sep 22, 2023
@jdavcs jdavcs force-pushed the dev_sa20_fix15 branch 6 times, most recently from 144289d to 3df9595 Compare September 26, 2023 12:48
@jmchilton
Copy link
Member

I wonder if we should just merge the new tool shed backend before you go making lots of changes to the code - that branch already refactors a bunch of stuff.

@jdavcs
Copy link
Member Author

jdavcs commented Sep 26, 2023

I wonder if we should just merge the new tool shed backend before you go making lots of changes to the code - that branch already refactors a bunch of stuff.

I would be very much in favor of that; I wasn't sure how close that was to merging. Is it the full #15639 or a subset of it? (I'll then go through it and review (at least) the db/SA-related code).

@jmchilton
Copy link
Member

Well we had decided to deploy it and test it first... that is seeming like a mistaken call given how we're not making progress on that.

I already found and commented on one issue with the previous DB commit.

@jdavcs jdavcs force-pushed the dev_sa20_fix15 branch 7 times, most recently from d2796cb to 6c06a9e Compare October 2, 2023 17:51
@jdavcs jdavcs force-pushed the dev_sa20_fix15 branch 3 times, most recently from 5b0521e to e4fd119 Compare October 3, 2023 15:50
@jdavcs jdavcs marked this pull request as ready for review October 3, 2023 17:13
@jdavcs jdavcs changed the title [WIP] SQLAlchemy 2.0 upgrades (part 2) SQLAlchemy 2.0 upgrades (part 2) Oct 3, 2023
@jmchilton
Copy link
Member

Rebase and ping me?

@jdavcs
Copy link
Member Author

jdavcs commented Oct 10, 2023

@jmchilton: rebased

@jdavcs
Copy link
Member Author

jdavcs commented Oct 13, 2023

Rebased again - just for the sake of starting a new branch on top of this. The pre-rebase version was all green (except for one unrelated selenium failure).

jdavcs added 25 commits October 16, 2023 11:31
…uirements

SA2.0: add unique() to joinedload result
Refactor: change from property to "private" method
@jmchilton jmchilton merged commit 9bb21a0 into galaxyproject:dev Oct 17, 2023
40 checks passed
@jmchilton
Copy link
Member

Very nice! Thanks for breaking these up into reviewable pieces.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/database Galaxy's database or data access layer kind/refactoring cleanup or refactoring of existing code, no functional changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants