X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=8097dce653b139d1cf3ebf93ce7d2a716d778cc6;hb=bcc986ea4bb4f1f800379c7e9f6131cf0506b749;hp=0f5809aa26326734dc9a3f902c484cdc67029b47;hpb=6f451313121e6a6d8b58c6ceb1307d3e8661fd8c;p=Pman.Core

diff --git a/DataObjects/core.sql b/DataObjects/core.sql
index 0f5809aa..8097dce6 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(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,10 +28,15 @@ 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 '';
 
@@ -45,7 +49,8 @@ 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;
@@ -92,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);
@@ -171,7 +176,9 @@ 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,
@@ -205,7 +212,10 @@ 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 '';
 
+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 ;
@@ -236,7 +246,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 ;
@@ -244,9 +254,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 (
@@ -284,12 +294,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;