[Phpgroupware-cvs] CVS: cdb/doc cdb.sql,1.11,1.12

[Brian Morel <address@hidden>]

Update of /cvsroot/phpgroupware/cdb/doc
In directory subversions:/tmp/cvs-serv24008

Modified Files:
        cdb.sql 
Log Message:
table changes

Index: cdb.sql
===================================================================
RCS file: /cvsroot/phpgroupware/cdb/doc/cdb.sql,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** cdb.sql     20 Feb 2002 22:11:57 -0000      1.11
--- cdb.sql     1 Mar 2002 21:12:53 -0000       1.12
***************
*** 1,5 ****
  # Database design for Outlook-style contact management
  # PLEASE SEE tables_current.inc.php in the setup dir for this app
! # Version 1.9
  
  
--- 1,5 ----
  # Database design for Outlook-style contact management
  # PLEASE SEE tables_current.inc.php in the setup dir for this app
! # Version 2.0
  
  
***************
*** 10,13 ****
--- 10,18 ----
  # ---------
  
+ # v.2.0
+ #      - Added tables cdb_views, cdb_recent
+ #      - Removed contact_type from table cdb_category_link
+ #      - Added main_location to table cdb_org
+ 
  # v.1.9
  #        - Added a table for mapping contact_id and organization_id to 
***************
*** 98,102 ****
  # Have patience, and all will be good.
  #
! #INSERT INTO applications (app_name, app_title, app_enabled, app_order, 
app_tables, app_version) VALUES 
('cdb','cdb-devel',1,31,'phpgw_cdb_category,phpgw_cdb_category_link,phpgw_cdb_contact_addr,phpgw_cdb_contact_addr_cat,phpgw_cdb_contact_client,phpgw_cdb_contact_flag,phpgw_cdb_contact_flag_link,phpgw_cdb_contact_followup,phpgw_cdb_contact_internet,phpgw_cdb_contact_main,phpgw_cdb_entity_meta,phpgw_cdb_entity_notes,phpgw_cdb_contact_org,phpgw_cdb_contact_personal,phpgw_cdb_contact_phone,phpgw_cdb_contact_phone_cat,phpgw_cdb_language,phpgw_cdb_org,phpgw_cdb_org_client,phpgw_cdb_org_location,phpgw_entity_id',1.5);
  
  #
--- 103,107 ----
  # Have patience, and all will be good.
  #
! #INSERT INTO applications (app_name, app_title, app_enabled, app_order, 
app_tables, app_version) VALUES 
('cdb','cdb-devel',1,31,'phpgw_cdb_category,phpgw_cdb_category_link,phpgw_cdb_contact_addr,phpgw_cdb_contact_addr_cat,phpgw_cdb_contact_client,phpgw_cdb_contact_flag,phpgw_cdb_contact_flag_link,phpgw_cdb_contact_followup,phpgw_cdb_contact_internet,phpgw_cdb_contact_main,phpgw_cdb_entity_meta,phpgw_cdb_entity_notes,phpgw_cdb_contact_org,phpgw_cdb_contact_personal,phpgw_cdb_contact_phone,phpgw_cdb_contact_phone_cat,phpgw_cdb_language,phpgw_cdb_org,phpgw_cdb_org_client,phpgw_cdb_org_location,phpgw_entity_id,phpgw_cdb_views,phpgw_cdb_recent',1.5);
  
  #
***************
*** 132,136 ****
  
  #
