summaryrefslogtreecommitdiffstats
path: root/database
diff options
context:
space:
mode:
authorDries Buytaert2003-10-01 05:18:03 (GMT)
committerDries Buytaert2003-10-01 05:18:03 (GMT)
commitfa2581edcfa52c847db93a9421de5216fb0072f6 (patch)
tree157fe17cb4af14b4b927ce157c29ab8fd9b894cf /database
parent392304da5f4a6f86d8ab8b5f91d38a698d1dcc88 (diff)
- Modifies path.module to get rid of pgsql reserved word. Patch by Adrian.
- Updates database.pgsql and database.mysql to work with current cvs. Patch by Adrian. - Updates update.php to be able to update postgres from 4.2 to current. Patch by Adrian. - Small fixes by me.
Diffstat (limited to 'database')
-rw-r--r--database/database.mysql8
-rw-r--r--database/database.pgsql19
2 files changed, 19 insertions, 8 deletions
diff --git a/database/database.mysql b/database/database.mysql
index ce823b2..3f262af 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -307,11 +307,11 @@ CREATE TABLE page (
CREATE TABLE path (
pid int(10) unsigned NOT NULL auto_increment,
- old varchar(128) NOT NULL default '',
- new varchar(128) NOT NULL default '',
+ src varchar(128) NOT NULL default '',
+ dst varchar(128) NOT NULL default '',
PRIMARY KEY (pid),
- UNIQUE KEY new (new),
- UNIQUE KEY old (old)
+ UNIQUE KEY dst (dst),
+ UNIQUE KEY src (src)
) TYPE=MyISAM;
--
diff --git a/database/database.pgsql b/database/database.pgsql
index 3e2d318..fd1ef5f 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -263,7 +263,6 @@ CREATE TABLE node (
nid SERIAL,
type varchar(16) NOT NULL default '',
title varchar(128) NOT NULL default '',
- path varchar(250) NULL default '',
score integer NOT NULL default '0',
votes integer NOT NULL default '0',
uid integer NOT NULL default '0',
@@ -281,12 +280,11 @@ CREATE TABLE node (
static integer NOT NULL default '0',
PRIMARY KEY (nid)
);
-CREATE INDEX node_type_idx ON node(type(4));
-CREATE INDEX node_title_idx ON node(title,type(4));
+CREATE INDEX node_type_idx ON node(type);
+CREATE INDEX node_title_idx ON node(title,type);
CREATE INDEX node_status_idx ON node(status);
CREATE INDEX node_uid_idx ON node(uid);
CREATE INDEX node_moderate_idx ON node (moderate);
-CREATE INDEX node_path_idx ON node (path(8));
CREATE INDEX node_promote_status_idx ON node (promote, status);
--
@@ -303,6 +301,19 @@ CREATE TABLE page (
CREATE INDEX page_nid_idx ON page(nid);
--
+-- Table structure for table 'path'
+--
+
+CREATE TABLE path (
+ pid integer NOT NULL default '0',
+ dst varchar(128) NOT NULL default '',
+ src varchar(128) NOT NULL default '',
+ PRIMARY KEY (pid)
+);
+CREATE INDEX path_src_idx ON path(src);
+CREATE INDEX path_dst_idx ON path(dst);
+
+--
-- Table structure for permission
--