Mercurial > kallithea
diff rhodecode/model/db.py @ 2440:1bc579bcd67a codereview
- pull request generates overview based on it's params
- added page to show all pull-requests for a repository
- db schema changes to support comments and inline comments for pull-requests
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 10 Jun 2012 18:15:00 +0200 |
| parents | f29469677319 |
| children | fd0a822481ec |
line wrap: on
line diff
--- a/rhodecode/model/db.py Sun Jun 10 16:44:06 2012 +0200 +++ b/rhodecode/model/db.py Sun Jun 10 18:15:00 2012 +0200 @@ -1322,7 +1322,8 @@ ) comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True) repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False) - revision = Column('revision', String(40), nullable=False) + revision = Column('revision', String(40), nullable=True) + pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True) line_no = Column('line_no', Unicode(10), nullable=True) f_path = Column('f_path', Unicode(1000), nullable=True) user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False) @@ -1332,6 +1333,7 @@ author = relationship('User', lazy='joined') repo = relationship('Repository') status_change = relationship('ChangesetStatus', uselist=False) + pull_request = relationship('PullRequest', lazy='joined') @classmethod def get_users(cls, revision): @@ -1397,6 +1399,8 @@ pull_request_id = Column('pull_request_id', Integer(), nullable=False, primary_key=True) title = Column('title', Unicode(256), nullable=True) description = Column('description', Unicode(10240), nullable=True) + created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now) + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None) _revisions = Column('revisions', UnicodeText(20500)) # 500 revisions max org_repo_id = Column('org_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False) org_ref = Column('org_ref', Unicode(256), nullable=False) @@ -1411,6 +1415,7 @@ def revisions(self, val): self._revisions = ':'.join(val) + author = relationship('User', lazy='joined') reviewers = relationship('PullRequestReviewers') org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id') other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id')