From 4c5c768c44c7aaf61eb1d80c907c8ba7a249cba7 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Thu, 19 Apr 2001 20:20:20 +0000 Subject: [PATCH] Hopefully final cleanup of addressbook table migration --- setup/sql/mysql_upgrade_beta.inc.php | 8 +++++++- setup/sql/pgsql_upgrade_beta.inc.php | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php index 4b3a3e7cd6..00fc896b69 100644 --- a/setup/sql/mysql_upgrade_beta.inc.php +++ b/setup/sql/mysql_upgrade_beta.inc.php @@ -1300,7 +1300,13 @@ $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__); diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php index 8e05fdf127..c78896eac3 100644 --- a/setup/sql/pgsql_upgrade_beta.inc.php +++ b/setup/sql/pgsql_upgrade_beta.inc.php @@ -1564,6 +1564,12 @@ $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__);