X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=310b77f706c40ff8401495acd2af163d8c315270;hb=07a13560da06113ea59cf8b7a7617e7a3b5f4f37;hp=aa0b3eebb848204080d1065ab8fe1b8f9104549a;hpb=7e9cdd246cc8bba1ce46a4db263a0f49b7cbc5a0;p=Pman.Core

diff --git a/DataObjects/core.sql b/DataObjects/core.sql
index aa0b3eeb..310b77f7 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,18 +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;
@@ -160,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,
@@ -193,6 +207,13 @@ 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   phone_mobile varchar(32)  NOT NULL  DEFAULT '';
+ALTER TABLE Person ADD COLUMN   phone_direct varchar(32)  NOT NULL  DEFAULT '';
 
 
 # old mysql
@@ -272,10 +293,11 @@ 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 '';
 
 ALTER TABLE Images ADD INDEX lookup(ontable, onid);
 
-
+ALTER TABLE Images ADD INDEX lookupc(created, ontable, onid);
  
 #// old core image type - merged into enum.
 DROP TABLE core_image_type;
@@ -412,7 +434,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;
@@ -432,6 +454,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);