From: Michael Tremer Date: Wed, 22 Jan 2025 16:58:00 +0000 (+0000) Subject: jobs: Make the package mapping table accessible from other modules X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dc40c279726abecf8774c7ae98610c621d1e8ba;p=pbs.git jobs: Make the package mapping table accessible from other modules Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py index 2f9e644a..7bd2625a 100644 --- a/src/buildservice/jobs.py +++ b/src/buildservice/jobs.py @@ -27,6 +27,16 @@ from .errors import * # Setup logging log = logging.getLogger("pbs.jobs") +JobPackage = sqlalchemy.Table( + "job_packages", database.Base.metadata, + + # Job + Column("job_id", ForeignKey("jobs.id"), nullable=False), + + # Package + Column("pkg_id", ForeignKey("packages.id"), nullable=False), +) + class Jobs(base.Object): connections = {} @@ -434,17 +444,7 @@ class Job(database.Base, database.BackendMixin, database.SoftDeleteMixin): # Binary Packages - JobPackages = sqlalchemy.Table( - "job_packages", database.Base.metadata, - - # Job - Column("job_id", ForeignKey("jobs.id")), - - # Package - Column("pkg_id", ForeignKey("packages.id")), - ) - - packages = sqlalchemy.orm.relationship("Package", secondary=JobPackages, lazy="selectin") + packages = sqlalchemy.orm.relationship("Package", secondary=JobPackage, lazy="selectin") async def _import_packages(self, uploads): """