Mercurial > kallithea
changeset 6318:2d216fd7d5a2
db: rename UserFollowing.follows_repo_id to follows_repository_id
Since the relationship is 'follows_repository', rename the column to be
'follows_repository_id', not 'follows_repo_id'. This also makes the
Python column name match the actual database column name.
(The inconsistency dates back to early RhodeCode days.)
| author | Søren Løvborg <sorenl@unity3d.com> |
|---|---|
| date | Mon, 19 Sep 2016 14:41:11 +0200 |
| parents | 36e22160e5e5 |
| children | f4059fe16118 |
| files | kallithea/controllers/journal.py kallithea/model/db.py kallithea/model/scm.py kallithea/public/js/base.js kallithea/tests/functional/test_journal.py |
| diffstat | 5 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/journal.py Mon Nov 07 14:59:39 2016 +0100 +++ b/kallithea/controllers/journal.py Mon Sep 19 14:41:11 2016 +0200 @@ -78,8 +78,8 @@ return groups def _get_journal_data(self, following_repos): - repo_ids = [x.follows_repo_id for x in following_repos - if x.follows_repo_id is not None] + repo_ids = [x.follows_repository_id for x in following_repos + if x.follows_repository_id is not None] user_ids = [x.follows_user_id for x in following_repos if x.follows_user_id is not None] @@ -311,7 +311,7 @@ log.error(traceback.format_exc()) raise HTTPBadRequest() - repo_id = request.POST.get('follows_repo_id') + repo_id = request.POST.get('follows_repository_id') if repo_id: try: self.scm_model.toggle_following_repo(repo_id,
--- a/kallithea/model/db.py Mon Nov 07 14:59:39 2016 +0100 +++ b/kallithea/model/db.py Mon Sep 19 14:41:11 2016 +0200 @@ -1021,7 +1021,7 @@ stats = relationship('Statistics', cascade='all', uselist=False) followers = relationship('UserFollowing', - primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', + primaryjoin='UserFollowing.follows_repository_id==Repository.repo_id', cascade='all') extra_fields = relationship('RepositoryField', cascade="all, delete-orphan") @@ -2036,7 +2036,7 @@ user_following_id = Column(Integer(), primary_key=True) user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) - follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True) + follows_repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=True) follows_user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True) follows_from = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) @@ -2047,7 +2047,7 @@ @classmethod def get_repo_followers(cls, repo_id): - return cls.query().filter(cls.follows_repo_id == repo_id) + return cls.query().filter(cls.follows_repository_id == repo_id) class CacheInvalidation(Base, BaseDbModel):
--- a/kallithea/model/scm.py Mon Nov 07 14:59:39 2016 +0100 +++ b/kallithea/model/scm.py Mon Sep 19 14:41:11 2016 +0200 @@ -241,7 +241,7 @@ def toggle_following_repo(self, follow_repo_id, user_id): f = self.sa.query(UserFollowing) \ - .filter(UserFollowing.follows_repo_id == follow_repo_id) \ + .filter(UserFollowing.follows_repository_id == follow_repo_id) \ .filter(UserFollowing.user_id == user_id).scalar() if f is not None: @@ -258,7 +258,7 @@ try: f = UserFollowing() f.user_id = user_id - f.follows_repo_id = follow_repo_id + f.follows_repository_id = follow_repo_id self.sa.add(f) action_logger(UserTemp(user_id),
--- a/kallithea/public/js/base.js Mon Nov 07 14:59:39 2016 +0100 +++ b/kallithea/public/js/base.js Mon Sep 19 14:41:11 2016 +0200 @@ -451,8 +451,8 @@ } } -var toggleFollowingRepo = function(target, follows_repo_id){ - var args = 'follows_repo_id=' + follows_repo_id; +var toggleFollowingRepo = function(target, follows_repository_id){ + var args = 'follows_repository_id=' + follows_repository_id; args += '&_authentication_token=' + _authentication_token; $.post(TOGGLE_FOLLOW_URL, args, function(data){ _onSuccessFollow(target);
--- a/kallithea/tests/functional/test_journal.py Mon Nov 07 14:59:39 2016 +0100 +++ b/kallithea/tests/functional/test_journal.py Mon Sep 19 14:41:11 2016 +0200 @@ -23,7 +23,7 @@ # # response = self.app.post(url(controller='journal', # action='toggle_following'), -# {'follows_repo_id':repo.repo_id}) +# {'follows_repository_id':repo.repo_id}) def test_start_following_repository(self): self.log_user()