X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=2fe6146941f7422a5b37385cc89fdc019f3bdae7;hb=89e9b7ee6e68f6fd2a6535039ef708828a346bdd;hp=e93cf1cf7390ff00fc5830476e8d49c295cb6ea0;hpb=78fc0f669b95612a4368b75f90f51509dc3c0900;p=Pman.Core diff --git a/DataObjects/core.sql b/DataObjects/core.sql index e93cf1cf..2fe61469 100644 --- a/DataObjects/core.sql +++ b/DataObjects/core.sql @@ -30,7 +30,7 @@ ALTER TABLE Companies ADD COLUMN country varchar(4) NOT NULL DEFAULT ''; ALTER TABLE Companies CHANGE COLUMN isOwner isOwner int(11); -#postres +-- postres ALTER TABLE Companies ALTER isOwner TYPE int(11); ALTER TABLE Companies ALTER owner_id SET DEFAULT 0; ALTER TABLE Companies ALTER url SET DEFAULT ''; @@ -41,7 +41,7 @@ ALTER TABLE Companies ADD INDEX name_lookup (name); UPDATE Companies set comptype='OWNER' where isOwner=1; -#// core comapy types - use core enums (Company Type) +-- // core comapy types - use core enums (Company Type) DROP TABLE core_company_type; @@ -61,13 +61,15 @@ 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.. +--#very old code.. ALTER TABLE Events CHANGE COLUMN EventID id INT(11) AUTO_INCREMENT NOT NULL; -# this are for pre-postgres support code.. +--# 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 ; @@ -79,8 +81,18 @@ 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 ( @@ -94,12 +106,15 @@ ALTER TABLE core_event_audit ADD COLUMN old_audit_id int(11) NOT NULL DEF ALTER TABLE core_event_audit ADD COLUMN newvalue BLOB NOT NULL DEFAULT ''; ALTER TABLE core_event_audit ADD INDEX lookup(event_id, name, old_audit_id); -CREATE TABLE Group_Members ( +RENAME TABLE Group_Members group_members; +CREATE TABLE group_members ( id int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (id) ); -ALTER TABLE Group_Members ADD COLUMN group_id int(11) default NULL; -ALTER TABLE Group_Members ADD COLUMN user_id int(11) NOT NULL default 0; +ALTER TABLE group_members ADD COLUMN group_id int(11) default NULL; +ALTER TABLE group_members ADD COLUMN user_id int(11) NOT NULL default 0; + + CREATE TABLE Group_Rights ( id int(11) NOT NULL AUTO_INCREMENT, @@ -170,6 +185,11 @@ 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 ''; + + + # 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 ''; @@ -197,7 +217,7 @@ ALTER TABLE Projects ADD COLUMN team_id int(11) NOT NULL default '0'; ALTER TABLE Projects ADD COLUMN file_location varchar(254) NOT NULL default ''; 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.. ALTER TABLE Projects ADD COLUMN countries varchar(128) NOT NULL DEFAULT ''; @@ -273,8 +293,8 @@ ALTER TABLE i18n ADD INDEX lookup (ltype, lkey, inlang); CREATE TABLE core_locking ( - int int(11) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (int) + id int(11) NOT NULL AUTO_INCREMENT, + PRIMARY KEY (id) ); ALTER TABLE core_locking ADD COLUMN on_table varchar(64) NOT NULL DEFAULT ''; ALTER TABLE core_locking ADD COLUMN on_id int(11) NOT NULL DEFAULT 0; @@ -282,7 +302,9 @@ 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. +alter table core_locking change column `int` id int(11) auto_increment not null; + # -- a generic enumeraction CREATE TABLE core_enum ( @@ -298,26 +320,7 @@ 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 INDEX lookup(seqid, active, name, etype); - -DELIMITER $$ - -DROP TRIGGER IF EXISTS core_enum_insert $$ - -CREATE TRIGGER core_enum_insert AFTER INSERT ON core_enum -FOR EACH ROW BEGIN - CALL core_enum_seqmax(NEW.etype); -END; -$$ - -DROP TRIGGER IF EXISTS core_enum_update $$ - -CREATE TRIGGER core_enum_update AFTER UPDATE ON core_enum -FOR EACH ROW BEGIN - CALL core_enum_seqmax(NEW.etype); -END; -$$ - -DELIMITER ; + @@ -360,19 +363,24 @@ CREATE TABLE core_notify ( id int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (id) ); - -ALTER TABLE core_notify ADD COLUMN act_when DATETIME ; -ALTER TABLE core_notify ADD COLUMN act_start DATETIME ; +ALTER TABLE core_notify ADD COLUMN evtype VARCHAR(128) NOT NULL default ''; +ALTER TABLE core_notify ADD COLUMN recur_id INT(11) NOT NULL default 0; +ALTER TABLE core_notify ADD COLUMN act_when DATETIME ; +ALTER TABLE core_notify ADD COLUMN act_start DATETIME ; ALTER TABLE core_notify ADD COLUMN onid int(11) NOT NULL DEFAULT 0; ALTER TABLE core_notify ADD COLUMN ontable varchar(128) NOT NULL DEFAULT ''; ALTER TABLE core_notify ADD COLUMN person_id int(11) NOT NULL DEFAULT 0; ALTER TABLE core_notify ADD COLUMN msgid varchar(128) NOT NULL DEFAULT ''; + ALTER TABLE core_notify ADD COLUMN sent DATETIME ; 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; @@ -390,3 +398,37 @@ ALTER TABLE core_person_alias ADD COLUMN person_id varchar(128) DEFAULT NULL; ALTER TABLE core_person_alias ADD COLUMN alias varchar(254) NOT NULL DEFAULT ''; ALTER TABLE core_person_alias ADD INDEX alias (alias); + + + +CREATE TABLE core_notify_recur ( + id int(11) NOT NULL AUTO_INCREMENT, + + PRIMARY KEY (id) +) ; + + +ALTER TABLE core_notify_recur ADD COLUMN person_id int(11) NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN dtstart datetime NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN dtend datetime NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN max_applied_dt datetime NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN updated_dt datetime NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN last_applied_dt datetime NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN tz varchar(64) NOT NULL; + +ALTER TABLE core_notify_recur ADD COLUMN freq varchar(8) NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN freq_day text NOT NULL; +ALTER TABLE core_notify_recur ADD COLUMN freq_hour text NOT NULL; + +ALTER TABLE core_notify_recur ADD COLUMN onid int(11) NOT NULL default 0; +ALTER TABLE core_notify_recur ADD COLUMN ontable varchar(128) NOT NULL default ''; +ALTER TABLE core_notify_recur ADD COLUMN last_event_id int(11) default 0; +ALTER TABLE core_notify_recur ADD COLUMN method varchar(128) default ''; + + +ALTER TABLE core_notify_recur ADD INDEX lookup(person_id, dtstart, dtend, tz, max_applied_dt, updated_dt, last_applied_dt); + +-- old design.. +ALTER TABLE core_notify_recur CHANGE COLUMN tz tz varchar(64) NOT NULL; + +