[geeklog-cvs] Geeklog-1.x/plugins/links/sql mysql_install.php, 1.4, 1.5

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/links/sql
In directory qs1489.pair.com:/tmp/cvs-serv5050/sql

Modified Files:
	mysql_install.php 
Log Message:
new version from Euan (2nd try)

Index: mysql_install.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/links/sql/mysql_install.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mysql_install.php	28 Aug 2007 07:52:26 -0000	1.4
--- mysql_install.php	29 Aug 2007 04:26:59 -0000	1.5
***************
*** 54,60 ****
  
  $_SQL[] = "
  CREATE TABLE {$_TABLES['links']} (
    lid varchar(20) NOT NULL default '',
!   cid varchar(20) default NULL,
    url varchar(255) default NULL,
    description text,
--- 54,80 ----
  
  $_SQL[] = "
+ CREATE TABLE {$_TABLES['linkcategories']} (
+   cid varchar(20) NOT NULL,
+   pid varchar(20) NOT NULL,
+   category varchar(32) NOT NULL,
+   description text DEFAULT NULL,
+   tid varchar(20) DEFAULT NULL,
+   created datetime DEFAULT NULL,
+   modified datetime DEFAULT NULL,
+   owner_id mediumint(8) unsigned NOT NULL default '1',
+   group_id mediumint(8) unsigned NOT NULL default '1',
+   perm_owner tinyint(1) unsigned NOT NULL default '3',
+   perm_group tinyint(1) unsigned NOT NULL default '2',
+   perm_members tinyint(1) unsigned NOT NULL default '2',
+   perm_anon tinyint(1) unsigned NOT NULL default '2',
+   PRIMARY KEY (cid),
+   KEY links_pid (pid)
+ ) TYPE=MyISAM
+ ";
+ 
+ $_SQL[] = "
  CREATE TABLE {$_TABLES['links']} (
    lid varchar(20) NOT NULL default '',
!   cid varchar(32) default NULL,
    url varchar(255) default NULL,
    description text,
***************
*** 68,73 ****
    perm_members tinyint(1) unsigned NOT NULL default '2',
    perm_anon tinyint(1) unsigned NOT NULL default '2',
!   INDEX links_cid (cid),
!   INDEX links_date (date),
    PRIMARY KEY (lid)
  ) TYPE=MyISAM
--- 88,93 ----
    perm_members tinyint(1) unsigned NOT NULL default '2',
    perm_anon tinyint(1) unsigned NOT NULL default '2',
!   INDEX links_category(cid),
!   INDEX links_date(date),
    PRIMARY KEY (lid)
  ) TYPE=MyISAM
***************
*** 77,81 ****
  CREATE TABLE {$_TABLES['linksubmission']} (
    lid varchar(20) NOT NULL default '',
!   cid varchar(20) default NULL,
    url varchar(255) default NULL,
    description text,
--- 97,101 ----
  CREATE TABLE {$_TABLES['linksubmission']} (
    lid varchar(20) NOT NULL default '',
!   cid varchar(32) default NULL,
    url varchar(255) default NULL,
    description text,
***************
*** 83,108 ****
    hits int(11) default NULL,
    date datetime default NULL,
-   owner_id mediumint(8) NOT NULL default '1',
-   PRIMARY KEY (lid)
- ) TYPE=MyISAM
- ";
- 
- $_SQL[] = "
- CREATE TABLE {$_TABLES['linkcategories']} (
-   cid varchar(20) NOT NULL,
-   pid varchar(20) NOT NULL,
-   category varchar(32) NOT NULL,
-   description text DEFAULT NULL,
-   tid varchar(20) DEFAULT NULL,
-   created datetime DEFAULT NULL,
-   modified datetime DEFAULT NULL,
    owner_id mediumint(8) unsigned NOT NULL default '1',
!   group_id mediumint(8) unsigned NOT NULL default '1',
!   perm_owner tinyint(1) unsigned NOT NULL default '3',
!   perm_group tinyint(1) unsigned NOT NULL default '2',
!   perm_members tinyint(1) unsigned NOT NULL default '2',
!   perm_anon tinyint(1) unsigned NOT NULL default '2',
!   PRIMARY KEY (cid),
!   KEY links_pid (pid)
  ) TYPE=MyISAM
  ";
--- 103,108 ----
    hits int(11) default NULL,
    date datetime default NULL,
    owner_id mediumint(8) unsigned NOT NULL default '1',
!   PRIMARY KEY (lid)
  ) TYPE=MyISAM
  ";