X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2Fcore.sql;h=b1695a15ed1e7243a1ae57ba1de6e344b4fd114d;hb=547a25e36d480afd18409901b6330be35e4ba431;hp=3d41456e84b3b97858202adc84d5dd37fc1e5a7e;hpb=c792fd6aea4a94eb4fdea9cd81dd587d60c380df;p=Pman.Core

diff --git a/DataObjects/core.sql b/DataObjects/core.sql
index 3d41456e..b1695a15 100644
--- a/DataObjects/core.sql
+++ b/DataObjects/core.sql
@@ -29,8 +29,8 @@ 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;
+-- not sure if this needs to change.. << there is code in core/update that fills this in??
+ALTER TABLE Companies ADD COLUMN    comptype_id INT(11) DEFAULT 0;
 
 
 ALTER TABLE Companies CHANGE COLUMN isOwner isOwner int(11);
@@ -105,6 +105,7 @@ ALTER TABLE Events add index lookup_on_table (on_table);
 
 ALTER TABLE Events add index lookup_action_person (action, person_id);
 
+ alter table Events add index lookup_actions ( person_id, person_table, action);
 
 CREATE TABLE  core_event_audit  (
     id int(11)  NOT NULL AUTO_INCREMENT,
@@ -151,10 +152,12 @@ CREATE TABLE Groups (
 );
 
 ALTER TABLE Groups ADD COLUMN name varchar(64)  NOT NULL DEFAULT '';
-ALTER TABLE Groups ADD COLUMN   type int(11) default NULL ;
+ALTER TABLE Groups ADD COLUMN   type int(11) default NOT NULL DEFAULT 0;
 ALTER TABLE Groups ADD COLUMN leader int(11)  NOT NULL default 0;
 #old mysql..
-ALTER TABLE Groups CHANGE COLUMN type type int(11) default 0;
+update groups set type=0 where type is null;
+
+ALTER TABLE Groups CHANGE COLUMN type type int(11)  NOT NULL  default 0;
 
 
 
@@ -231,6 +234,7 @@ 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);
+ALTER TABLE Person add index lookup_owner(owner_id);
 
 
 
@@ -281,35 +285,6 @@ ALTER TABLE  ProjectDirectory ADD COLUMN   role varchar(16) NOT NULL DEFAULT '';
 ALTER TABLE ProjectDirectory ADD INDEX plookup (project_id,person_id, ispm, role);
 
 
-CREATE TABLE   Images (
-  id int(11) NOT NULL auto_increment,
-  PRIMARY KEY  (id)
-);
-
-ALTER TABLE Images    ADD COLUMN   filename varchar(255) NOT NULL default '';
-ALTER TABLE Images    ADD COLUMN   ontable varchar(32) NOT NULL default '';
-ALTER TABLE Images    ADD COLUMN   onid int(11) NOT NULL default '0';
-ALTER TABLE Images    ADD COLUMN   mimetype varchar(64) NOT NULL default '';
-ALTER TABLE Images    ADD COLUMN   width int(11) NOT NULL default '0';
-ALTER TABLE Images    ADD COLUMN   height int(11) NOT NULL default '0';
-ALTER TABLE Images    ADD COLUMN   filesize int(11) NOT NULL default '0';
-ALTER TABLE Images    ADD COLUMN   displayorder int(11) NOT NULL default '0';
-ALTER TABLE Images    ADD COLUMN   language varchar(6) NOT NULL default 'en';
-ALTER TABLE Images    ADD COLUMN   parent_image_id int(11) NOT NULL default '0';
-
-ALTER TABLE  Images ADD COLUMN created datetime ;
-ALTER TABLE  Images ADD COLUMN imgtype VARCHAR(32) DEFAULT '' NOT NULL;
-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.
 DROP TABLE core_image_type;
@@ -341,10 +316,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,
@@ -359,13 +334,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 = '';
-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 '';
+-- ----------------------------
 
 CREATE TABLE  translations (
   id int(11)  NOT NULL AUTO_INCREMENT,