X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=c1c60d83531855121d33e93521c34277cf53bfb9;hb=07c59bd70f6d6925351d8034513a8f63dadfa31e;hp=27ba6357a81a55d40da979b6cd1c0ec38221b40c;hpb=60c9044069cff5e614e70bcb477310122ec62988;p=Pman.Core

diff --git a/DataObjects/core.sql b/DataObjects/core.sql
index 27ba6357..c1c60d83 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,10 +170,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 (
@@ -198,6 +211,8 @@ 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
@@ -277,10 +292,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    ALTER 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;