[Phpgroupware-cvs] phpgwapi/setup tables_update.inc.php, 1.53.2.9.2.26, 1.53.2.9.2.27

[Alejandro Borges (lex) <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv31596

Modified Files:
      Tag: Version-0_9_16-branch
        tables_update.inc.php 
Log Message:
SMOOTHER UPGRADE FOR CONTACTS FROM 17.


Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.26
retrieving revision 1.53.2.9.2.27
diff -C2 -d -r1.53.2.9.2.26 -r1.53.2.9.2.27
*** tables_update.inc.php       28 Oct 2003 01:23:33 -0000      1.53.2.9.2.26
--- tables_update.inc.php       11 Nov 2003 01:35:28 -0000      1.53.2.9.2.27
***************
*** 764,770 ****
        $test[] = '0.9.14.508';
        function phpgwapi_upgrade0_9_14_508()
!       {
!       
!               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_accounts','person_id',array(
                        'type' => 'int',
                        'precision' => '4',
--- 764,772 ----
        $test[] = '0.9.14.508';
        function phpgwapi_upgrade0_9_14_508()
[...1548 lines suppressed...]
                  }
! 
! //            // add custom fields
!               $phpgw_setup->oProc->query("SELECT p.person_id, 
abe.contact_owner, abe.contact_name, abe.contact_value FROM 
phpgw_addressbook_extra AS abe INNER JOIN phpgw_contact_person as p ON 
abe.contact_id=p.ab_id WHERE abe.contact_name!='address2' and 
abe.contact_name!='address3' and abe.contact_name!='' and 
abe.contact_value!=''");
!                 while ($phpgw_setup->oProc->next_record())
                {
!                       $db1->query("INSERT INTO phpgw_contact_others 
(contact_id, contact_owner, other_name, other_value) VALUES("
!                                   . $phpgw_setup->oProc->f('person_id')
!                                   . ", " . 
$phpgw_setup->oProc->f('contact_owner')
!                                   . ", '" . 
$db1->db_addslashes($phpgw_setup->oProc->f('contact_name'))  . "' "
!                                   . ", '" . 
$db1->db_addslashes($phpgw_setup->oProc->f('contact_value')) . "' "
!                                   .")");
!               }
! 
                //maybe leave these until a future version to catch any data 
migration problems that are reported
                // when all data migrated, delete phpgw_addressbook and 
phpgw_addressbook_extra tables
!               //$phpgw_setup->oProc->DropTable('phpgw_addressbook');
!               //$phpgw_setup->oProc->DropTable('phpgw_addressbook_extra');
                
                // remove temporary ab_id field in phpgw_contact, 
phpgw_contact_person, and phpgw_contact_org