X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=26c1eb5c1ef5ca40dd982c3c563831dcaef063ca;hb=c7374f8053936a4bf43b26f3a8d1cfd548831b3e;hp=520c3522eaa777e3d717d704c71a39deefdd3e64;hpb=a50b137a2ed79f1d13c5edbde6a714dff80ff178;p=Pman.Core diff --git a/DataObjects/core.sql b/DataObjects/core.sql index 520c3522..26c1eb5c 100644 --- a/DataObjects/core.sql +++ b/DataObjects/core.sql @@ -29,8 +29,8 @@ ALTER TABLE Companies ADD COLUMN country varchar(4) NOT NULL DEFAULT ''; ALTER TABLE Companies ADD COLUMN comptype varchar(32) NOT NULL DEFAULT ''; --- not sure if this needs to change.. ---ALTER TABLE Companies ADD COLUMN comptype_id INT(11) DEFAULT 0; +-- not sure if this needs to change.. << there is code in core/update that fills this in?? +ALTER TABLE Companies ADD COLUMN comptype_id INT(11) DEFAULT 0; ALTER TABLE Companies CHANGE COLUMN isOwner isOwner int(11); @@ -43,7 +43,7 @@ ALTER TABLE Companies ALTER url SET DEFAULT ''; ALTER TABLE Companies ADD COLUMN address1 text ; ALTER TABLE Companies ADD COLUMN address2 text ; ALTER TABLE Companies ADD COLUMN address3 text ; - +ALTER TABLE Companies ADD COLUMN is_system INT(2) NOT NULL DEFAULT 0;-- #2028 ALTER TABLE Companies ADD INDEX name_lookup (name); @@ -56,56 +56,6 @@ ALTER TABLE Companies ADD INDEX name_lookup (name); DROP TABLE core_company_type; -CREATE TABLE Events ( - id int(11) NOT NULL auto_increment, - - PRIMARY KEY (id) -) ; - - - -ALTER TABLE Events ADD COLUMN person_name varchar(128) default NULL; - -ALTER TABLE Events ADD COLUMN event_when DATETIME default NULL; -ALTER TABLE Events ADD COLUMN action varchar(32) default NULL; -ALTER TABLE Events ADD COLUMN ipaddr varchar(16) default NULL; -ALTER TABLE Events ADD COLUMN on_id int(11) default NULL; -ALTER TABLE Events ADD COLUMN on_table varchar(64) default NULL; -ALTER TABLE Events ADD COLUMN person_id int(11) default NULL; -ALTER TABLE Events ADD COLUMN person_table varchar(64) default NULL; - -ALTER TABLE Events ADD COLUMN remarks text ; - - ---#very old code.. -ALTER TABLE Events CHANGE COLUMN EventID id INT(11) AUTO_INCREMENT NOT NULL; - ---# this are for pre-postgres support code.. -ALTER TABLE Events CHANGE COLUMN User person_name VARCHAR(128); -ALTER TABLE Events RENAME COLUMN User TO person_name; -ALTER TABLE Events CHANGE COLUMN Date event_when DATETIME ; -ALTER TABLE Events CHANGE COLUMN Event action VARCHAR(32); -ALTER TABLE Events CHANGE COLUMN Host ipaddr VARCHAR(16); -ALTER TABLE Events CHANGE COLUMN ItemID on_id INT(11); -ALTER TABLE Events CHANGE COLUMN Container on_table VARCHAR(64); - - -ALTER TABLE Events ADD INDEX lookup (on_id, on_table, person_id, event_when); - -ALTER TABLE Events ADD INDEX lookupf (on_id, action, on_table, person_id, event_when); - -ALTER TABLE Events ADD INDEX lookuppt ( person_table); - ---# speeding up lookups. -ALTER TABLE Events ADD INDEX lookup_when( person_id, event_id ); - -ALTER TABLE Events add index lookup_event_when (event_when); -ALTER TABLE Events add index lookup_action (action); -ALTER TABLE Events add index lookup_on_table (on_table); - -ALTER TABLE Events add index lookup_action_person (action, person_id); - - CREATE TABLE core_event_audit ( id int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (id) @@ -151,10 +101,12 @@ CREATE TABLE Groups ( ); ALTER TABLE Groups ADD COLUMN name varchar(64) NOT NULL DEFAULT ''; -ALTER TABLE Groups ADD COLUMN type int(11) default NULL ; +ALTER TABLE Groups ADD COLUMN type int(11) NOT NULL DEFAULT 0; ALTER TABLE Groups ADD COLUMN leader int(11) NOT NULL default 0; #old mysql.. -ALTER TABLE Groups CHANGE COLUMN type type int(11) default 0; +update Groups set type=0 where type is null; + +ALTER TABLE Groups CHANGE COLUMN type type int(11) NOT NULL default 0; @@ -178,49 +130,7 @@ ALTER TABLE Office ADD COLUMN email varchar(128) NOT NULL DEFAULT ''; ALTER TABLE Office ADD COLUMN role varchar(32) NOT NULL DEFAULT ''; ALTER TABLE Office ADD COLUMN country VARCHAR(4) NULL; - -CREATE TABLE Person ( - id int(11) NOT NULL auto_increment, - PRIMARY KEY (id) -) ; - -ALTER TABLE Person ADD COLUMN office_id int(11) default '0'; -ALTER TABLE Person ADD COLUMN name varchar(128) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN phone varchar(32) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN fax varchar(32) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN email varchar(128) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN company_id int(11) default '0'; -ALTER TABLE Person ADD COLUMN role varchar(254) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN active int(11) NOT NULL default 1; -ALTER TABLE Person ADD COLUMN remarks text; -ALTER TABLE Person ADD COLUMN passwd varchar(64) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN owner_id int(11) NOT NULL DEFAULT 0; -ALTER TABLE Person ADD COLUMN lang varchar(8) default 'en'; -ALTER TABLE Person ADD COLUMN no_reset_sent int(11) default '0'; - -ALTER TABLE Person ADD COLUMN action_type VARCHAR(32) DEFAULT ''; -ALTER TABLE Person ADD COLUMN project_id int(11) default 0; -ALTER TABLE Person ADD COLUMN deleted_by INT(11) NOT NULL default 0 ; -ALTER TABLE Person ADD COLUMN deleted_dt DATETIME ; - -ALTER TABLE Person ADD COLUMN firstname varchar(128) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN lastname varchar(128) NOT NULL DEFAULT ''; - -ALTER TABLE Person ADD COLUMN name_facebook VARCHAR(128) NULL; -ALTER TABLE Person ADD COLUMN url_blog VARCHAR(256) NULL ; -ALTER TABLE Person ADD COLUMN url_twitter VARCHAR(256) NULL ; -ALTER TABLE Person ADD COLUMN url_linkedin VARCHAR(256) NULL ; - -ALTER TABLE Person ADD COLUMN phone_mobile varchar(32) NOT NULL DEFAULT ''; -ALTER TABLE Person ADD COLUMN phone_direct varchar(32) NOT NULL DEFAULT ''; - - -# old mysql -alter table Person change column active active int(11) NOT NULL DEFAULT 1 ; -alter table Person change role role varchar(254) NOT NULL DEFAULT ''; - - - +ALTER TABLE Office ADD COLUMN display_name VARCHAR(4) NULL; CREATE TABLE Projects ( @@ -244,7 +154,7 @@ ALTER TABLE Projects ADD COLUMN open_date date default NULL; ALTER TABLE Projects ADD COLUMN open_by int(11) NOT NULL default '0'; ALTER TABLE Projects ADD COLUMN updated_dt DATETIME NOT NULL; -# these should be removed, as they are code specific.. +-- these should be removed, as they are code specific.. ALTER TABLE Projects ADD COLUMN countries varchar(128) NOT NULL DEFAULT ''; ALTER TABLE Projects ADD COLUMN languages varchar(128) NOT NULL DEFAULT ''; ALTER TABLE Projects ADD COLUMN agency_id int(11) NOT NULL DEFAULT 0 ; @@ -252,9 +162,9 @@ ALTER TABLE Projects ADD COLUMN agency_id int(11) NOT NULL DEFAULT 0 ; ALTER TABLE Projects ADD INDEX plookup (code); -#-- we duplicate office_id and company_id here... -#-- not sure if we should keep doing that in the new design... -#-- we should improve our links code to handle this.. +-- we duplicate office_id and company_id here... +-- not sure if we should keep doing that in the new design... +-- we should improve our links code to handle this.. CREATE TABLE ProjectDirectory ( @@ -270,34 +180,8 @@ ALTER TABLE ProjectDirectory ADD COLUMN role varchar(16) NOT NULL DEFAULT ''; ALTER TABLE ProjectDirectory ADD INDEX plookup (project_id,person_id, ispm, role); -CREATE TABLE Images ( - id int(11) NOT NULL auto_increment, - PRIMARY KEY (id) -); - -ALTER TABLE Images ADD COLUMN filename varchar(255) NOT NULL default ''; -ALTER TABLE Images ADD COLUMN ontable varchar(32) NOT NULL default ''; -ALTER TABLE Images ADD COLUMN onid int(11) NOT NULL default '0'; -ALTER TABLE Images ADD COLUMN mimetype varchar(64) NOT NULL default ''; -ALTER TABLE Images ADD COLUMN width int(11) NOT NULL default '0'; -ALTER TABLE Images ADD COLUMN height int(11) NOT NULL default '0'; -ALTER TABLE Images ADD COLUMN filesize int(11) NOT NULL default '0'; -ALTER TABLE Images ADD COLUMN displayorder int(11) NOT NULL default '0'; -ALTER TABLE Images ADD COLUMN language varchar(6) NOT NULL default 'en'; -ALTER TABLE Images ADD COLUMN parent_image_id int(11) NOT NULL default '0'; - -ALTER TABLE Images ADD COLUMN created datetime ; -ALTER TABLE Images ADD COLUMN imgtype VARCHAR(32) DEFAULT '' NOT NULL; -ALTER TABLE Images ADD COLUMN linkurl VARCHAR(254) DEFAULT '' NOT NULL; -ALTER TABLE Images ADD COLUMN descript TEXT DEFAULT '' NOT NULL; -ALTER TABLE Images ADD COLUMN title VARCHAR(128) DEFAULT '' NOT NULL; - - -ALTER TABLE Images ADD INDEX lookup(ontable, onid); - - -#// old core image type - merged into enum. +--// old core image type - merged into enum. DROP TABLE core_image_type; @@ -327,10 +211,10 @@ ALTER TABLE core_locking ADD COLUMN person_id int(11) NOT NULL DEFAULT 0; ALTER TABLE core_locking ADD COLUMN created datetime ; alter table core_locking ADD INDEX lookup(on_table, on_id, person_id, created); -# -- oops... - wrong name of pid. +-- oops... - wrong name of pid. alter table core_locking change column `int` id int(11) auto_increment not null; -# -- a generic enumeraction +-- a generic enumeraction CREATE TABLE core_enum ( id int(11) NOT NULL AUTO_INCREMENT, @@ -345,11 +229,17 @@ alter table core_enum ADD COLUMN seqid int(11) NOT NULL DEFAULT 0; alter table core_enum ADD COLUMN seqmax int(11) NOT NULL DEFAULT 0; alter table core_enum ADD COLUMN display_name varchar(255) NOT NULL DEFAULT ''; + +ALTER TABLE core_enum ADD COLUMN is_system_enum INT(2) NOT NULL DEFAULT 0; +ALTER TABLE core_enum CHANGE COLUMN display_name display_name TEXT NOT NULL DEFAULT ''; + alter table core_enum ADD INDEX lookup(seqid, active, name, etype); + UPDATE core_enum SET display_name = name WHERE display_name = ''; +-- ---------------------------- CREATE TABLE translations ( id int(11) NOT NULL AUTO_INCREMENT, @@ -366,24 +256,6 @@ alter table translations ADD COLUMN tval longtext ; ALTER TABLE translations ADD INDEX qlookup (module, tfile, tlang, tkey); -# - used to trigger emails about changes to items being watched. - -CREATE TABLE core_watch ( - id int(11) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (id) -) ; - - -alter table core_watch ADD COLUMN ontable varchar(128) NOT NULL DEFAULT ''; -alter table core_watch ADD COLUMN onid int(11) NOT NULL DEFAULT 0; -alter table core_watch ADD COLUMN person_id int(11) NOT NULL DEFAULT 0; -alter table core_watch ADD COLUMN event varchar(128) NOT NULL DEFAULT ''; -alter table core_watch ADD COLUMN medium varchar(64) NOT NULL DEFAULT ''; -alter table core_watch ADD COLUMN active int(11) NOT NULL DEFAULT '1'; - -ALTER TABLE core_watch ADD INDEX qlookup (ontable,onid,person_id,event,medium); - - CREATE TABLE core_notify ( @@ -404,13 +276,17 @@ ALTER TABLE core_notify ADD COLUMN event_id int(11) NOT NULL DEFAULT 0; ALTER TABLE core_notify ADD COLUMN watch_id INT(11) NOT NULL DEFAULT 0; ALTER TABLE core_notify ADD COLUMN trigger_person_id INT(11) NOT NULL DEFAULT 0; ALTER TABLE core_notify ADD COLUMN trigger_event_id INT(11) NOT NULL DEFAULT 0; -ALTER TABLE core_notify ADD INDEX lookup(act_when, msgid); + ALTER TABLE core_notify ADD COLUMN to_email varchar(255) NOT NULL DEFAULT ''; -ALTER TABLE core_notify ADD INDEX lookup_a(onid, ontable, person_id, act_when, msgid, to_email); + #old mysql.. ALTER TABLE core_notify CHANGE COLUMN bounced event_id INT(11) NOT NULL DEFAULT 0; - + +ALTER TABLE core_notify ADD INDEX lookup(act_when, msgid); +ALTER TABLE core_notify ADD INDEX lookup_a(onid, ontable, person_id, act_when, msgid, to_email); +alter table core_notify add INDEX lookup_b (sent, person_id, msgid, ontable); +ALTER TABLE core_notify add index lookup_d (person_id, msgid, ontable); @@ -458,5 +334,4 @@ ALTER TABLE core_notify_recur ADD INDEX lookup(person_id, dtstart, dtend, tz, -- old design.. ALTER TABLE core_notify_recur CHANGE COLUMN tz tz varchar(64) NOT NULL; -