kallithea Changeset - cb3fa867418f

Changeset - cb3fa867418f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 years ago 2015-06-19 18:06:39
madski@unity3d.com

db: add explicit NOT NULL constraint for the implicit invariant that all status changes have a comment

2 files changed with 14 insertions and 7 deletions:

kallithea/model/db.py

kallithea/tests/other/test_validators.py

0 comments (0 inline, 0 general)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2230,13 +2230,13 @@ class ChangesetStatus(Base, BaseModel): @@
     changeset_status_id = Column(Integer(), nullable=False, unique=True, primary_key=True)
     repo_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     revision = Column(String(40), nullable=False)
     status = Column(String(128), nullable=False, default=DEFAULT)
     changeset_comment_id = Column(Integer(), ForeignKey('changeset_comments.comment_id'))
+    changeset_comment_id = Column(Integer(), ForeignKey('changeset_comments.comment_id'), nullable=False)
     modified_at = Column(DateTime(), nullable=False, default=datetime.datetime.now)
     version = Column(Integer(), nullable=False, default=0)
     pull_request_id = Column(Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
     author = relationship('User')
     repo = relationship('Repository')

kallithea/tests/other/test_validators.py

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ from kallithea.tests import * @@
 from kallithea.model import validators as v
 from kallithea.model.user_group import UserGroupModel
 from kallithea.model.meta import Session
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.db import ChangesetStatus, Repository
+from kallithea.model.db import ChangesetStatus, ChangesetComment, Repository
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()
@@ @@ -230,22 +230,29 @@ class TestRepoGroups(BaseTestCase): @@
     def test_AttrLoginValidator(self):
         validator = v.AttrLoginValidator()
         self.assertEqual('DN_attr', validator.to_python('DN_attr'))
     def test_NotReviewedRevisions(self):
         repo_id = Repository.get_by_repo_name(HG_REPO).repo_id
         validator = v.NotReviewedRevisions(repo_id)
         user = ChangesetStatusModel()._get_user(TEST_USER_ADMIN_LOGIN)
         repo = Repository.get_by_repo_name(HG_REPO)
         validator = v.NotReviewedRevisions(repo.repo_id)
         rev = '0' * 40
         # add status for a rev, that should throw an error because it is already
         # reviewed
         new_comment = ChangesetComment()
         new_comment.repo = repo
         new_comment.author = user
         new_comment.text = u''
         Session().add(new_comment)
         Session().flush()
         new_status = ChangesetStatus()
         new_status.author = ChangesetStatusModel()._get_user(TEST_USER_ADMIN_LOGIN)
         new_status.repo = ChangesetStatusModel()._get_repo(HG_REPO)
         new_status.author = user
         new_status.repo = repo
         new_status.status = ChangesetStatus.STATUS_APPROVED
-        new_status.comment = None
+        new_status.comment = new_comment
         new_status.revision = rev
         Session().add(new_status)
         Session().commit()
         try:
             self.assertRaises(formencode.Invalid, validator.to_python, [rev])
         finally:

0 comments (0 inline, 0 general)