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

TS model: declarative mapping + prep for SQLAlchemy 2.0 #12666

Merged
merged 55 commits into from
Oct 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
4a27ca9
Initial setup for declarative mapping
jdavcs Oct 7, 2021
7fd5099
Setup testing infrastructure
jdavcs Oct 7, 2021
55daac7
Add table and column tests for all models
jdavcs Oct 7, 2021
80bcc4c
TMP adding rel tests
jdavcs Oct 7, 2021
f45679e
Add relationship tests with some todos
jdavcs Oct 8, 2021
6e6d7d8
Create registry, base class
jdavcs Oct 8, 2021
c7df119
Map APIKeys declaratively
jdavcs Oct 8, 2021
7d9cfe0
Map PasswordResetToken declaratively
jdavcs Oct 8, 2021
80e71dd
Rearrang mapping tests alphabetically
jdavcs Oct 8, 2021
7416cdb
Map Component declaratively
jdavcs Oct 8, 2021
d66f521
Map ComponentReview declarative; drop primaryjoin attr
jdavcs Oct 8, 2021
682c35b
Map GalaxySession declaratively
jdavcs Oct 8, 2021
9f19588
Map Group declaratively; mark mapping bug to fix
jdavcs Oct 8, 2021
be34e05
Map GroupRoleAssociation declaratively, mark bug
jdavcs Oct 8, 2021
b26a530
Map Role declaratively; mark todos
jdavcs Oct 8, 2021
bd9a805
Map Tag declaratively
jdavcs Oct 8, 2021
27d948c
Map User declaratively
jdavcs Oct 8, 2021
c998681
Map RepositoryCategoryAssociation declaratively
jdavcs Oct 8, 2021
9f07b8c
Drop unused model stubs
jdavcs Oct 8, 2021
31af81d
Map RepositoryRatingAssociation declaratively
jdavcs Oct 8, 2021
f824ed2
Fix SAWarning: add back_populates for Repository/User
jdavcs Oct 8, 2021
7ddb277
Add back_populates to User/GalaxySession
jdavcs Oct 8, 2021
ddf1135
Replace backref w/back_populates for User/APIKeys
jdavcs Oct 8, 2021
500dc77
Fix bug on UserGroupAssoc mapping (see note)
jdavcs Oct 8, 2021
5773c80
Map UserGroupAssociation declaratively
jdavcs Oct 8, 2021
de45aac
Fix SAWarning: add back_populates for Role/RepositoryRoleAssoc
jdavcs Oct 8, 2021
e6d4f0a
Fix SAWarning: add back_populates for Role/GroupRoleAssoc
jdavcs Oct 8, 2021
9cb6e7f
Add back_populates for User/Repository
jdavcs Oct 8, 2021
9632bc4
Fix SAWarning; add back_populates for Role/UserRoleAssoc
jdavcs Oct 8, 2021
cd5c04f
Fix SAWarning: add back_populates for Component/RepositoryReview
jdavcs Oct 8, 2021
2579fe5
Fix 2 SAWArnings, incorrect attribute naming
jdavcs Oct 8, 2021
1eabf71
Fix SAWarning: add back_populates for RepositoryCategoryAssoc/Category
jdavcs Oct 8, 2021
b35d042
Add back_populates for RepositoryCategoryAssoc/Repository
jdavcs Oct 8, 2021
b2170fa
Fix bug, 2 SAWarnings (see note); add test
jdavcs Oct 8, 2021
a5ca55d
Map Category declaratively
jdavcs Oct 9, 2021
f943da4
Map RepositoryRoleAssoc; fix SAWarning (back_populates)
jdavcs Oct 9, 2021
d54697a
Fix bug, 2 SAWarnings for non_private_roles (see note)
jdavcs Oct 9, 2021
ad23015
Map UserRoleAssociation declaratively
jdavcs Oct 9, 2021
d6ee496
Fix SAWarning: remove unused overlapping relationship: review
jdavcs Oct 9, 2021
e49c315
Add back_populates, remove primaryjoin from Repo/RepoReview
jdavcs Oct 9, 2021
3191bce
Replace backref w/back_populates on User/RepoReview
jdavcs Oct 9, 2021
667237a
Fix SAWarning: mark overlapping relationship as viewonly
jdavcs Oct 9, 2021
7acbaad
Fix 4 SAWarnings; simplify mapping for Repo.reviewers; fix test
jdavcs Oct 11, 2021
3330206
Fix Repository tests
jdavcs Oct 11, 2021
940380e
Map Repository declaratively
jdavcs Oct 12, 2021
bebeebc
Fix RepositoryMetadata review/reviews. For real this time (see note)
jdavcs Oct 12, 2021
3253d6e
Fix 2 SAWarnings: RepoMetadat.reviews should be viewonly
jdavcs Oct 12, 2021
dcc9730
Fix SAWarning: add back_populates to Repo/RepoMetadata
jdavcs Oct 12, 2021
1b52676
Fix SAWarning: RepoReview.repo_metadata should be viewonly
jdavcs Oct 12, 2021
3505c81
Fix RepositoryReview.repository_metadata testing
jdavcs Oct 12, 2021
bf027dc
Map RepositoryReview declaratively
jdavcs Oct 12, 2021
37b349c
Fix last SAWarning for TS mapping
jdavcs Oct 12, 2021
185a99f
Move RepositoryMetadata out of mapping.py
jdavcs Oct 12, 2021
13f7b4c
Drop datatype from ForeignKey (redundant; less code to read)
jdavcs Oct 12, 2021
4fe97b6
Cleanup up constructors
jdavcs Oct 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/tool_shed/grids/admin_grids.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ def get_value(self, trans, grid, group):
class UsersColumn(grids.GridColumn):

def get_value(self, trans, grid, group):
if group.members:
return len(group.members)
if group.users:
return len(group.users)
return 0

title = "Groups"
Expand Down
Loading