! # Table structure for table 'entity_id'
  #
  CREATE TABLE phpgw_cdb_entity_id (
--- 137,141 ----
  
  #
! # Table structure for table 'phpgw_cdb_entity_id'
  #
  CREATE TABLE phpgw_cdb_entity_id (
***************
*** 144,148 ****
  
  #
! # Table structure for table 'contact_main'
  #
  CREATE TABLE phpgw_cdb_contact_main (
--- 149,153 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_main'
  #
  CREATE TABLE phpgw_cdb_contact_main (
***************
*** 173,177 ****
  );
  #
! # Table structure for table 'contact_phone'
  #
  CREATE TABLE phpgw_cdb_contact_phone (
--- 178,182 ----
  );
  #
! # Table structure for table 'phpgw_cdb_contact_phone'
  #
  CREATE TABLE phpgw_cdb_contact_phone (
***************
*** 186,190 ****
  
  #
! # Table structure for table 'contact_phone_category'
  #
  # This table has an entry for each type of telephone
--- 191,195 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_phone_cat'
  #
  # This table has an entry for each type of telephone
***************
*** 200,204 ****
  
  #
! # Default data for table 'contact_phone_category'
  #
  
--- 205,209 ----
  
  #
! # Default data for table 'phpgw_cdb_contact_phone_cat'
  #
  
***************
*** 228,232 ****
  
  #
! # Table structure for table 'organization'
  # Companies can be catalogued and referenced as 
  # individual entities.  Assuming that you have 
--- 233,237 ----
  
  #
! # Table structure for table 'phpgw_cdb_org'
  # Companies can be catalogued and referenced as 
  # individual entities.  Assuming that you have 
***************
*** 240,248 ****
    organization_network_name varchar(100),
    organization_gov_id_num varchar(20),
    PRIMARY KEY (organization_id)
  );
  
  #
! # Table structure for table 'organization_location'
  # This table contains location/address/phone info
  # for organizations.  Any org. can have multiple
--- 245,254 ----
    organization_network_name varchar(100),
    organization_gov_id_num varchar(20),
+   main_location int(11) unsigned DEFAULT '0' NOT NULL,
    PRIMARY KEY (organization_id)
  );
  
  #
! # Table structure for table 'phpgw_cdb_org_location'
  # This table contains location/address/phone info
  # for organizations.  Any org. can have multiple
***************
*** 265,269 ****
  
  #
! # Table structure for table 'organization_client'
  # Organizations/Entities who are clients have their 
  # own set of info.
--- 271,275 ----
  
  #
! # Table structure for table 'phpgw_cdb_org_client'
  # Organizations/Entities who are clients have their 
  # own set of info.
***************
*** 279,283 ****
  
  #
! # Table structure for table 'entity_notes'
  # Notes are kept in separate tables in order to keep 
  # the other tables optimized. 
--- 285,289 ----
  
  #
! # Table structure for table 'phpgw_cdb_entity_notes'
  # Notes are kept in separate tables in order to keep 
  # the other tables optimized. 
***************
*** 290,294 ****
  
  #
! # Table structure for table 'contact_organization'
  # This table is specific to a contact.  This is 
  # contact-specific organization information like who 
--- 296,300 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_org'
  # This table is specific to a contact.  This is 
  # contact-specific organization information like who 
***************
*** 314,318 ****
  
  #
! # Table structure for table 'contact_client'
  # Contacts who are clients have their own set 
  # of info.
--- 320,324 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_client'
  # Contacts who are clients have their own set 
  # of info.
***************
*** 328,332 ****
  
  #
! # Table structure for table 'contact_personal'
  # Contact's personal information
  #'
--- 334,338 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_personal'
  # Contact's personal information
  #'
***************
*** 345,349 ****
  
  #
! # Table structure for table 'language'
  # List of languages for future international
  # compatibility and international contacts.
--- 351,355 ----
  
  #
! # Table structure for table 'phpgw_cdb_language'
  # List of languages for future international
  # compatibility and international contacts.
***************
*** 365,369 ****
  
  #
! # Table structure for table 'category'
  #
  CREATE TABLE phpgw_cdb_category (
--- 371,375 ----
  
  #
! # Table structure for table 'phpgw_cdb_category'
  #
  CREATE TABLE phpgw_cdb_category (
***************
*** 375,379 ****
  
  #
! # Table structure for table 'category'
  #
  CREATE TABLE phpgw_cdb_category_link (
--- 381,385 ----
  
  #
! # Table structure for table 'phpgw_cdb_category_link'
  #
  CREATE TABLE phpgw_cdb_category_link (
***************
*** 381,385 ****
    category_id int(11) unsigned DEFAULT '0' NOT NULL,
    entity_id int(11) unsigned DEFAULT '0' NOT NULL,
-   contact_type ENUM("individual","organization") DEFAULT 'individual' NOT 
NULL,
    PRIMARY KEY (category_link_id),
    KEY (entity_id),
--- 387,390 ----
***************
*** 389,393 ****
  
  #
! # Table structure for table 'entity_meta'
  #
  CREATE TABLE phpgw_cdb_entity_meta (
--- 394,398 ----
  
  #
! # Table structure for table 'phpgw_cdb_entity_meta'
  #
  CREATE TABLE phpgw_cdb_entity_meta (
***************
*** 409,413 ****
  
  #
! # Table structure for table 'contact_flag'
  # List of choices for different status flags.
  # Each person can make their own set of status flags
--- 414,418 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_flag'
  # List of choices for different status flags.
  # Each person can make their own set of status flags
***************
*** 436,440 ****
  
  #
! # Table structure for table 'contact_followup'
  # Flag contacts for later followup.  There will
  # be a marker next to their name in the color specified.
--- 441,445 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_followup'
  # Flag contacts for later followup.  There will
  # be a marker next to their name in the color specified.
***************
*** 448,452 ****
  
  #
! # Default data for table 'contact_phone_category'
  #
  
--- 453,457 ----
  
  #
! # Default data for table 'phpgw_cdb_contact_phone_cat'
  #
  
***************
*** 461,465 ****
  
  #
! # Table structure for table 'contact_internet'
  #
  CREATE TABLE phpgw_cdb_contact_internet (
--- 466,470 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_internet'
  #
  CREATE TABLE phpgw_cdb_contact_internet (
***************
*** 482,486 ****
  
  #
! # Table structure for table 'contact_address_category'
  #
  # This table has an entry for each type of address.
--- 487,491 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_addr_cat'
  #
  # This table has an entry for each type of address.
***************
*** 495,499 ****
  
  #
! # Default data for table 'contact_address_category'
  #
  
--- 500,504 ----
  
  #
! # Default data for table 'phpgw_cdb_contact_addr_cat'
  #
  
***************
*** 505,509 ****
  
  #
! # Table structure for table 'contact_address'
  #
  CREATE TABLE phpgw_cdb_contact_addr (
--- 510,514 ----
  
  #
! # Table structure for table 'phpgw_cdb_contact_address'
  #
  CREATE TABLE phpgw_cdb_contact_addr (
***************
*** 518,520 ****
--- 523,554 ----
    KEY (contact_id),
    KEY (address_category_id)
+ );
+ 
+ #
+ # Table structure for table 'phpgw_cdb_views'
+ #
+ CREATE TABLE phpgw_cdb_views (
+   view_id int(11) unsigned DEFAULT '0' NOT NULL auto_increment,
+   cache_date int(11) NOT NULL,
+   owner int(11) NOT NULL,
+   group_owner varchar(255) NOT NULL,
+   public, char(32) NOT NULL DEFAULT 'private',
+   name int(11) NOT NULL,
+   type int(11) NOT NULL,
+   view_fields varchar(255),
+   view_filter text,
+   sort varchar(100),
+   view_group varchar(100),
+   PRIMARY KEY (view_id)
+ );
+ 
+ #
+ # Table structure for table 'phpgw_cdb_recent'
+ #
+ CREATE TABLE phpgw_cdb_recent (
+   account_id int(11) unsigned DEFAULT '0' NOT NULL auto_increment,
+   orgs varchar(20),
+   contacts varchar(20),
+   views varchar(20),
+   PRIMARY KEY (account_id)
  );