Skip to content

Commit 961b3b7

Browse files
committed
fix at least one test
1 parent 9bd1a4c commit 961b3b7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

tests/common/db/packaging.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ class Meta:
101101

102102
name = factory.fuzzy.FuzzyText(length=12)
103103
version = factory.Sequence(lambda n: str(n) + ".0")
104+
release = project = factory.SubFactory(ReleaseFactory)
104105
kind = factory.fuzzy.FuzzyChoice(int(kind) for kind in DependencyKind)
105106
specifier = factory.fuzzy.FuzzyText(length=12)
106107

warehouse/migrations/versions/ee5b8f66a223_migrate_projects_and_releases_to_.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,12 @@ def upgrade():
114114
)
115115

116116
op.alter_column("releases", "project_id", nullable=False)
117-
op.alter_column("roles", "package_name", nullable=False)
118117
op.alter_column("release_files", "release_id", nullable=False)
119118
op.alter_column("release_dependencies", "release_id", nullable=False)
120119
op.alter_column("release_classifiers", "release_id", nullable=False)
121120

121+
op.drop_column("roles", "package_name")
122+
122123
op.drop_constraint(
123124
"release_classifiers_name_fkey", "release_classifiers", type_="foreignkey"
124125
)

warehouse/packaging/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@
5353
class Role(db.Model):
5454

5555
__tablename__ = "roles"
56-
__table_args__ = (
57-
Index("roles_pack_name_idx", "package_name"),
58-
Index("roles_user_name_idx", "user_name"),
59-
)
56+
__table_args__ = (Index("roles_user_name_idx", "user_name"),)
6057

6158
__repr__ = make_repr("role_name", "user_name", "package_name")
6259

@@ -69,11 +66,14 @@ class Role(db.Model):
6966
ForeignKey("packages.id", onupdate="CASCADE", ondelete="CASCADE"),
7067
nullable=False,
7168
)
72-
package_name = Column(Text)
7369

7470
user = orm.relationship(User, lazy=False)
7571
project = orm.relationship("Project", lazy=False)
7672

73+
@property
74+
def package_name(self):
75+
return project.name
76+
7777
def __gt__(self, other):
7878
"""
7979
Temporary hack to allow us to only display the 'highest' role when

0 commit comments

Comments
 (0)