kallithea Changeset - f4059fe16118

Changeset - f4059fe16118

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Søren Løvborg - 9 years ago 2016-09-19 14:46:12
sorenl@unity3d.com

db: rename ChangesetStatus.changeset_comment_id to comment_id

This ensures consistency with the existing "comment" relationship, as
well as the foreign key (ChangesetComment.comment_id).

2 files changed with 3 insertions and 3 deletions:

kallithea/controllers/changeset.py

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -257,11 +257,11 @@ class ChangesetController(BaseRepoContro @@
                                               revision=changeset.raw_id))
                 # Status change comments - mostly from pull requests
-                comments.update((st.changeset_comment_id, st.comment)
+                comments.update((st.comment_id, st.comment)
                                 for st in ChangesetStatusModel()
                                 .get_statuses(c.db_repo.repo_id,
                                               changeset.raw_id, with_revisions=True)
-                                if st.changeset_comment_id is not None)
+                                if st.comment_id is not None)
                 inlines = ChangesetCommentsModel() \
                             .get_inline_comments(c.db_repo.repo_id,

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2263,7 +2263,7 @@ class ChangesetStatus(Base, BaseDbModel) @@
     user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False)
     revision = Column(String(40), nullable=True)
     status = Column(String(128), nullable=False, default=DEFAULT)
-    changeset_comment_id = Column(Integer(), ForeignKey('changeset_comments.comment_id'), nullable=False)
+    comment_id = Column('changeset_comment_id', 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)

0 comments (0 inline, 0 general)