diff --git a/setup/upgradetables_mysql.inc.php b/setup/upgradetables_mysql.inc.php index 5783f9fdeb..c40370739b 100644 --- a/setup/upgradetables_mysql.inc.php +++ b/setup/upgradetables_mysql.inc.php @@ -256,12 +256,12 @@ $db->query("alter table $table change $field $field int(11) NOT NULL"); } - function v0_9_2to0_9_3pre3(){ + function v0_9_2to0_9_3pre4(){ global $currentver, $phpgw_info, $db; $didupgrade = True; // The 0.9.3pre1 is only temp until release - if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2") { + if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2" || $currentver == "0.9.3pre3") { if ($currentver == "0.9.2" || $currentver == "0.9.3pre1") { update_owner("addressbook","ab_owner"); update_owner("todo","todo_owner"); @@ -284,12 +284,16 @@ $db->query("drop table users_newsgroups"); $db->query("update applications set app_tables='newsgroups' where app_name='nntp'"); } + $currentver = "0.9.3pre3"; + } + if ($currentver == "0.9.3pre3") { + $db->query("alter table todo add todo_parent_id int(11) DEFAULT '0' NOT NULL"); + $currentver = "0.9.3pre4"; } echo " \n"; - echo " Upgrade from 0.9.2 to 0.9.3pre3 is completed.\n"; + echo " Upgrade from 0.9.2 to 0.9.3pre4 is completed.\n"; echo " \n"; - $currentver = "0.9.3pre3"; } } @@ -304,7 +308,7 @@ v9052000to9072000(); v9072000to0_9_1(); v0_9_1to0_9_2(); - v0_9_2to0_9_3pre3(); + v0_9_2to0_9_3pre4(); $db->query("update applications set app_version='".$phpgw_info["server"]["version"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps')"); diff --git a/setup/upgradetables_pgsql.inc.php b/setup/upgradetables_pgsql.inc.php index 39d7f7d449..c059180fd6 100644 --- a/setup/upgradetables_pgsql.inc.php +++ b/setup/upgradetables_pgsql.inc.php @@ -245,12 +245,12 @@ $db->query("alter table $table change $field $field int(11) NOT NULL"); } - function v0_9_2to0_9_3pre3(){ + function v0_9_2to0_9_3pre4(){ global $currentver, $phpgw_info, $db; $didupgrade = True; // The 0.9.3pre1 is only temp until release - if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2") { + if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2" || $currentver == "0.9.3pre3") { if ($currentver == "0.9.2" || $currentver == "0.9.3pre1") { update_owner("addressbook","ab_owner"); update_owner("todo","todo_owner"); @@ -273,12 +273,16 @@ $db->query("drop table users_newsgroups"); $db->query("update applications set app_tables='newsgroups' where app_name='nntp'"); } + $currentver = "0.9.3pre3"; + } + if ($currentver == "0.9.3pre3") { + $db->query("alter table todo add todo_parent_id int DEFAULT 0 NOT NULL"); + $currentver = "0.9.3pre4"; } echo " \n"; - echo " Upgrade from 0.9.2 to 0.9.3pre3 is completed.\n"; + echo " Upgrade from 0.9.2 to $currentver is completed.\n"; echo " \n"; - $currentver = "0.9.3pre3"; } } @@ -293,7 +297,7 @@ v9052000to9072000(); v9072000to0_9_1(); v0_9_1to0_9_2(); - v0_9_2to0_9_3pre3(); + v0_9_2to0_9_3pre4(); $db->query("update applications set app_version='".$phpgw_info["server"]["version"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps')"); if (!$didupgrade == True){ diff --git a/version.inc.php b/version.inc.php index d2abba436c..1dbb10aa85 100644 --- a/version.inc.php +++ b/version.inc.php @@ -1 +1 @@ - +