extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up these tables for the new setup prog

Browse Source
This commit is contained in:
seek3r 2000-12-01 18:32:57 +00:00
parent 2caf561422
commit f5045f8e13
6 changed files with 86 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/index.php
View File

@ -44,8 +44,6 @@
$db->query("select app_version from applications where app_name='admin'"); $db->query("select app_version from applications where app_name='admin'");
$db->next_record(); $db->next_record();
$oldversion = $db->f("app_version"); $oldversion = $db->f("app_version");
echo "oldversion: $oldversion<br>\n";
$db->free(); $db->free();
if (isset($oldversion)){ if (isset($oldversion)){
if ($oldversion == $phpgw_info["server"]["version"]){ if ($oldversion == $phpgw_info["server"]["version"]){

4
setup/sql/common_main.inc.php
View File

@ -18,9 +18,7 @@
} }
if ($currentver == "drop"){ if ($currentver == "drop"){
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_droptables.inc.php"); include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_droptables.inc.php");
// $currentver = "new";
} }
if ($currentver == "new") { if ($currentver == "new") {
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_newtables.inc.php"); include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_newtables.inc.php");
@ -34,9 +32,11 @@
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_beta.inc.php"); include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_beta.inc.php");
} }
/* Not yet implemented
if (!$tablechanges == True){ if (!$tablechanges == True){
echo " <tr bgcolor=\"e6e6e6\">\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>No table changes were needed. The script only updated your version setting.</td>\n"; echo " <td>No table changes were needed. The script only updated your version setting.</td>\n";
echo " </tr>\n"; echo " </tr>\n";
} }
*/
?> ?>

63
setup/sql/mysql_upgrade_beta.inc.php
View File

@ -296,9 +296,12 @@
update_version_table(); update_version_table();
} }
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
@ -348,9 +351,12 @@
$currentver = "0.9.4"; $currentver = "0.9.4";
update_version_table(); update_version_table();
} }
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
@ -545,9 +551,12 @@
update_version_table(); update_version_table();
} }
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
@ -559,9 +568,12 @@
$currentver = "0.9.6"; $currentver = "0.9.6";
update_version_table(); update_version_table();
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
@ -705,9 +717,12 @@
update_version_table(); update_version_table();
} }
*/ */
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
function v0_9_8to0_9_9(){ function v0_9_8to0_9_9(){
@ -732,9 +747,12 @@
update_version_table(); update_version_table();
} }
*/ */
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
function v0_9_9to0_9_10(){ function v0_9_9to0_9_10(){
@ -759,9 +777,12 @@
update_version_table(); update_version_table();
} }
*/ */
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }

7
setup/sql/pgsql_droptables.inc.php
View File

@ -28,10 +28,9 @@
$db->query("DROP TABLE addressbook"); $db->query("DROP TABLE addressbook");
$db->query("drop sequence webcal_entry_cal_id_seq"); $db->query("drop sequence webcal_entry_cal_id_seq");
$db->query("DROP TABLE todo"); $db->query("DROP TABLE todo");
$db->query("DROP TABLE webcal_entry"); $db->query("DROP TABLE calendar_entry");
$db->query("DROP TABLE webcal_entry_repeats"); $db->query("DROP TABLE calendar_entry_repeats");
$db->query("DROP TABLE webcal_entry_user"); $db->query("DROP TABLE calendar_entry_user");
$db->query("DROP TABLE webcal_entry_groups");
$db->query("drop sequence newsgroups_con_seq"); $db->query("drop sequence newsgroups_con_seq");
$db->query("DROP TABLE newsgroups"); $db->query("DROP TABLE newsgroups");
$db->query("DROP TABLE users_newsgroups"); $db->query("DROP TABLE users_newsgroups");

4
setup/sql/pgsql_newtables.inc.php
View File

@ -262,7 +262,7 @@
)"; )";
$db->query($sql); $db->query($sql);
$currentver = "0.9.6"; $currentver = "0.9.7pre2";
$oldversion = $currentver;
update_version_table(); update_version_table();
?> ?>

54
setup/sql/pgsql_upgrade_beta.inc.php
View File

@ -358,9 +358,12 @@
$currentver = "0.9.4"; $currentver = "0.9.4";
update_version_table(); update_version_table();
} }
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
function v0_9_4to0_9_5(){ function v0_9_4to0_9_5(){
@ -555,9 +558,12 @@
update_version_table(); update_version_table();
} }
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
@ -673,9 +679,12 @@
update_version_table(); update_version_table();
} }
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
@ -701,9 +710,12 @@
update_version_table(); update_version_table();
} }
*/ */
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
function v0_9_8to0_9_9(){ function v0_9_8to0_9_9(){
@ -728,9 +740,12 @@
update_version_table(); update_version_table();
} }
*/ */
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }
function v0_9_9to0_9_10(){ function v0_9_9to0_9_10(){
@ -755,9 +770,12 @@
update_version_table(); update_version_table();
} }
*/ */
echo " <tr bgcolor=\"e6e6e6\">\n"; if ($oldversion != $currentver){
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n"; echo " </tr><td>\n";
echo " </tr>\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
echo " </tr>\n";
}
} }
} }