[Phpgroupware-cvs] phpgwapi/setup tables_current.inc.php, 1.32.2.6.2.13, 1.32.2.6.2.14 tables_update.inc.php, 1.53.2.9.2.27, 1.53.2.9.2.28

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

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

Modified Files:
      Tag: Version-0_9_16-branch
        tables_current.inc.php tables_update.inc.php 
Log Message:
Fixes upgrade bugs and stuff.... About the upgrade process problems though...we 
discovered that those
happen because of timeouts in php and apache configs. We will further document 
this in the documentation
so that all know. After that, we deem the upgrade process ready for production.


Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_current.inc.php,v
retrieving revision 1.32.2.6.2.13
retrieving revision 1.32.2.6.2.14
diff -C2 -d -r1.32.2.6.2.13 -r1.32.2.6.2.14
*** tables_current.inc.php      28 Oct 2003 01:33:22 -0000      1.32.2.6.2.13
--- tables_current.inc.php      3 Dec 2003 01:26:58 -0000       1.32.2.6.2.14
***************
*** 366,370 ****
                        'pk' => array('contact_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 366,370 ----
                        'pk' => array('contact_id'),
                        'fk' => array(),
!                       'ix' => array('owner', 'access', 'contact_type_id', 
array('contact_id', 'cat_id', 'contact_type_id')),
                        'uc' => array()
                ),
***************
*** 391,395 ****
                        'pk' => array(),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 391,395 ----
                        'pk' => array(),
                        'fk' => array(),
!                       'ix' => array('person_id'),
                        'uc' => array()
                ),
***************
*** 407,411 ****
                        'pk' => array(),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 407,411 ----
                        'pk' => array(),
                        'fk' => array(),
!                       'ix' => array('org_id', 'active'),
                        'uc' => array()
                ),
***************
*** 421,425 ****
                        'pk' => array('org_id','person_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 421,425 ----
                        'pk' => array('org_id','person_id'),
                        'fk' => array(),
!                       'ix' => array('addr_id', 'person_id', 'org_id', 
'preferred', array('person_id', 'org_id')),
                        'uc' => array()
                ),
***************
*** 445,449 ****
                        'pk' => array('contact_addr_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 445,449 ----
                        'pk' => array('contact_addr_id'),
                        'fk' => array(),
!                       'ix' => array('contact_id', 'addr_type_id', 
'preferred'),
                        'uc' => array()
                ),
***************
*** 461,465 ****
                        'pk' => array('contact_note_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 461,465 ----
                        'pk' => array('contact_note_id'),
                        'fk' => array(),
!                       'ix' => array('contact_id', 'note_type_id'),
                        'uc' => array()
                ),
***************
*** 474,478 ****
                        'pk' => array('other_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 474,478 ----
                        'pk' => array('other_id'),
                        'fk' => array(),
!                       'ix' => 
array('contact_id','contact_owner','other_name'),
                        'uc' => array()
                ),
***************
*** 491,495 ****
                        'pk' => array('comm_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 491,495 ----
                        'pk' => array('comm_id'),
                        'fk' => array(),
!                       'ix' => array('comm_data', 'preferred', 
'comm_descr_id', 'contact_id', array('comm_id', 'contact_id', 'comm_descr_id')),
                        'uc' => array()
                ),
***************
*** 502,506 ****
                        'pk' => array('comm_descr_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 502,506 ----
                        'pk' => array('comm_descr_id'),
                        'fk' => array(),
!                       'ix' => array('descr', 'comm_type_id'),
                        'uc' => array()
                ),
***************
*** 514,518 ****
                        'pk' => array('comm_type_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 514,518 ----
                        'pk' => array('comm_type_id'),
                        'fk' => array(),
!                       'ix' => array('type', 'active', 'class'),
                        'uc' => array()
                ),
***************
*** 525,529 ****
                        'pk' => array('contact_type_id'),
                        'fk' => array(),
!                       'ix' => array(),
                        'uc' => array()
                ),
--- 525,529 ----
                        'pk' => array('contact_type_id'),
                        'fk' => array(),
!                       'ix' => array('contact_type_descr'),
                        'uc' => array()
                ),

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.27
retrieving revision 1.53.2.9.2.28
diff -C2 -d -r1.53.2.9.2.27 -r1.53.2.9.2.28
*** tables_update.inc.php       11 Nov 2003 01:35:28 -0000      1.53.2.9.2.27
--- tables_update.inc.php       3 Dec 2003 01:26:58 -0000       1.53.2.9.2.28
***************
*** 22,28 ****
        function phpgwapi_upgrade0_9_12()
        {
!               global $setup_info,$phpgw_setup;
!               $setup_info['phpgwapi']['currentver'] = '0.9.13.001';
!               return $setup_info['phpgwapi']['currentver'];
        }
  
--- 22,28 ----
        function phpgwapi_upgrade0_9_12()
        {
[...1960 lines suppressed...]
+ 
                /* Get all user accounts for create his contact record   */
!               $GLOBALS['phpgw_setup']->oProc->query("SELECT account_id, 
account_lid, account_firstname, account_lastname, person_id FROM phpgw_accounts 
WHERE account_type='u' AND person_id IS NULL order by account_id");
                while ($GLOBALS['phpgw_setup']->oProc->next_record())
                {
***************
*** 1759,1765 ****
                        
                        /* Get the contact_id  */
!                       $db1->query("SELECT max(contact_id) FROM 
phpgw_contact");
!                       $db1->next_record();
!                       $contact_id = $db1->f(0);
                        
                        /* Insert in phpgw_contact_person */
--- 1681,1685 ----
                        
                        /* Get the contact_id  */
!                       $contact_id++;
                        
                        /* Insert in phpgw_contact_person */