[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/setup tables_current.inc.php, 1.32.2.6.2.11,
|
From: |
Alejandro Borges (lex) <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/setup tables_current.inc.php, 1.32.2.6.2.11, 1.32.2.6.2.12 tables_update.inc.php, 1.53.2.9.2.25, 1.53.2.9.2.26 |
|
Date: |
Tue, 28 Oct 2003 01:23:35 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv32618/phpgwapi/setup
Modified Files:
Tag: Version-0_9_16-branch
tables_current.inc.php tables_update.inc.php
Log Message:
Vcard import and changes to the length of certain tables in contacts.
This table field changes will be exclusively for the new instalations, your
5x series will not be upgraded.
Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_current.inc.php,v
retrieving revision 1.32.2.6.2.11
retrieving revision 1.32.2.6.2.12
diff -C2 -d -r1.32.2.6.2.11 -r1.32.2.6.2.12
*** tables_current.inc.php 19 Oct 2003 01:34:03 -0000 1.32.2.6.2.11
--- tables_current.inc.php 28 Oct 2003 01:23:33 -0000 1.32.2.6.2.12
***************
*** 361,365 ****
'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)
),
--- 361,365 ----
'owner' => array('type' => 'int','precision' =>
'4','nullable' => False),
'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
! 'cat_id' => array('type' =>
'varchar','precision' => '200','nullable' => True),
'contact_type_id' => array('type' =>
'int','precision' => '4','nullable' => False)
),
***************
*** 429,439 ****
'contact_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'addr_type_id' => array('type' =>
'int','precision' => '4','nullable' => False),
! 'add1' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'add2' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'add3' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'city' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'state' => array('type' =>
'varchar','precision' => '30','nullable' => True),
! 'postal_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
! 'country' => array('type' =>
'varchar','precision' => '40','nullable' => True),
'tz' => array('type' => 'varchar','precision'
=> '40','nullable' => True),
'preferred' => array('type' =>
'char','precision' => '1','nullable' => False,'default' => 'N'),
--- 429,439 ----
'contact_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'addr_type_id' => array('type' =>
'int','precision' => '4','nullable' => False),
! 'add1' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'add2' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'add3' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'city' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'state' => array('type' =>
'varchar','precision' => '64','nullable' => True),
! 'postal_code' => array('type' =>
'varchar','precision' => '64','nullable' => True),
! 'country' => array('type' =>
'varchar','precision' => '64','nullable' => True),
'tz' => array('type' => 'varchar','precision'
=> '40','nullable' => True),
'preferred' => array('type' =>
'char','precision' => '1','nullable' => False,'default' => 'N'),
Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.25
retrieving revision 1.53.2.9.2.26
diff -C2 -d -r1.53.2.9.2.25 -r1.53.2.9.2.26
*** tables_update.inc.php 27 Oct 2003 17:24:24 -0000 1.53.2.9.2.25
--- tables_update.inc.php 28 Oct 2003 01:23:33 -0000 1.53.2.9.2.26
***************
*** 777,781 ****
'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)
),
--- 777,781 ----
'owner' => array('type' => 'int','precision' =>
'4','nullable' => False),
'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
! 'cat_id' => array('type' =>
'varchar','precision' => '200','nullable' => True),
'contact_type_id' => array('type' =>
'int','precision' => '4','nullable' => False)
),
***************
*** 849,859 ****
'contact_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'addr_type_id' => array('type' =>
'int','precision' => '4','nullable' => False),
! 'add1' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'add2' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'add3' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'city' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
! 'state' => array('type' =>
'varchar','precision' => '30','nullable' => True),
! 'postal_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
! 'country' => array('type' =>
'varchar','precision' => '40','nullable' => True),
'tz' => array('type' => 'varchar','precision'
=> '40','nullable' => True),
'preferred' => array('type' =>
'char','precision' => '1','nullable' => False,'default' => 'N'),
--- 849,859 ----
'contact_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'addr_type_id' => array('type' =>
'int','precision' => '4','nullable' => False),
! 'add1' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'add2' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'add3' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'city' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
! 'state' => array('type' =>
'varchar','precision' => '64','nullable' => True),
! 'postal_code' => array('type' =>
'varchar','precision' => '64','nullable' => True),
! 'country' => array('type' =>
'varchar','precision' => '64','nullable' => True),
'tz' => array('type' => 'varchar','precision'
=> '40','nullable' => True),
'preferred' => array('type' =>
'char','precision' => '1','nullable' => False,'default' => 'N'),
***************
*** 1253,1268 ****
$db1 = $GLOBALS['phpgw_setup']->db; $db1->auto_stripslashes =
False; $db1->Halt_On_Error = 'yes';
// change null types to something else
! $GLOBALS['phpgw_setup']->oProc->query("SELECT ab.id FROM
phpgw_addressbook AS ab WHERE (adr_one_type IS NULL OR adr_one_type = '');");
! while ($GLOBALS['phpgw_setup']->oProc->next_record())
! {
! $db1->query("UPDATE phpgw_addressbook SET
adr_one_type='default' WHERE id="
! . $GLOBALS['phpgw_setup']->oProc->f('id') );
! }
! $GLOBALS['phpgw_setup']->oProc->query("SELECT ab.id FROM
phpgw_addressbook AS ab WHERE (adr_two_type IS NULL OR adr_two_type = '');");
! while ($GLOBALS['phpgw_setup']->oProc->next_record())
! {
! $db1->query("UPDATE phpgw_addressbook SET
adr_two_type='default' WHERE id="
! . $GLOBALS['phpgw_setup']->oProc->f('id') );
! }
// migrate existing data to phpgw_contact_addr
$ids=array();
--- 1253,1259 ----
$db1 = $GLOBALS['phpgw_setup']->db; $db1->auto_stripslashes =
False; $db1->Halt_On_Error = 'yes';
// change null types to something else
! $db1->query("UPDATE phpgw_addressbook SET
adr_one_type='default' WHERE (adr_one_type IS NULL OR adr_one_type = '')");
! $db1->query("UPDATE phpgw_addressbook SET
adr_two_type='default' WHERE (adr_two_type IS NULL OR adr_two_type = '')");
!
// migrate existing data to phpgw_contact_addr
$ids=array();
***************
*** 1713,1771 ****
// remove temporary ab_id field in phpgw_contact,
phpgw_contact_person, and phpgw_contact_org
//OR NOT! On 512!
- //
$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!!!
--- 1704,1707 ----
***************
*** 1852,1859 ****
{
global $setup_info,$phpgw_setup;
-
$db1 = $GLOBALS['phpgw_setup']->db; $db1->auto_stripslashes =
False; $db1->Halt_On_Error = 'yes';
! $addressmaster_id = -3;
! $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config
(config_app, config_name, config_value) VALUES
('phpgwapi','addressmaster','-3')");
/* Get the contact type id */
--- 1788,1805 ----
{
global $setup_info,$phpgw_setup;
$db1 = $GLOBALS['phpgw_setup']->db; $db1->auto_stripslashes =
False; $db1->Halt_On_Error = 'yes';
!
! /* Check if addressmaster exist */
! $GLOBALS['phpgw_setup']->oProc->query("SELECT config_name,
config_value FROM phpgw_config WHERE config_name = 'addressmaster'");
! if($GLOBALS['phpgw_setup']->oProc->next_record())
! {
! $addressmaster_id =
$GLOBALS['phpgw_setup']->oProc->f('config_value');
! }
! else
! {
! $db1->query("INSERT INTO phpgw_config (config_app,
config_name, config_value)
! VALUES ('phpgwapi','addressmaster','-3')");
! $addressmaster_id = -3;
! }
/* Get the contact type id */
***************
*** 1894,1897 ****
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
-
?>
--- 1840,1842 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/setup tables_current.inc.php, 1.32.2.6.2.11, 1.32.2.6.2.12 tables_update.inc.php, 1.53.2.9.2.25, 1.53.2.9.2.26,
Alejandro Borges (lex) <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] api starter.inc.php,1.1.1.1.2.7,1.1.1.1.2.8
- Next by Date:
[Phpgroupware-cvs] phpgwapi/inc class.contact_central.inc.php, 1.1.2.6, 1.1.2.7 class.contacts_sql.inc.php, 1.17.2.2.2.27, 1.17.2.2.2.28 class.vcard.inc.php, 1.4, 1.4.4.1
- Previous by thread:
[Phpgroupware-cvs] api starter.inc.php,1.1.1.1.2.7,1.1.1.1.2.8
- Next by thread:
[Phpgroupware-cvs] phpgwapi/inc class.contact_central.inc.php, 1.1.2.6, 1.1.2.7 class.contacts_sql.inc.php, 1.17.2.2.2.27, 1.17.2.2.2.28 class.vcard.inc.php, 1.4, 1.4.4.1
- Index(es):