Mercurial > kallithea
changeset 1588:8ac667338432 beta
Merge with upstream
| author | Nicolas VINOT <aeris@imirhil.fr> |
|---|---|
| date | Fri, 07 Oct 2011 01:55:51 +0200 |
| parents | 8898a79ac628 (current diff) a5981def1961 (diff) |
| children | 307ec693bdf2 |
| files | |
| diffstat | 3 files changed, 22 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/db_manage.py Fri Oct 07 01:53:59 2011 +0200 +++ b/rhodecode/lib/db_manage.py Fri Oct 07 01:55:51 2011 +0200 @@ -160,7 +160,9 @@ def step_3(self): print ('Adding additional settings into RhodeCode db') self.klass.fix_settings() - + print ('Adding ldap defaults') + self.klass.create_ldap_options(skip_existing=True) + upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1) #CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE @@ -307,7 +309,7 @@ self.sa.rollback() raise - def create_ldap_options(self): + def create_ldap_options(self,skip_existing=False): """Creates ldap settings""" try: @@ -319,6 +321,9 @@ ('ldap_attr_login', ''), ('ldap_attr_firstname', ''), ('ldap_attr_lastname', ''), ('ldap_attr_email', '')]: + if skip_existing and RhodeCodeSettings.get_by_name(k) != None: + log.debug('Skipping option %s' % k) + continue setting = RhodeCodeSettings(k, v) self.sa.add(setting) self.sa.commit()
--- a/rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py Fri Oct 07 01:53:59 2011 +0200 +++ b/rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py Fri Oct 07 01:55:51 2011 +0200 @@ -76,6 +76,14 @@ #========================================================================== from rhodecode.model.db import Repository + #ADD clone_uri column# + + clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, + assert_unicode=None), + nullable=True, unique=False, default=None) + + clone_uri.create(Repository().__table__) + #ADD downloads column# enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True) enable_downloads.create(Repository().__table__) @@ -92,21 +100,16 @@ group_id.create(Repository().__table__) - #ADD clone_uri column# - - clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, - assert_unicode=None), - nullable=True, unique=False, default=None) - - clone_uri.create(Repository().__table__) - - #========================================================================== # Upgrade of `user_followings` table #========================================================================== - follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now) - follows_from.create(Repository().__table__) + from rhodecode.model.db import UserFollowing + + follows_from = Column('follows_from', DateTime(timezone=False), + nullable=True, unique=None, + default=datetime.datetime.now) + follows_from.create(UserFollowing().__table__) return