holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bug #420783, also added a hol_id field to the holidays tables.

Browse Source
This commit is contained in:
skeeter 2001-05-02 17:57:46 +00:00
parent 61675e82b5
commit b281b7b213
5 changed files with 78 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/sql/mysql_newtables.inc.php
View File

@ -248,10 +248,11 @@
$phpgw_setup->db->query($sql);
$sql = "CREATE TABLE phpgw_cal_holidays (
hol_id int(11) NOT NULL auto_increment,
locale char(2) NOT NULL,
name varchar(50) NOT NULL,
date_time int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (locale,name)
PRIMARY KEY (hol_id)
)";
$phpgw_setup->db->query($sql);

18
setup/sql/mysql_upgrade_beta.inc.php
View File

@ -1610,6 +1610,24 @@
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.006';
}
$test[] = '0.9.11.006';
function upgrade0_9_11_006()
{
global $phpgw_info,$phpgw_setup;
$phpgw_setup->db->query("drop table phpgw_cal_holidays",__LINE__,__FILE__);
$sql = "CREATE TABLE phpgw_cal_holidays (
hol_id int(11) NOT NULL auto_increment,
locale char(2) NOT NULL,
name varchar(50) NOT NULL,
date_time int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (hol_id)
)";
$phpgw_setup->db->query($sql);
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.007';
}
reset ($test);
while (list ($key, $value) = each ($test)){

6
setup/sql/pgsql_newtables.inc.php
View File

@ -199,7 +199,7 @@
cal_type varchar(10),
is_public int DEFAULT 1 NOT NULL,
title varchar(80) NOT NULL,
desription text
description text
)";
$phpgw_setup->db->query($sql);
@ -221,10 +221,10 @@
$phpgw_setup->db->query($sql);
$sql = "CREATE TABLE phpgw_cal_holidays (
hol_id serial,
locale char(2) NOT NULL,
name varchar(50) NOT NULL,
date_time int4 DEFAULT 0 NOT NULL,
PRIMARY KEY (locale,name)
date_time int4 DEFAULT 0 NOT NULL
)";
$phpgw_setup->db->query($sql);

54
setup/sql/pgsql_upgrade_beta.inc.php
View File

@ -2089,6 +2089,60 @@
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.006';
}
$test[] = '0.9.11.006';
function upgrade0_9_11_006()
{
global $phpgw_info, $phpgw_setup;
$phpgw_setup->db->query("create table phpgw_cal_temp as select * from phpgw_cal",__LINE__,__FILE__);
$sql = "CREATE TABLE phpgw_cal (
cal_id serial,
owner int DEFAULT 0 NOT NULL,
category int DEFAULT 0 NOT NULL,
groups varchar(255),
datetime int4,
mdatetime int4,
edatetime int4,
priority int DEFAULT 2 NOT NULL,
cal_type varchar(10),
is_public int DEFAULT 1 NOT NULL,
title varchar(80) NOT NULL,
description text
)";
$phpgw_setup->db->query($sql,__LINE__,__FILE__);
$phpgw_setup->db->query("SELECT * FROM phpgw_cal_temp",__LINE__,__FILE__);
while($phpgw_setup->db->next_record())
{
$id = $phpgw_setup->db->f('cal_id');
$owner = $phpgw_setup->db->f('owner');
$groups = $phpgw_setup->db->f('groups');
$datetime = $phpgw_setup->db->f('datetime');
$mdatetime = $phpgw_setup->db->f('mdatetime');
$edatetime = $phpgw_setup->db->f('edatetime');
$priority = $phpgw_setup->db->f('priority');
$type = $phpgw_setup->db->f('cal_type');
$public = $phpgw_setup->db->f('is_public');
$title = $phpgw_setup->db->f('title');
$description = $phpgw_setup->db->f('desription');
$phpgw_setup->db->query("INSERT INTO phpgw_cal(cal_id,owner,category,groups,datetime,mdatetime,edatetime,priority,cal_type,is_public,title,description)
values($id,$owner,0,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$public,'$title','$description')",__LINE__,__FILE__);
}
$phpgw_setup->db->query("drop table phpgw_cal_temp",__LINE__,__FILE__);
$phpgw_setup->db->query("drop table phpgw_cal_holidays",__LINE__,__FILE__);
$sql = "CREATE TABLE phpgw_cal_holidays (
hol_id serial,
locale char(2) NOT NULL,
name varchar(50) NOT NULL,
date_time int4 DEFAULT 0 NOT NULL
)";
$phpgw_setup->db->query($sql);
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.007';
}
reset ($test);
while (list ($key, $value) = each ($test)){

2
version.inc.php
View File

@ -11,5 +11,5 @@
/* $Id$ */
$phpgw_info['server']['versions']['phpgwapi'] = '0.9.11.006';
$phpgw_info['server']['versions']['phpgwapi'] = '0.9.11.007';
$phpgw_info['server']['versions']['current_header'] = '1.11';