fixed wrong migration schema

added filling out some default options for db migration script,
added path fix

rhodecode/lib/db_manage.py

@@ -32,7 +32,6 b' import logging'
 from os.path import dirname as dn, join as jn
 
 from rhodecode import __dbversion__
-from rhodecode.model.db import
 from rhodecode.model import meta
 
 from rhodecode.lib.auth import get_crypt_password
@@ -68,9 +67,9 b' class DbManage(object):'
                     raise Exception('database already exists')
 
     def create_tables(self, override=False):
+        """Create a auth database
         """
-        Create a auth database
-        """
+
         self.check_for_db(override)
         if self.db_exists:
             log.info("database exist and it's going to be destroyed")
@@ -101,6 +100,25 b' class DbManage(object):'
             raise
         log.info('db version set to: %s', __dbversion__)
 
+    def fix_repo_paths(self):
+        """Fixes a old rhodecode version path into new one without a '*'
+        """
+
+        paths = self.sa.query(RhodeCodeUi)\
+                .filter(RhodeCodeUi.ui_key == '/')\
+                .scalar()
+
+        paths.ui_value = paths.ui_value.replace('*', '')
+
+        try:
+            self.sa.add(paths)
+            self.sa.commit()
+        except:
+            self.sa.rollback()
+            raise
+
+
+
     def admin_prompt(self, second=False):
         if not self.tests:
             import getpass
@@ -136,7 +154,72 b' class DbManage(object):'
             self.create_user('test_regular', 'test12', '[e-mail]', False)
             self.create_user('test_regular2', 'test12', '[e-mail]', False)
 
+    def create_ui_settings(self):
+        """Creates ui settings, fills out hooks
+        and disables dotencode
+        
+        """
+        #HOOKS
+        hooks1_key = 'changegroup.update'
+        hooks1_ = self.sa.query(RhodeCodeUi)\
+            .filter(RhodeCodeUi.ui_key == hooks1_key).scalar()
 
+        hooks1 = RhodeCodeUi() if hooks1_ is None else hooks1_
+        hooks1.ui_section = 'hooks'
+        hooks1.ui_key = hooks1_key
+        hooks1.ui_value = 'hg update >&2'
+        hooks1.ui_active = False
+
+        hooks2_key = 'changegroup.repo_size'
+        hooks2_ = self.sa.query(RhodeCodeUi)\
+            .filter(RhodeCodeUi.ui_key == hooks2_key).scalar()
+
+        hooks2 = RhodeCodeUi() if hooks2_ is None else hooks2_
+        hooks2.ui_section = 'hooks'
+        hooks2.ui_key = hooks2_key
+        hooks2.ui_value = 'python:rhodecode.lib.hooks.repo_size'
+
+        hooks3 = RhodeCodeUi()
+        hooks3.ui_section = 'hooks'
+        hooks3.ui_key = 'pretxnchangegroup.push_logger'
+        hooks3.ui_value = 'python:rhodecode.lib.hooks.log_push_action'
+
+        hooks4 = RhodeCodeUi()
+        hooks4.ui_section = 'hooks'
+        hooks4.ui_key = 'preoutgoing.pull_logger'
+        hooks4.ui_value = 'python:rhodecode.lib.hooks.log_pull_action'
+
+        #For mercurial 1.7 set backward comapatibility with format
+        dotencode_disable = RhodeCodeUi()
+        dotencode_disable.ui_section = 'format'
+        dotencode_disable.ui_key = 'dotencode'
+        dotencode_disable.ui_value = 'false'
+
+        try:
+            self.sa.add(hooks1)
+            self.sa.add(hooks2)
+            self.sa.add(hooks3)
+            self.sa.add(hooks4)
+            self.sa.add(dotencode_disable)
+            self.sa.commit()
+        except:
+            self.sa.rollback()
+            raise
+
+
+    def create_ldap_options(self):
+        """Creates ldap settings"""
+
+        try:
+            for k in ['ldap_active', 'ldap_host', 'ldap_port', 'ldap_ldaps',
+                      'ldap_dn_user', 'ldap_dn_pass', 'ldap_base_dn']:
+
+                setting = RhodeCodeSettings(k, '')
+                self.sa.add(setting)
+            self.sa.commit()
+        except:
+            self.sa.rollback()
+            raise
 
     def config_prompt(self, test_repo_path=''):
         log.info('Setting up repositories config')
@@ -151,35 +234,9 b' class DbManage(object):'
             log.error('You entered wrong path: %s', path)
             sys.exit()
 
-        hooks1 = RhodeCodeUi()
-        hooks1.ui_section = 'hooks'
-        hooks1.ui_key = 'changegroup.update'
-        hooks1.ui_value = 'hg update >&2'
-        hooks1.ui_active = False
-
-        hooks2 = RhodeCodeUi()
-        hooks2.ui_section = 'hooks'
-        hooks2.ui_key = 'changegroup.repo_size'
-        hooks2.ui_value = 'python:rhodecode.lib.hooks.repo_size'
+        self.create_ui_settings()
 
-        hooks3 = RhodeCodeUi()
-        hooks3.ui_section = 'hooks'
-        hooks3.ui_key = 'pretxnchangegroup.push_logger'
-        hooks3.ui_value = 'python:rhodecode.lib.hooks.log_push_action'
-
-        hooks4 = RhodeCodeUi()
-        hooks4.ui_section = 'hooks'
-        hooks4.ui_key = 'preoutgoing.pull_logger'
-        hooks4.ui_value = 'python:rhodecode.lib.hooks.log_pull_action'
-
-        #for mercurial 1.7 set backward comapatibility with format
-
-        dotencode_disable = RhodeCodeUi()
-        dotencode_disable.ui_section = 'format'
-        dotencode_disable.ui_key = 'dotencode'
-        dotencode_disable.ui_section = 'false'
-
-
+        #HG UI OPTIONS
         web1 = RhodeCodeUi()
         web1.ui_section = 'web'
         web1.ui_key = 'push_ssl'
@@ -211,10 +268,6 b' class DbManage(object):'
 
 
         try:
-            self.sa.add(hooks1)
-            self.sa.add(hooks2)
-            self.sa.add(hooks3)
-            self.sa.add(hooks4)
             self.sa.add(web1)
             self.sa.add(web2)
             self.sa.add(web3)
@@ -222,17 +275,14 b' class DbManage(object):'
             self.sa.add(paths)
             self.sa.add(hgsettings1)
             self.sa.add(hgsettings2)
-            self.sa.add(dotencode_disable)
-            for k in ['ldap_active', 'ldap_host', 'ldap_port', 'ldap_ldaps',
-                      'ldap_dn_user', 'ldap_dn_pass', 'ldap_base_dn']:
-
-                setting = RhodeCodeSettings(k, '')
-                self.sa.add(setting)
 
             self.sa.commit()
         except:
             self.sa.rollback()
             raise
+
+        self.create_ldap_options()
+
         log.info('created ui config')
 
     def create_user(self, username, password, email='', admin=False):

rhodecode/lib/dbmigrate/__init__.py

@@ -33,6 +33,7 b' from rhodecode.lib.dbmigrate.migrate.ver'
 from rhodecode.lib.dbmigrate.migrate.exceptions import \
     DatabaseNotControlledError
 from rhodecode.lib.utils import BasePasterCommand, Command, add_cache
+from rhodecode.lib.db_manage import DbManage
 
 log = logging.getLogger(__name__)
 
@@ -54,7 +55,7 b' class UpgradeDb(BasePasterCommand):'
 
         add_cache(config)
 
-        #engine = engine_from_config(config, 'sqlalchemy.db1.')
+
 
         repository_path = 'rhodecode/lib/dbmigrate'
         db_uri = config['sqlalchemy.db1.url']
@@ -70,13 +71,27 b' class UpgradeDb(BasePasterCommand):'
                    ' as version %s' % curr_version)
             api.version_control(db_uri, repository_path, curr_version)
 
+        self.notify_msg(msg)
 
-        print msg
         #now we have our dbversion we can do upgrade
+        self.notify_msg('attempting to do database upgrade to version %s' \
+                        % __dbversion__)
+
+        api.upgrade(db_uri, repository_path, __dbversion__)
+        self.notify_msg('Schema upgrade completed')
 
-        msg = 'attempting to do database upgrade to version %s' % __dbversion__
-        print msg
-        api.upgrade(db_uri, repository_path, __dbversion__)
+        #we need to make now some extra operations into database
+        self.notify_msg('Prociding with database updates')
+
+        dbmanage = DbManage(log_sql=True, dbconf=db_uri,
+                            root=config['here'], tests=False)
+
+        self.notify_msg('Patching repo paths for newer version of rhodecode')
+        dbmanage.fix_repo_paths()
+
+        self.notify_msg('Changing ui settings')
+        dbmanage.create_ui_settings()
+
 
     def update_parser(self):
         self.parser.add_option('--sql',

rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py

@@ -49,25 +49,23 b' def upgrade(migrate_engine):'
     #==========================================================================
     # Upgrade of `repositories` table
     #==========================================================================    
-    tblname = 'users'
+    tblname = 'repositories'
     tbl = Table(tblname, MetaData(bind=migrate_engine), autoload=True,
                     autoload_with=migrate_engine)
 
-    #ADD repo_type column
+    #ADD repo_type column#
     repo_type = Column("repo_type", String(length=None, convert_unicode=False,
                                            assert_unicode=None),
                        nullable=True, unique=False, default='hg')
 
     repo_type.create(tbl, populate_default=True)
-    repo_type.alter(nullable=False)
+    #repo_type.alter(nullable=False)
 
-    #ADD statistics column
+    #ADD statistics column#
     enable_statistics = Column("statistics", Boolean(), nullable=True,
                                unique=None, default=True)
     enable_statistics.create(tbl)
 
-
-
     #==========================================================================
     # Add table `user_followings`
     #==========================================================================

rhodecode/lib/utils.py

@@ -563,6 +563,19 b' class BasePasterCommand(Command):'
     takes_config_file = 1
     requires_config_file = True
 
+    def notify_msg(self, msg, log=False):
+        """Make a notification to user, additionally if logger is passed
+        it logs this action using given logger
+        
+        :param msg: message that will be printed to user
+        :param log: logging instance, to use to additionally log this message
+        
+        """
+        print msg
+        if log and isinstance(log, logging):
+            log(msg)
+
+
     def run(self, args):
         """
         Overrides Command.run