X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=8d1f08acc8a04042242e4546c1d2d52ee496bf70;hb=60920d3a88a780ef144cc6ae01c585f9fc0d4c9e;hp=0ad498e79a06c98379dc7dae5c173f51f51de1ad;hpb=deb5a7a249d2be5b133c1741b4ef21c8df63a257;p=Pman.Core

diff --git a/DataObjects/core.sql b/DataObjects/core.sql
index 0ad498e7..8d1f08ac 100644
--- a/DataObjects/core.sql
+++ b/DataObjects/core.sql
@@ -13,10 +13,10 @@ 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    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;
@@ -30,16 +30,24 @@ ALTER TABLE Companies ADD COLUMN    country varchar(4) NOT NULL DEFAULT '';
 
 
 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 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;
@@ -106,23 +114,30 @@ 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  (
+-- BC name..
+RENAME TABLE Group_Members TO 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;
+
+-- BC name..
+RENAME TABLE Group_Rights TO group_rights;
 
-CREATE TABLE  Group_Rights  (
+
+CREATE TABLE  group_rights  (
     id int(11)  NOT NULL AUTO_INCREMENT,
     PRIMARY KEY (id)
 );
-ALTER TABLE Group_Rights ADD COLUMN    rightname varchar(64)  NOT NULL DEFAULT '';
-ALTER TABLE Group_Rights ADD COLUMN     group_id int(11) NOT NULL DEFAULT 0;
-ALTER TABLE Group_Rights ADD COLUMN   accessmask varchar(10)  NOT NULL DEFAULT '';
+ALTER TABLE group_rights ADD COLUMN    rightname varchar(64)  NOT NULL DEFAULT '';
+ALTER TABLE group_rights ADD COLUMN     group_id int(11) NOT NULL DEFAULT 0;
+ALTER TABLE group_rights ADD COLUMN   accessmask varchar(10)  NOT NULL DEFAULT '';
 
 #old mysql.
-ALTER TABLE Group_Rights CHANGE COLUMN AccessMask accessmask varchar(10)  NOT NULL DEFAULT '';
+ALTER TABLE group_rights CHANGE COLUMN AccessMask accessmask varchar(10)  NOT NULL DEFAULT '';
 
 
 
@@ -152,10 +167,13 @@ 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;
 
 
 CREATE TABLE Person (
@@ -182,6 +200,16 @@ 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 ;
+
+
+
 # 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 '';
@@ -305,14 +333,16 @@ CREATE TABLE   core_enum (
  
 );
  
-alter table  core_enum ADD COLUMN etype varchar(32)  NOT NULL DEFAULT '';
+alter table  core_enum ADD COLUMN  etype varchar(32)  NOT NULL DEFAULT '';
 alter table  core_enum ADD COLUMN  name varchar(255)  NOT NULL DEFAULT '';
-alter table  core_enum ADD COLUMN   active int(2)  NOT NULL DEFAULT 1;
+alter table  core_enum ADD COLUMN  active int(2)  NOT NULL DEFAULT 1;
 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  INDEX lookup(seqid, active, name, etype);
- 
+
+UPDATE core_enum SET display_name = name WHERE display_name = '';
 
 
 
@@ -397,7 +427,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;
@@ -417,6 +447,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);