X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=a17900f8d8460a228a240e762d8cda6a34a0ed64;hb=bc0e1825981dd2b88a316ad4bc36e3e4311f2ac8;hp=23984d3fc8d1ab192edcc699eb5c58c0cc5b7cf9;hpb=8fbaafa8e8df7a510cdc1e4e354b15e777a50642;p=Pman.Core diff --git a/DataObjects/core.sql b/DataObjects/core.sql index 23984d3f..a17900f8 100644 --- a/DataObjects/core.sql +++ b/DataObjects/core.sql @@ -13,10 +13,9 @@ ALTER TABLE Companies ADD COLUMN address text ; ALTER TABLE Companies ADD COLUMN tel varchar(32) default NULL; ALTER TABLE Companies ADD COLUMN fax varchar(32) default NULL; 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 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(8) 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,17 +28,29 @@ 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.. +--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 ''; -- postres -ALTER TABLE Companies ALTER isOwner TYPE int(11); +--ALTER TABLE Companies ALTER isOwner TYPE int(11); ALTER TABLE Companies ALTER owner_id SET DEFAULT 0; 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 INDEX name_lookup (name); -UPDATE Companies set comptype='OWNER' where isOwner=1; +-- our new code should have this fixed now.. +-- UPDATE Companies set comptype='OWNER' where isOwner=1; -- // core comapy types - use core enums (Company Type) DROP TABLE core_company_type; @@ -86,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); @@ -159,11 +170,15 @@ CREATE TABLE Office ( ALTER TABLE Office ADD COLUMN company_id int(11) NOT NULL default '0'; ALTER TABLE Office ADD COLUMN name varchar(64) NOT NULL DEFAULT ''; ALTER TABLE Office ADD COLUMN address text ; +ALTER TABLE Office ADD COLUMN address2 TEXT; +ALTER TABLE Office ADD COLUMN address3 TEXT; ALTER TABLE Office ADD COLUMN phone varchar(32) NOT NULL DEFAULT ''; ALTER TABLE Office ADD COLUMN fax varchar(32) NOT NULL DEFAULT ''; 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, @@ -174,7 +189,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; @@ -192,13 +210,27 @@ 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 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); @@ -223,7 +255,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 ; @@ -231,9 +263,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 ( @@ -271,12 +303,15 @@ 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 CHANGE COLUMN mimetype mimetype varchar(128) NOT NULL default ''; +-- postgres +ALTER TABLE Images ALTER COLUMN mimetype TYPE varchar(128) ; ALTER TABLE Images ADD INDEX lookup(ontable, onid); - +ALTER TABLE Images ADD INDEX lookupc(created, ontable, onid); -#// old core image type - merged into enum. +--// old core image type - merged into enum. DROP TABLE core_image_type; @@ -306,10 +341,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, @@ -324,10 +359,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, @@ -382,13 +424,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); @@ -410,7 +456,7 @@ 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; @@ -430,6 +476,7 @@ ALTER TABLE core_notify_recur ADD COLUMN ontable varchar(128) NOT NULL defaul 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 COLUMN method_id int(11) default 0; ALTER TABLE core_notify_recur ADD INDEX lookup(person_id, dtstart, dtend, tz, max_applied_dt, updated_dt, last_applied_dt);