From 17fce87d23e6757b6c28ca58a93fe62616770ba2 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Thu, 19 Apr 2001 20:24:41 +0000 Subject: [PATCH] No, more was needed --- setup/sql/mysql_upgrade_beta.inc.php | 15 ++++++++------- setup/sql/pgsql_upgrade_beta.inc.php | 6 ------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php index 00fc896b69..d53d25b2f6 100644 --- a/setup/sql/mysql_upgrade_beta.inc.php +++ b/setup/sql/mysql_upgrade_beta.inc.php @@ -1300,13 +1300,7 @@ $phpgw_setup->db->query("update phpgw_addressbook set tel_prefer='' where tel_prefer='n' OR tel_prefer='y'"); $phpgw_setup->db->query("update phpgw_addressbook set tel_video='' where tel_video='n' OR tel_video='y'"); $phpgw_setup->db->query("update phpgw_addressbook set tel_isdn='' where tel_isdn='n' OR tel_isdn='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_one_type='' where adr_one_type='n' OR adr_one_type='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_two_type='' where adr_two_type='n' OR adr_two_type='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_two_region='' where adr_two_region='n' OR adr_two_region='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_two_postalcode='' where adr_two_postalcode='n' OR adr_two_postalcode='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set email_home='' where email_home='n' OR email_home='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set email_home_type='' where email_home_type='n' OR email_home_type='y'"); - + $sql = "SELECT * FROM phpgw_addressbook_extra WHERE contact_name='mphone'"; $phpgw_setup->db->query($sql,__LINE__,__FILE__); @@ -1341,6 +1335,13 @@ $phpgw_setup->db->query("alter table phpgw_addressbook change adr_postal adr_two_postalcode varchar(64)"); $phpgw_setup->db->query("alter table phpgw_addressbook add adr_two_countryname varchar(64)"); + $phpgw_setup->db->query("update phpgw_addressbook set adr_one_type='' where adr_one_type='n' OR adr_one_type='y'"); + $phpgw_setup->db->query("update phpgw_addressbook set adr_two_type='' where adr_two_type='n' OR adr_two_type='y'"); + $phpgw_setup->db->query("update phpgw_addressbook set adr_two_region='' where adr_two_region='n' OR adr_two_region='y'"); + $phpgw_setup->db->query("update phpgw_addressbook set adr_two_postalcode='' where adr_two_postalcode='n' OR adr_two_postalcode='y'"); + $phpgw_setup->db->query("update phpgw_addressbook set email_home='' where email_home='n' OR email_home='y'"); + $phpgw_setup->db->query("update phpgw_addressbook set email_home_type='' where email_home_type='n' OR email_home_type='y'"); + $phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre18'; } diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php index c78896eac3..8e05fdf127 100644 --- a/setup/sql/pgsql_upgrade_beta.inc.php +++ b/setup/sql/pgsql_upgrade_beta.inc.php @@ -1564,12 +1564,6 @@ $phpgw_setup->db->query("update phpgw_addressbook set tel_prefer='' where tel_prefer='n' OR tel_prefer='y'"); $phpgw_setup->db->query("update phpgw_addressbook set tel_video='' where tel_video='n' OR tel_video='y'"); $phpgw_setup->db->query("update phpgw_addressbook set tel_isdn='' where tel_isdn='n' OR tel_isdn='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_one_type='' where adr_one_type='n' OR adr_one_type='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_two_type='' where adr_two_type='n' OR adr_two_type='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_two_region='' where adr_two_region='n' OR adr_two_region='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set adr_two_postalcode='' where adr_two_postalcode='n' OR adr_two_postalcode='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set email_home='' where email_home='n' OR email_home='y'"); - $phpgw_setup->db->query("update phpgw_addressbook set email_home_type='' where email_home_type='n' OR email_home_type='y'"); $sql = "SELECT * FROM phpgw_addressbook_extra WHERE contact_name='mphone'"; $phpgw_setup->db->query($sql,__LINE__,__FILE__);