Till Brehm
2014-04-25 0ccfef02aa3dad9970ba405a75cc565c903e3026
Added silent sql update option in updater.
1 files modified
11 ■■■■ changed files
install/lib/update.lib.php 11 ●●●● patch | view | raw | blame | history
install/lib/update.lib.php
@@ -164,6 +164,9 @@
            $next_db_version = intval($current_db_version + 1);
            $sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
            $php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
            // comma separated list of version numbers were a update has to be done silently
            $silent_update_versions = '75';
            if(is_file($sql_patch_filename)) {
@@ -186,10 +189,14 @@
                //* Load patch file into database
                if( !empty($conf["mysql"]["admin_password"]) ) {
                    system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
                    $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename;
                } else {
                    system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
                    $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename;
                }
                if(in_array($next_db_version,explode(',',$silent_update_versions))) $cmd .= ' > /dev/null 2> /dev/null';
                system($cmd);
                swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
                //* Exec onAfterSQL function