extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 08:39:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

1) correct update_script for more than one droped column

Browse Source 
2) updates tables_names in $app/setup/setup.inc.php
3) suggest new version-number
This commit is contained in:
Ralf Becker 2002-09-01 19:54:47 +00:00
parent b9f7c66d71
commit bd8aba2246
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
etemplate/inc/class.db_tools.inc.php
View File

@ -302,7 +302,10 @@
'edited_table' => $edited_table, 'edited_table' => $edited_table,
'changes' => $this->changes 'changes' => $this->changes
); );
$content['new_version'] = $content['version']; $new_version = explode('.',$content['version']);
$minor = count($new_version)-1;
$new_version[$minor] = sprintf('%03d',1+$new_version[$minor]);
$content['new_version'] = implode('.',$new_version);
$tmpl = new etemplate('etemplate.db-tools.ask_save'); $tmpl = new etemplate('etemplate.db-tools.ask_save');
@ -549,13 +552,13 @@
} }
/*! /*!
@function setup_version($app,$new = '') @function setup_version($app,$new = '',$tables='')
@abstract reads and updates the version in file $app/setup/setup.inc.php if $new != '' @abstract reads and updates the version in file $app/setup/setup.inc.php if $new != ''
@return the version or False if the file could not be read or written @return the version or False if the file could not be read or written
*/ */
function setup_version($app,$new = '') function setup_version($app,$new = '',$tables='')
{ {
//echo "<p>etemplate.db_tools.setup_version('$app','$new')</p>\n"; //echo "<p>etemplate.db_tools.setup_version('$app','$new','$tables')</p>\n";
$file = PHPGW_SERVER_ROOT."/$app/setup/setup.inc.php"; $file = PHPGW_SERVER_ROOT."/$app/setup/setup.inc.php";
if (file_exists($file)) if (file_exists($file))
@ -582,6 +585,8 @@
rename($file,PHPGW_SERVER_ROOT."/$app/setup/setup.old.inc.php"); rename($file,PHPGW_SERVER_ROOT."/$app/setup/setup.old.inc.php");
} }
$fnew = eregi_replace("(.*\\$"."setup_info\\['$app'\\]\\['version'\\][ \\t]*=[ \\t]*')[^']*('.*)","\\1$new"."\\2",$fcontent); $fnew = eregi_replace("(.*\\$"."setup_info\\['$app'\\]\\['version'\\][ \\t]*=[ \\t]*')[^']*('.*)","\\1$new"."\\2",$fcontent);
if ($tables != '')
$fnew = eregi_replace("(.*\\$"."setup_info\\['$app'\\]\\['tables'\\][ \\t]*=[ \\t]*array\()[^)]*","\\1$tables",$fnew);
if (!is_writeable(PHPGW_SERVER_ROOT."/$app/setup") || !($f = fopen($file,'w'))) if (!is_writeable(PHPGW_SERVER_ROOT."/$app/setup") || !($f = fopen($file,'w')))
{ {
@ -638,7 +643,7 @@
function $app"."_upgrade$old_version_() function $app"."_upgrade$old_version_()
{\n"; {\n";
$update .= $this->update_schema($app,$current); $update .= $this->update_schema($app,$current,$tables);
$update .= "\n $update .= "\n
\$GLOBALS['setup_info']['$app']['currentver'] = '$version'; \$GLOBALS['setup_info']['$app']['currentver'] = '$version';
@ -653,7 +658,7 @@
fwrite($f,$update); fwrite($f,$update);
fclose($f); fclose($f);
$this->setup_version($app,$version); $this->setup_version($app,$version,$tables);
return True; return True;
} }
@ -670,10 +675,11 @@
} }
} }
function update_schema($app,$current) function update_schema($app,$current,&$tables)
{ {
$this->read($app,$old); $this->read($app,$old);
$tables = '';
reset($old); reset($old);
while (list($name,$table_def) = each($old)) while (list($name,$table_def) = each($old))
{ {
@ -683,14 +689,16 @@
} }
else else
{ {
$tables .= ($tables ? ',' : '') . "'$name'";
reset($table_def['fd']); reset($table_def['fd']);
$new_table_def = $table_def;
while(list($col,$col_def) = each($table_def['fd'])) while(list($col,$col_def) = each($table_def['fd']))
{ {
if (!isset($current[$name]['fd'][$col])) // column $col droped if (!isset($current[$name]['fd'][$col])) // column $col droped
{ {
if (!isset($this->changes[$name][$col]) || $this->changes[$name][$col] == '**deleted**') if (!isset($this->changes[$name][$col]) || $this->changes[$name][$col] == '**deleted**')
{ {
$new_table_def = $table_def;
unset($new_table_def['fd'][$col]); unset($new_table_def['fd'][$col]);
$this->remove_from_array($new_table_def['pk'],$col); $this->remove_from_array($new_table_def['pk'],$col);
$this->remove_from_array($new_table_def['fk'],$col); $this->remove_from_array($new_table_def['fk'],$col);
@ -722,6 +730,8 @@
{ {
if (!isset($old[$name])) // table $name added if (!isset($old[$name])) // table $name added
{ {
$tables .= ($tables ? ',' : '') . "'$name'";
$update .= "\t\t\$GLOBALS['phpgw_setup']->oProc->CreateTable('$name',"; $update .= "\t\t\$GLOBALS['phpgw_setup']->oProc->CreateTable('$name',";
$update .= $this->write_array($table_def,2).");\n"; $update .= $this->write_array($table_def,2).");\n";
} }