mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
housekeep: TU rename - Table/Column names, scripts
TU_VoteInfo -> VoteInfo TU_Votes -> Votes TU_VoteInfo.ActiveTUs -> VoteInfo.ActiveUsers script: tuvotereminder -> votereminder Signed-off-by: moson <moson@archlinux.org>
This commit is contained in:
parent
87f6791ea8
commit
d2d47254b4
23 changed files with 234 additions and 192 deletions
|
@ -26,6 +26,6 @@ from .request_type import RequestType # noqa: F401
|
|||
from .session import Session # noqa: F401
|
||||
from .ssh_pub_key import SSHPubKey # noqa: F401
|
||||
from .term import Term # noqa: F401
|
||||
from .tu_vote import TUVote # noqa: F401
|
||||
from .tu_voteinfo import TUVoteInfo # noqa: F401
|
||||
from .user import User # noqa: F401
|
||||
from .vote import Vote # noqa: F401
|
||||
from .voteinfo import VoteInfo # noqa: F401
|
||||
|
|
|
@ -3,24 +3,24 @@ from sqlalchemy.orm import backref, relationship
|
|||
|
||||
from aurweb import schema
|
||||
from aurweb.models.declarative import Base
|
||||
from aurweb.models.tu_voteinfo import TUVoteInfo as _TUVoteInfo
|
||||
from aurweb.models.user import User as _User
|
||||
from aurweb.models.voteinfo import VoteInfo as _VoteInfo
|
||||
|
||||
|
||||
class TUVote(Base):
|
||||
__table__ = schema.TU_Votes
|
||||
class Vote(Base):
|
||||
__table__ = schema.Votes
|
||||
__tablename__ = __table__.name
|
||||
__mapper_args__ = {"primary_key": [__table__.c.VoteID, __table__.c.UserID]}
|
||||
|
||||
VoteInfo = relationship(
|
||||
_TUVoteInfo,
|
||||
backref=backref("tu_votes", lazy="dynamic"),
|
||||
_VoteInfo,
|
||||
backref=backref("votes", lazy="dynamic"),
|
||||
foreign_keys=[__table__.c.VoteID],
|
||||
)
|
||||
|
||||
User = relationship(
|
||||
_User,
|
||||
backref=backref("tu_votes", lazy="dynamic"),
|
||||
backref=backref("votes", lazy="dynamic"),
|
||||
foreign_keys=[__table__.c.UserID],
|
||||
)
|
||||
|
||||
|
@ -30,13 +30,13 @@ class TUVote(Base):
|
|||
if not self.VoteInfo and not self.VoteID:
|
||||
raise IntegrityError(
|
||||
statement="Foreign key VoteID cannot be null.",
|
||||
orig="TU_Votes.VoteID",
|
||||
orig="Votes.VoteID",
|
||||
params=("NULL"),
|
||||
)
|
||||
|
||||
if not self.User and not self.UserID:
|
||||
raise IntegrityError(
|
||||
statement="Foreign key UserID cannot be null.",
|
||||
orig="TU_Votes.UserID",
|
||||
orig="Votes.UserID",
|
||||
params=("NULL"),
|
||||
)
|
|
@ -8,14 +8,14 @@ from aurweb.models.declarative import Base
|
|||
from aurweb.models.user import User as _User
|
||||
|
||||
|
||||
class TUVoteInfo(Base):
|
||||
__table__ = schema.TU_VoteInfo
|
||||
class VoteInfo(Base):
|
||||
__table__ = schema.VoteInfo
|
||||
__tablename__ = __table__.name
|
||||
__mapper_args__ = {"primary_key": [__table__.c.ID]}
|
||||
|
||||
Submitter = relationship(
|
||||
_User,
|
||||
backref=backref("tu_voteinfo_set", lazy="dynamic"),
|
||||
backref=backref("voteinfo_set", lazy="dynamic"),
|
||||
foreign_keys=[__table__.c.SubmitterID],
|
||||
)
|
||||
|
||||
|
@ -30,35 +30,35 @@ class TUVoteInfo(Base):
|
|||
if self.Agenda is None:
|
||||
raise IntegrityError(
|
||||
statement="Column Agenda cannot be null.",
|
||||
orig="TU_VoteInfo.Agenda",
|
||||
orig="VoteInfo.Agenda",
|
||||
params=("NULL"),
|
||||
)
|
||||
|
||||
if self.User is None:
|
||||
raise IntegrityError(
|
||||
statement="Column User cannot be null.",
|
||||
orig="TU_VoteInfo.User",
|
||||
orig="VoteInfo.User",
|
||||
params=("NULL"),
|
||||
)
|
||||
|
||||
if self.Submitted is None:
|
||||
raise IntegrityError(
|
||||
statement="Column Submitted cannot be null.",
|
||||
orig="TU_VoteInfo.Submitted",
|
||||
orig="VoteInfo.Submitted",
|
||||
params=("NULL"),
|
||||
)
|
||||
|
||||
if self.End is None:
|
||||
raise IntegrityError(
|
||||
statement="Column End cannot be null.",
|
||||
orig="TU_VoteInfo.End",
|
||||
orig="VoteInfo.End",
|
||||
params=("NULL"),
|
||||
)
|
||||
|
||||
if not self.Submitter:
|
||||
raise IntegrityError(
|
||||
statement="Foreign key SubmitterID cannot be null.",
|
||||
orig="TU_VoteInfo.SubmitterID",
|
||||
orig="VoteInfo.SubmitterID",
|
||||
params=("NULL"),
|
||||
)
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue