From fa1d8916fb4a6516ca2f7903e8ef837b5a458dd2 Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Sat, 21 Feb 2004 19:16:48 +0000
Subject: [PATCH] - Cleaning up database definition.
---
database/database.mssql | 2 --
database/database.mysql | 9 +++------
database/database.pgsql | 2 --
update.php | 1 +
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/database/database.mssql b/database/database.mssql
index a9b313449575..fb22140f2cc7 100644
--- a/database/database.mssql
+++ b/database/database.mssql
@@ -82,7 +82,6 @@ CREATE TABLE [dbo].[comments] (
[comment] [varchar] (8000) NOT NULL ,
[hostname] [varchar] (128) NOT NULL ,
[timestamp] [int] NOT NULL ,
- [link] [varchar] (16) NULL ,
[score] [int] NOT NULL ,
[status] [tinyint] NOT NULL ,
[thread] [varchar] (255) NOT NULL ,
@@ -118,7 +117,6 @@ GO
CREATE TABLE [dbo].[forum] (
[nid] [numeric](10, 0) NOT NULL ,
[tid] [numeric](10, 0) NOT NULL ,
- [icon] [varchar] (255) NULL ,
[shadow] [numeric](10, 0) NOT NULL
) ON [PRIMARY]
GO
diff --git a/database/database.mysql b/database/database.mysql
index b340c5d128ab..d08aed162c06 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -68,7 +68,6 @@ CREATE TABLE book (
format tinyint(2) default '0',
log longtext,
PRIMARY KEY (nid),
- KEY nid (nid),
KEY parent (parent)
) TYPE=MyISAM;
@@ -125,7 +124,6 @@ CREATE TABLE comments (
comment longtext NOT NULL,
hostname varchar(128) NOT NULL default '',
timestamp int(11) NOT NULL default '0',
- link varchar(16) NOT NULL default '',
score mediumint(9) NOT NULL default '0',
status tinyint(3) unsigned NOT NULL default '0',
thread varchar(255) NOT NULL,
@@ -186,9 +184,9 @@ CREATE TABLE filters (
CREATE TABLE forum (
nid int(10) unsigned NOT NULL default '0',
tid int(10) unsigned NOT NULL default '0',
- icon varchar(255) NOT NULL default '',
shadow int(10) unsigned NOT NULL default '0',
- PRIMARY KEY (nid)
+ PRIMARY KEY (nid),
+ KEY tid (tid)
) TYPE=MyISAM;
--
@@ -311,8 +309,7 @@ CREATE TABLE page (
link varchar(128) NOT NULL default '',
format tinyint(2) NOT NULL default '0',
description varchar(128) NOT NULL default '',
- PRIMARY KEY (nid),
- KEY nid (nid)
+ PRIMARY KEY (nid)
) TYPE=MyISAM;
--
diff --git a/database/database.pgsql b/database/database.pgsql
index 030d3b22607f..a035a7351b57 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -123,7 +123,6 @@ CREATE TABLE comments (
comment text NOT NULL default '',
hostname varchar(128) NOT NULL default '',
timestamp integer NOT NULL default '0',
- link varchar(16) NOT NULL default '',
score integer NOT NULL default '0',
status smallint NOT NULL default '0',
thread varchar(255) default '',
@@ -174,7 +173,6 @@ CREATE TABLE feed (
CREATE TABLE forum (
nid integer NOT NULL default '0',
tid integer NOT NULL default '0',
- icon varchar(255) NOT NULL default '',
shadow integer NOT NULL default '0',
PRIMARY KEY (nid)
);
diff --git a/update.php b/update.php
index 9d02d4c8d760..35d56f2eb9e3 100644
--- a/update.php
+++ b/update.php
@@ -678,6 +678,7 @@ function update_79() {
}
else {
update_sql("ALTER TABLE {node} DROP attributes");
+ update_sql("ALTER TABLE {comment} DROP link";
}
}
--
GitLab