X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=9f9750e1cd695e221648a19740a31b8ea9c221de;hb=c729c6b46027e1bd8b94b314d229beee261ef79e;hp=8d1f08acc8a04042242e4546c1d2d52ee496bf70;hpb=60920d3a88a780ef144cc6ae01c585f9fc0d4c9e;p=Pman.Core diff --git a/DataObjects/core.sql b/DataObjects/core.sql index 8d1f08ac..9f9750e1 100644 --- a/DataObjects/core.sql +++ b/DataObjects/core.sql @@ -16,7 +16,6 @@ ALTER TABLE Companies ADD COLUMN email varchar(128) default NULL; --ALTER TABLE Companies ADD COLUMN isOwner int(11) default NULL; ALTER TABLE Companies ADD COLUMN logo_id INT(11) NOT NULL DEFAULT 0;; ALTER TABLE Companies ADD COLUMN background_color varchar(8) NOT NULL; -ALTER TABLE Companies ADD COLUMN comptype varchar(32) NOT NULL DEFAULT ''; ALTER TABLE Companies ADD COLUMN url varchar(254) NOT NULL DEFAULT ''; ALTER TABLE Companies ADD COLUMN main_office_id int(11) NOT NULL DEFAULT 0; ALTER TABLE Companies ADD COLUMN created_by int(11) NOT NULL DEFAULT 0; @@ -29,9 +28,13 @@ ALTER TABLE Companies ADD COLUMN province varchar(255) NOT NULL DEFAULT ''; 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.. << 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); ALTER TABLE Companies CHANGE COLUMN comptype comptype VARCHAR(32) DEFAULT ''; -ALTER TABLE Companies ADD COLUMN comptype_id INT(11) DEFAULT 0; -- postres --ALTER TABLE Companies ALTER isOwner TYPE int(11); ALTER TABLE Companies ALTER owner_id SET DEFAULT 0; @@ -94,7 +97,7 @@ ALTER TABLE Events ADD INDEX lookupf (on_id, action, on_table, person_id, event_ 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_when( person_id, event_when ); ALTER TABLE Events add index lookup_event_when (event_when); ALTER TABLE Events add index lookup_action (action); @@ -102,6 +105,7 @@ ALTER TABLE Events add index lookup_on_table (on_table); ALTER TABLE Events add index lookup_action_person (action, person_id); + alter table Events add index lookup_actions ( person_id, person_table, action); CREATE TABLE core_event_audit ( id int(11) NOT NULL AUTO_INCREMENT, @@ -148,10 +152,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; @@ -175,6 +181,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; +ALTER TABLE Office ADD COLUMN display_name VARCHAR(4) NULL; CREATE TABLE Person ( id int(11) NOT NULL auto_increment, @@ -185,7 +192,10 @@ 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 email varchar(256) NOT NULL DEFAULT ''; +ALTER TABLE Person ADD COLUMN alt_email VARCHAR(256) NULL ; + 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; @@ -203,18 +213,28 @@ 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 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 alt_email 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 ''; + +ALTER TABLE Person ADD COLUMN honor 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 Person change email email varchar(254) NOT NULL DEFAULT ''; + +ALTER TABLE Person ADD INDEX lookup_a(email, active); +ALTER TABLE Person ADD INDEX lookup_b(email, active, company_id); +ALTER TABLE Person add index lookup_owner(owner_id); @@ -239,7 +259,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 ; @@ -247,9 +267,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 ( @@ -265,34 +285,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; @@ -322,10 +316,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, @@ -340,11 +334,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, @@ -399,13 +399,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);