Should be up-to-date. Still need one upgrade path from 0.9.10pre4.

This commit is contained in:
skeeter 2001-06-04 03:29:26 +00:00
parent 3d4251a1c7
commit 1ce692b36a
2 changed files with 312 additions and 105 deletions

View File

@ -35,13 +35,13 @@
'phpgw_cal_holidays' => array( 'phpgw_cal_holidays' => array(
'fd' => array( 'fd' => array(
'hol_id' => array('type' => 'auto','nullable' => False), 'hol_id' => array('type' => 'auto','nullable' => False),
'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False), 'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False), 'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
'mday' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'mday' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'),
'month_num' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'month_num' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'),
'occurence' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'occurence' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'),
'dow' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'dow' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'),
'observance_rule' => array('type' => 'int', 'precision' => 8,'nullable' => False) 'observance_rule' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
), ),
'pk' => array('hol_id'), 'pk' => array('hol_id'),
'fk' => array(), 'fk' => array(),
@ -50,12 +50,12 @@
), ),
'phpgw_cal_repeats' => array( 'phpgw_cal_repeats' => array(
'fd' => array( 'fd' => array(
'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'cal_id' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'recur_type' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
'recur_use_end' => array('type' => 'int', 'precision' => 8,'nullable' => True), 'recur_use_end' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '0'),
'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True), 'recur_enddate' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'), 'recur_interval' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1'),
'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1') 'recur_data' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1')
), ),
'pk' => array(), 'pk' => array(),
'fk' => array(), 'fk' => array(),
@ -64,9 +64,9 @@
), ),
'phpgw_cal_user' => array( 'phpgw_cal_user' => array(
'fd' => array( 'fd' => array(
'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'cal_id' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' = > '0'),
'cal_login' => array('type' => 'int', 'precision' => 8,'nullable' => False), 'cal_login' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' = > '0'),
'cal_status' => array('type' => 'char', 'precision' => 1,'nullable' => True,'default' => 'A') 'cal_status' => array('type' => 'char', 'precision' => 1, 'nullable' => True, 'default' => 'A')
), ),
'pk' => array('cal_id','cal_login'), 'pk' => array('cal_id','cal_login'),
'fk' => array(), 'fk' => array(),

View File

@ -11,134 +11,134 @@
/* $Id$ */ /* $Id$ */
$test[] = "0.9.3pre1"; $test[] = '0.9.3pre1';
function calendar_upgrade0_9_3pre1() function calendar_upgrade0_9_3pre1()
{ {
global $phpgw_info; global $phpgw_info;
v0_9_2to0_9_3update_owner("webcal_entry","cal_create_by"); v0_9_2to0_9_3update_owner('webcal_entry','cal_create_by');
v0_9_2to0_9_3update_owner("webcal_entry_user","cal_login"); v0_9_2to0_9_3update_owner('webcal_entry_user','cal_login');
$phpgw_info["setup"]["currentver"]["calendar"] = "0.9.3pre2"; $phpgw_info['setup']['currentver']['calendar'] = '0.9.3pre2';
} }
$test[] = "0.9.4pre2"; $test[] = '0.9.4pre2';
function calendar_upgrade0_9_4pre2() function calendar_upgrade0_9_4pre2()
{ {
global $phpgw_info, $oProc; global $phpgw_info, $oProc;
$oProc->RenameColumn("webcal_entry", "cal_create_by", "cal_owner"); $oProc->RenameColumn('webcal_entry', 'cal_create_by', 'cal_owner');
$oProc->AlterColumn("webcal_entry", "cal_owner", array("type" => "int", "precision" => 4, "nullable" => false)); $oProc->AlterColumn('webcal_entry', 'cal_owner', array('type' => 'int', 'precision' => 4, 'nullable' => false));
$phpgw_info["setup"]["currentver"]["calendar"] = "0.9.4pre3"; $phpgw_info['setup']['currentver']['calendar'] = '0.9.4pre3';
} }
$test[] = "0.9.7pre1"; $test[] = '0.9.7pre1';
function calendar_upgrade0_9_7pre1() function calendar_upgrade0_9_7pre1()
{ {
global $phpgw_info, $oProc; global $phpgw_info, $oProc;
$db2 = $oProc->m_odb; $db2 = $oProc->m_odb;
$oProc->CreateTable("calendar_entry", array( $oProc->CreateTable('calendar_entry', array(
"fd" => array( 'fd' => array(
"cal_id" => array("type" => "auto", "nullable" => false), 'cal_id' => array('type' => 'auto', 'nullable' => false),
"cal_owner" => array("type" => "int", "precision" => 4, "nullable" => false, "default" => "0"), 'cal_owner' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
"cal_group" => array("type" => "varchar", "precision" => 255), 'cal_group' => array('type' => 'varchar', 'precision' => 255),
"cal_datetime" => array("type" => "int", "precision" => 4), 'cal_datetime' => array('type' => 'int', 'precision' => 4),
"cal_mdatetime" => array("type" => "int", "precision" => 4), 'cal_mdatetime' => array('type' => 'int', 'precision' => 4),
"cal_duration" => array("type" => "int", "precision" => 4, "nullable" => false, "default" => "0"), 'cal_duration' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
"cal_priority" => array("type" => "int", "precision" => 4, "nullable" => false, "default" => "2"), 'cal_priority' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '2'),
"cal_type" => array("type" => "varchar", "precision" => 10), 'cal_type' => array('type' => 'varchar', 'precision' => 10),
"cal_access" => array("type" => "varchar", "precision" => 10), 'cal_access' => array('type' => 'varchar', 'precision' => 10),
"cal_name" => array("type" => "varchar", "precision" => 80, "nullable" => false), 'cal_name' => array('type' => 'varchar', 'precision' => 80, 'nullable' => false),
"cal_description" => array("type" => "text") 'cal_description' => array('type' => 'text')
), ),
"pk" => array("cal_id"), 'pk' => array("cal_id"),
"ix" => array(), 'ix' => array(),
"fk" => array(), 'fk' => array(),
"uc" => array() 'uc' => array()
)); ));
$oProc->m_odb->query("SELECT count(*) FROM webcal_entry",__LINE__,__FILE__); $oProc->m_odb->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
$oProc->m_odb->next_record(); $oProc->m_odb->next_record();
if($oProc->m_odb->f(0)) if($oProc->m_odb->f(0))
{ {
$oProc->m_odb->query("SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id",__LINE__,__FILE__); $oProc->m_odb->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
while($oProc->m_odb->next_record()) while($oProc->m_odb->next_record())
{ {
$cal_id = $oProc->m_odb->f("cal_id"); $cal_id = $oProc->m_odb->f('cal_id');
$cal_owner = $oProc->m_odb->f("cal_owner"); $cal_owner = $oProc->m_odb->f('cal_owner');
$cal_duration = $oProc->m_odb->f("cal_duration"); $cal_duration = $oProc->m_odb->f('cal_duration');
$cal_priority = $oProc->m_odb->f("cal_priority"); $cal_priority = $oProc->m_odb->f('cal_priority');
$cal_type = $oProc->m_odb->f("cal_type"); $cal_type = $oProc->m_odb->f('cal_type');
$cal_access = $oProc->m_odb->f("cal_access"); $cal_access = $oProc->m_odb->f('cal_access');
$cal_name = $oProc->m_odb->f("cal_name"); $cal_name = $oProc->m_odb->f('cal_name');
$cal_description = $oProc->m_odb->f("cal_description"); $cal_description = $oProc->m_odb->f('cal_description');
$datetime = mktime(intval(strrev(substr(strrev($oProc->m_odb->f("cal_time")),4))),intval(strrev(substr(strrev($oProc->m_odb->f("cal_time")),2,2))),intval(strrev(substr(strrev($oProc->m_odb->f("cal_time")),0,2))),intval(substr($oProc->m_odb->f("cal_date"),4,2)),intval(substr($oProc->m_odb->f("cal_date"),6,2)),intval(substr($oProc->m_odb->f("cal_date"),0,4))); $datetime = mktime(intval(strrev(substr(strrev($oProc->m_odb->f('cal_time')),4))),intval(strrev(substr(strrev($oProc->m_odb->f('cal_time')),2,2))),intval(strrev(substr(strrev($oProc->m_odb->f('cal_time')),0,2))),intval(substr($oProc->m_odb->f('cal_date'),4,2)),intval(substr($oProc->m_odb->f('cal_date'),6,2)),intval(substr($oProc->m_odb->f('cal_date'),0,4)));
$moddatetime = mktime(intval(strrev(substr(strrev($oProc->m_odb->f("cal_mod_time")),4))),intval(strrev(substr(strrev($oProc->m_odb->f("cal_mod_time")),2,2))),intval(strrev(substr(strrev($oProc->m_odb->f("cal_mod_time")),0,2))),intval(substr($oProc->m_odb->f("cal_mod_date"),4,2)),intval(substr($oProc->m_odb->f("cal_mod_date"),6,2)),intval(substr($oProc->m_odb->f("cal_mod_date"),0,4))); $moddatetime = mktime(intval(strrev(substr(strrev($oProc->m_odb->f('cal_mod_time')),4))),intval(strrev(substr(strrev($oProc->m_odb->f('cal_mod_time')),2,2))),intval(strrev(substr(strrev($oProc->m_odb->f('cal_mod_time')),0,2))),intval(substr($oProc->m_odb->f('cal_mod_date'),4,2)),intval(substr($oProc->m_odb->f('cal_mod_date'),6,2)),intval(substr($oProc->m_odb->f('cal_mod_date'),0,4)));
$db2->query("SELECT groups FROM webcal_entry_groups WHERE cal_id=".$cal_id,__LINE__,__FILE__); $db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id,__LINE__,__FILE__);
$db2->next_record(); $db2->next_record();
$cal_group = $db2->f("groups"); $cal_group = $db2->f('groups');
$db2->query("INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) " $db2->query('INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) '
."VALUES(".$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__); .'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
} }
} }
$oProc->DropTable("webcal_entry_groups"); $oProc->DropTable('webcal_entry_groups');
$oProc->DropTable("webcal_entry"); $oProc->DropTable('webcal_entry');
$oProc->CreateTable("calendar_entry_user", array( $oProc->CreateTable('calendar_entry_user', array(
"fd" => array( 'fd' => array(
"cal_id" => array("type" => "int", "precision" => 4, "nullable" => false, "default" => "0"), 'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
"cal_login" => array("type" => "int", "precision" => 4, "nullable" => false, "default" => "0"), 'cal_login' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
"cal_status" => array("type" => "char", "precision" => 1, "default" => "A") 'cal_status' => array('type' => 'char', 'precision' => 1, 'default' => 'A')
), ),
"pk" => array("cal_id", "cal_login"), 'pk' => array('cal_id', 'cal_login'),
"ix" => array(), 'ix' => array(),
"fk" => array(), 'fk' => array(),
"uc" => array() 'uc' => array()
)); ));
$oProc->m_odb->query("SELECT count(*) FROM webcal_entry_user",__LINE__,__FILE__); $oProc->m_odb->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
$oProc->m_odb->next_record(); $oProc->m_odb->next_record();
if($oProc->m_odb->f(0)) if($oProc->m_odb->f(0))
{ {
$oProc->m_odb->query("SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id",__LINE__,__FILE__); $oProc->m_odb->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id',__LINE__,__FILE__);
while($oProc->m_odb->next_record()) while($oProc->m_odb->next_record())
{ {
$cal_id = $oProc->m_odb->f("cal_id"); $cal_id = $oProc->m_odb->f('cal_id');
$cal_login = $oProc->m_odb->f("cal_login"); $cal_login = $oProc->m_odb->f('cal_login');
$cal_status = $oProc->m_odb->f("cal_status"); $cal_status = $oProc->m_odb->f('cal_status');
$db2->query("INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES(".$cal_id.",".$cal_login.",'".$cal_status."')",__LINE__,__FILE__); $db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')",__LINE__,__FILE__);
} }
} }
$oProc->DropTable("webcal_entry_user"); $oProc->DropTable('webcal_entry_user');
$oProc->CreateTable("calendar_entry_repeats", array( $oProc->CreateTable('calendar_entry_repeats', array(
"fd" => array( 'fd' => array(
"cal_id" => array("type" => "int", "precision" => 4, "default" => "0", "nullable" => false), 'cal_id' => array('type' => 'int', 'precision' => 4, 'default' => '0', 'nullable' => false),
"cal_type" => array("type" => "varchar", "precision" => 20, "default" => "daily", "nullable" => false), 'cal_type' => array('type' => 'varchar', 'precision' => 20, 'default' => 'daily', 'nullable' => false),
"cal_use_end" => array("type" => "int", "precision" => 4, "default" => "0"), 'cal_use_end' => array('type' => 'int', 'precision' => 4, 'default' => '0'),
"cal_end" => array("type" => "int", "precision" => 4), 'cal_end' => array('type' => 'int', 'precision' => 4),
"cal_frequency" => array("type" => "int", "precision" => 4, "default" => "1"), 'cal_frequency' => array('type' => 'int', 'precision' => 4, 'default' => '1'),
"cal_days" => array("type" => "char", "precision" => 7) 'cal_days' => array('type' => 'char', 'precision' => 7)
), ),
"pk" => array(), 'pk' => array(),
"ix" => array(), 'ix' => array(),
"fk" => array(), 'fk' => array(),
"uc" => array() 'uc' => array()
)); ));
$oProc->m_odb->query("SELECT count(*) FROM webcal_entry_repeats",__LINE__,__FILE__); $oProc->m_odb->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
$oProc->m_odb->next_record(); $oProc->m_odb->next_record();
if($oProc->m_odb->f(0)) if($oProc->m_odb->f(0))
{ {
$oProc->m_odb->query("SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id",__LINE__,__FILE__); $oProc->m_odb->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id',__LINE__,__FILE__);
while($oProc->m_odb->next_record()) while($oProc->m_odb->next_record())
{ {
$cal_id = $oProc->m_odb->f("cal_id"); $cal_id = $oProc->m_odb->f('cal_id');
$cal_type = $oProc->m_odb->f("cal_type"); $cal_type = $oProc->m_odb->f('cal_type');
if(isset($oProc->m_odb->Record["cal_end"])) if(isset($oProc->m_odb->Record['cal_end']))
{ {
$enddate = mktime(0,0,0,intval(substr($phpgw_setup->db->f("cal_end"),4,2)),intval(substr($phpgw_setup->db->f("cal_end"),6,2)),intval(substr($phpgw_setup->db->f("cal_end"),0,4))); $enddate = mktime(0,0,0,intval(substr($oProc->m_odb->f('cal_end'),4,2)),intval(substr($oProc->m_odb->f('cal_end'),6,2)),intval(substr($oProc->m_odb->f('cal_end'),0,4)));
$useend = 1; $useend = 1;
} }
else else
@ -146,16 +146,16 @@
$enddate = 0; $enddate = 0;
$useend = 0; $useend = 0;
} }
$cal_frequency = $oProc->m_odb->f("cal_frequency"); $cal_frequency = $oProc->m_odb->f('cal_frequency');
$cal_days = $oProc->m_odb->f("cal_days"); $cal_days = $oProc->m_odb->f('cal_days');
$db2->query("INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES(".$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')",__LINE__,__FILE__); $db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')",__LINE__,__FILE__);
} }
} }
$oProc->DropTable("webcal_entry_repeats"); $oProc->DropTable('webcal_entry_repeats');
$oProc->m_odb->query("UPDATE applications SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__); $oProc->m_odb->query("UPDATE applications SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
$phpgw_info["setup"]["currentver"]["calendar"] = "0.9.7pre2"; $phpgw_info['setup']['currentver']['calendar'] = '0.9.7pre2';
} }
$test[] = "0.9.7pre2"; $test[] = "0.9.7pre2";
@ -164,16 +164,16 @@
global $oldversion, $phpgw_info, $phpgw_setup, $oProc, $oDelta; global $oldversion, $phpgw_info, $phpgw_setup, $oProc, $oDelta;
$db2 = $oProc->m_odb; $db2 = $oProc->m_odb;
$oProc->RenameColumn("calendar_entry", "cal_duration", "cal_edatetime"); $oProc->RenameColumn('calendar_entry', 'cal_duration', 'cal_edatetime');
$oProc->m_odb->query("SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id",__LINE__,__FILE__); $oProc->m_odb->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id',__LINE__,__FILE__);
if($oProc->m_odb->num_rows()) if($oProc->m_odb->num_rows())
{ {
while($oProc->m_odb->next_record()) while($oProc->m_odb->next_record())
{ {
$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$phpgw_setup->db->f("cal_owner"),__LINE__,__FILE__); $db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$phpgw_setup->db->f('cal_owner'),__LINE__,__FILE__);
$db2->next_record(); $db2->next_record();
$tz = $db2->f("preference_value"); $tz = $db2->f('preference_value');
$cal_id = $oProc->m_odb->f("cal_id"); $cal_id = $oProc->m_odb->f('cal_id');
$datetime = $oProc->m_odb->f("cal_datetime") - ((60 * 60) * $tz); $datetime = $oProc->m_odb->f("cal_datetime") - ((60 * 60) * $tz);
$mdatetime = $oProc->m_odb->f("cal_mdatetime") - ((60 * 60) * $tz); $mdatetime = $oProc->m_odb->f("cal_mdatetime") - ((60 * 60) * $tz);
$edatetime = $datetime + (60 * $oProc->m_odb->f("cal_edatetime")); $edatetime = $datetime + (60 * $oProc->m_odb->f("cal_edatetime"));
@ -181,6 +181,213 @@
} }
} }
$phpgw_info["setup"]["currentver"]["calendar"] = "0.9.7pre3"; $phpgw_info['setup']['currentver']['calendar'] = '0.9.7pre3';
}
$test[] = '0.9.11.001';
function upgrade0_9_11_001()
{
global $phpgw_info, $phpgw_setup, $oProc;
$db2 = $oProc->m_odb;
if(extension_loaded('mcal') == False)
{
define(RECUR_NONE,0);
define(RECUR_DAILY,1);
define(RECUR_WEEKLY,2);
define(RECUR_MONTHLY_MDAY,3);
define(RECUR_MONTHLY_WDAY,4);
define(RECUR_YEARLY,5);
define(M_SUNDAY,1);
define(M_MONDAY,2);
define(M_TUESDAY,4);
define(M_WEDNESDAY,8);
define(M_THURSDAY,16);
define(M_FRIDAY,32);
define(M_SATURDAY,64);
}
// calendar_entry => phpgw_cal
$oProc->CreateTable('phpgw_cal' => array(
'fd' => array(
'cal_id' => array('type' => 'auto', 'nullable' => False),
'owner' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
'category' => array('type' => 'int', 'precision' => 8, 'default' => '0', 'nullable' => False),
'groups' => array('type' => 'varchar', 'precision' => 255, 'nullable' => True),
'datetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
'mdatetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
'edatetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
'priority' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '2'),
'cal_type' => array('type' => 'varchar', 'precision' => 10, 'nullable' => True),
'is_public' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '1'),
'title' => array('type' => 'varchar', 'precision' => 80, 'nullable' => False, 'default' => '1'),
'description' => array('type' => 'text', 'nullable' => True)
),
'pk' => array('cal_id'),
'fk' => array(),
'ix' => array(),
'uc' => array()
));
$oProc->m_odb->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
while($oProc->m_odb->next_record())
{
$id = $oProc->m_odb->f('cal_id');
$owner = $oProc->m_odb->f('cal_owner');
$access = $oProc->m_odb->f('cal_access');
switch($access)
{
case 'private':
$is_public = 0;
break;
case 'public':
$is_public = 1;
break;
case 'group':
$is_public = 2;
break;
}
$groups = $oProc->m_odb->f('cal_group');
$datetime = $oProc->m_odb->f('cal_datetime');
$mdatetime = $oProc->m_odb->f('cal_mdatetime');
$edatetime = $oProc->m_odb->f('cal_edatetime');
$priority = $oProc->m_odb->f('cal_priority');
$type = $oProc->m_odb->f('cal_type');
$title = $oProc->m_odb->f('cal_name');
$description = $oProc->m_odb->f('cal_description');
$db2->query("INSERT INTO phpgw_cal(cal_id,owner,groups,datetime,mdatetime,edatetime,priority,cal_type,is_public,title,description) "
. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')",__LINE__,__FILE__);
}
$oProc->DropTable('calendar_entry');
// calendar_entry_repeats => phpgw_cal_repeats
$oProc->CreateTable('phpgw_cal_repeats' => array(
'fd' => array(
'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
'recur_use_end' => array('type' => 'int', 'precision' => 8,'nullable' => True),
'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True),
'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'),
'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1')
),
'pk' => array(),
'fk' => array(),
'ix' => array(),
'uc' => array()
));
$oProc->m_odb->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
while($oProc->m_odb->next_record())
{
$id = $oProc->m_odb->f('cal_id');
$recur_type = $oProc->m_odb->f('cal_type');
switch($recur_type)
{
case 'daily':
$recur_type_num = RECUR_DAILY;
break;
case 'weekly':
$recur_type_num = RECUR_WEEKLY;
break;
case 'monthlybydate':
$recur_type_num = RECUR_MONTHLY_MDAY;
break;
case 'monthlybyday':
$recur_type_num = RECUR_MONTHLY_WDAY;
break;
case 'yearly':
$recur_type_num = RECUR_YEARLY;
break;
}
$recur_end_use = $oProc->m_odb->f('cal_use_end');
$recur_end = $oProc->m_odb->f('cal_end');
$recur_interval = $oProc->m_odb->f('cal_frequency');
$days = strtoupper($oProc->m_odb->f('cal_days'));
$recur_data = 0;
$recur_data += (substr($days,0,1)=='Y'?M_SUNDAY:0);
$recur_data += (substr($days,1,1)=='Y'?M_MONDAY:0);
$recur_data += (substr($days,2,1)=='Y'?M_TUESDAY:0);
$recur_data += (substr($days,3,1)=='Y'?M_WEDNESDAY:0);
$recur_data += (substr($days,4,1)=='Y'?M_THURSDAY:0);
$recur_data += (substr($days,5,1)=='Y'?M_FRIDAY:0);
$recur_data += (substr($days,6,1)=='Y'?M_SATURDAY:0);
$db2->query("INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_use_end,recur_enddate,recur_interval,recur_data) "
. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)",__LINE__,__FILE__);
}
$oProc->DropTable('calendar_entry_repeats');
// calendar_entry_user => phpgw_cal_user
$oProc->RenameTable('calendar_entry_user','phpgw_cal_user');
$phpgw_info['setup']['currentver']['calendar'] = '0.9.11.002';
}
$test[] = '0.9.11.003';
function upgrade0_9_11_003()
{
global $phpgw_info, $phpgw_setup, $oProc;
$oProc->CreateTable('phpgw_cal_holidays' => array(
'fd' => array(
'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
),
'pk' => array('locale','name'),
'fk' => array(),
'ix' => array(),
'uc' => array()
));
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.004';
}
$test[] = '0.9.11.006';
function upgrade0_9_11_006()
{
global $phpgw_info, $oProc;
$oProc->DropTable('phpgw_cal_holidays');
$oProc->CreateTable('phpgw_cal_holidays' => array(
'fd' => array(
'hol_id' => array('type' => 'auto','nullable' => False),
'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
),
'pk' => array('hol_id'),
'fk' => array(),
'ix' => array(),
'uc' => array()
));
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.007';
}
$test[] = '0.9.11.007';
function upgrade0_9_11_007()
{
global $phpgw_info, $oProc;
$oProc->query('DELETE FROM phpgw_cal_holidays');
$oProc->AddColumn('phpgw_cal_holidays','mday',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
$oProc->AddColumn('phpgw_cal_holidays','month_num',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
$oProc->AddColumn('phpgw_cal_holidays','occurence',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
$oProc->AddColumn('phpgw_cal_holidays','dow',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.008';
}
$test[] = '0.9.11.009';
function upgrade0_9_11_009()
{
global $phpgw_info, $oProc;
$oProc->query('DELETE FROM phpgw_cal_holidays');
$oProc->AddColumn('phpgw_cal_holidays','observance_rule',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.010';
} }
?> ?>