From f8d2d4c82a5fd442e10fa205811548cffea59da7 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 28 Jun 2021 08:22:34 -0700 Subject: [PATCH] PackageBase.package -> PackageBase.packages A PackageBase can have more than one package associated with it. Signed-off-by: Kevin Morris --- aurweb/models/package.py | 2 +- test/test_package.py | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/aurweb/models/package.py b/aurweb/models/package.py index ff518f20..e8159d85 100644 --- a/aurweb/models/package.py +++ b/aurweb/models/package.py @@ -17,7 +17,7 @@ class Package(Base): Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"), nullable=False) PackageBase = relationship( - "PackageBase", backref=backref("package", uselist=False), + "PackageBase", backref=backref("packages", lazy="dynamic"), foreign_keys=[PackageBaseID]) __mapper_args__ = {"primary_key": [ID]} diff --git a/test/test_package.py b/test/test_package.py index 9532823d..1e940164 100644 --- a/test/test_package.py +++ b/test/test_package.py @@ -1,9 +1,7 @@ import pytest from sqlalchemy import and_ -from sqlalchemy.exc import IntegrityError, OperationalError - -import aurweb.config +from sqlalchemy.exc import IntegrityError from aurweb.db import create, query from aurweb.models.account_type import AccountType @@ -57,20 +55,6 @@ def test_package(): assert record is not None -def test_package_package_base_cant_change(): - """ Test case insensitivity of the database table. """ - if aurweb.config.get("database", "backend") == "sqlite": - return None # SQLite doesn't seem handle this. - - from aurweb.db import session - - with pytest.raises(OperationalError): - create(Package, - PackageBase=pkgbase, - Name="invalidates-old-package-packagebase-relationship") - session.rollback() - - def test_package_null_pkgbase_raises_exception(): from aurweb.db import session