From dbbafc15fae9567deba5fd02b7a4dfdc5969d1ad Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 28 Jun 2021 12:44:55 -0700 Subject: [PATCH] bugfix: PackageKeyword should have two PKs Signed-off-by: Kevin Morris --- aurweb/models/package_keyword.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/aurweb/models/package_keyword.py b/aurweb/models/package_keyword.py index 2926740d..803e6bca 100644 --- a/aurweb/models/package_keyword.py +++ b/aurweb/models/package_keyword.py @@ -1,4 +1,4 @@ -from sqlalchemy import Column, ForeignKey, Integer +from sqlalchemy import Column, ForeignKey, Integer, String, text from sqlalchemy.exc import IntegrityError from sqlalchemy.orm import backref, relationship @@ -18,7 +18,11 @@ class PackageKeyword(Base): "PackageBase", backref=backref("keywords", lazy="dynamic"), foreign_keys=[PackageBaseID]) - __mapper_args__ = {"primary_key": [PackageBaseID]} + Keyword = Column( + String(255), primary_key=True, nullable=False, + server_default=text("''")) + + __mapper_args__ = {"primary_key": [PackageBaseID, Keyword]} def __init__(self, PackageBase: aurweb.models.package_base.PackageBase = None,