Merge branch 'pu_package' into pu

This commit is contained in:
Kevin Morris 2021-06-28 09:56:05 -07:00
commit 719fa82ae5
2 changed files with 2 additions and 18 deletions

View file

@ -17,7 +17,7 @@ class Package(Base):
Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"), Integer, ForeignKey("PackageBases.ID", ondelete="CASCADE"),
nullable=False) nullable=False)
PackageBase = relationship( PackageBase = relationship(
"PackageBase", backref=backref("package", uselist=False), "PackageBase", backref=backref("packages", lazy="dynamic"),
foreign_keys=[PackageBaseID]) foreign_keys=[PackageBaseID])
__mapper_args__ = {"primary_key": [ID]} __mapper_args__ = {"primary_key": [ID]}

View file

@ -1,9 +1,7 @@
import pytest import pytest
from sqlalchemy import and_ from sqlalchemy import and_
from sqlalchemy.exc import IntegrityError, OperationalError from sqlalchemy.exc import IntegrityError
import aurweb.config
from aurweb.db import create, query from aurweb.db import create, query
from aurweb.models.account_type import AccountType from aurweb.models.account_type import AccountType
@ -57,20 +55,6 @@ def test_package():
assert record is not None 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(): def test_package_null_pkgbase_raises_exception():
from aurweb.db import session from aurweb.db import session