[Phpgroupware-cvs] phpgwapi/setup tables_baseline.inc.php, 1.5.4.3, 1.5.4.4 tables_update.inc.php, 1.53.2.9.2.22, 1.53.2.9.2.23

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

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

Modified Files:
      Tag: Version-0_9_16-branch
        tables_baseline.inc.php tables_update.inc.php 
Log Message:
Removed drop columns for the ab_id column....cant hurt, but helps some stuff


Index: tables_baseline.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_baseline.inc.php,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -C2 -d -r1.5.4.3 -r1.5.4.4
*** tables_baseline.inc.php     23 Oct 2003 23:31:39 -0000      1.5.4.3
--- tables_baseline.inc.php     24 Oct 2003 00:36:31 -0000      1.5.4.4
***************
*** 105,109 ****
                        'uc' => array()
                ),
!               'phpgw_access_log' => array(
                        'fd' => array(
                                'sessionid' => array('type' => 'varchar', 
'precision' => 30),
--- 105,109 ----
                        'uc' => array()
                ),
!               'access_log' => array(
                        'fd' => array(
                                'sessionid' => array('type' => 'varchar', 
'precision' => 30),

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.22
retrieving revision 1.53.2.9.2.23
diff -C2 -d -r1.53.2.9.2.22 -r1.53.2.9.2.23
*** tables_update.inc.php       23 Oct 2003 23:31:39 -0000      1.53.2.9.2.22
--- tables_update.inc.php       24 Oct 2003 00:36:31 -0000      1.53.2.9.2.23
***************
*** 1712,1770 ****
                
                // remove temporary ab_id field in phpgw_contact, 
phpgw_contact_person, and phpgw_contact_org
!               
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_contact',array(
!                       'fd' => array(
!                               'contact_id' => array('type' => 
'auto','precision' => '4','nullable' => False),
!                               'owner' => array('type' => 'int','precision' => 
'4','nullable' => False),
!                               'access' => array('type' => 
'varchar','precision' => '7','nullable' => True),
!                               'cat_id' => array('type' => 
'varchar','precision' => '32','nullable' => True),
!                               'contact_type_id' => array('type' => 
'int','precision' => '4','nullable' => False)
!                       ),
!                       'pk' => array('contact_id'),
!                       'fk' => array(),
!                       'ix' => array(),
!                       'uc' => array()
!                       ),'ab_id');
! 
!               
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_contact_person',array(
!                       'fd' => array(
!                               'person_id' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'first_name' => array('type' => 
'varchar','precision' => '64','nullable' => False),
!                               'last_name' => array('type' => 
'varchar','precision' => '64','nullable' => False),
!                               'middle_name' => array('type' => 
'varchar','precision' => '64','nullable' => True),
!                               'prefix' => array('type' => 
'varchar','precision' => '64','nullable' => True),
!                               'suffix' => array('type' => 
'varchar','precision' => '64','nullable' => True),
!                               'birthday' => array('type' => 
'varchar','precision' => '32','nullable' => True),
!                               'pubkey' => array('type' => 'text','nullable' 
=> True),
!                               'title' => array('type' => 
'varchar','precision' => '64','nullable' => True),
!                               'department' => array('type' => 
'varchar','precision' => '64','nullable' => True),
!                               'initials' => array('type' => 
'varchar','precision' => '10','nullable' => True),
!                               'sound' => array('type' => 
'varchar','precision' => '64','nullable' => True),
!                               'active' => array('type' => 'char','precision' 
=> '1','nullable' => True,'default' => 'Y'),
!                               'created_on' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'created_by' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'modified_on' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'modified_by' => array('type' => 
'int','precision' => '4','nullable' => False)
!                       ),
!                       'pk' => array(),
!                       'fk' => array(),
!                       'ix' => array(),
!                       'uc' => array()
!                       ),'ab_id');
!               
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_contact_org',array(
!                       'fd' => array(
!                               'org_id' => array('type' => 'int','precision' 
=> '4','nullable' => False),
!                               'name' => array('type' => 'varchar','precision' 
=> '80','nullable' => False),
!                               'active' => array('type' => 'char','precision' 
=> '1','nullable' => False,'default' => 'Y'),
!                               'parent' => array('type' => 'int','precision' 
=> '4','nullable' => True),
!                               'created_on' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'created_by' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'modified_on' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'modified_by' => array('type' => 
'int','precision' => '4','nullable' => False)
!                       ),
!                       'pk' => array(),
!                       'fk' => array(),
!                       'ix' => array(),
!                       'uc' => array()
!                       ),'ab_id');
  
                // Paste this below!!!
--- 1712,1716 ----
                
                // remove temporary ab_id field in phpgw_contact, 
phpgw_contact_person, and phpgw_contact_org
!               //OR NOT! On 512!
  
                // Paste this below!!!