summaryrefslogtreecommitdiff
path: root/database
diff options
context:
space:
mode:
Diffstat (limited to 'database')
-rw-r--r--database/database.mysql3
-rw-r--r--database/database.pgsql3
-rw-r--r--database/updates.inc10
3 files changed, 3 insertions, 13 deletions
diff --git a/database/database.mysql b/database/database.mysql
index ea9087668..920782aaa 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -128,8 +128,7 @@ CREATE TABLE blocks (
custom tinyint(2) DEFAULT '0' NOT NULL,
throttle tinyint(1) DEFAULT '0' NOT NULL,
visibility tinyint(1) DEFAULT '0' NOT NULL,
- pages text NOT NULL,
- PRIMARY KEY (module, delta)
+ pages text NOT NULL
) TYPE=MyISAM;
--
diff --git a/database/database.pgsql b/database/database.pgsql
index 885a82f4e..f083a3bd9 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -123,8 +123,7 @@ CREATE TABLE blocks (
custom smallint NOT NULL default '0',
throttle smallint NOT NULL default '0',
visibility smallint NOT NULL default '0',
- pages text NOT NULL default '',
- PRIMARY KEY (module, detla)
+ pages text NOT NULL default ''
);
--
diff --git a/database/updates.inc b/database/updates.inc
index 1b7ae8f2d..96d8da6fc 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -66,8 +66,7 @@ $sql_updates = array(
"2005-08-08" => "update_144",
"2005-08-15" => "update_145",
"2005-08-25" => "update_146",
- "2005-09-07" => "update_147",
- "2005-09-12" => "update_148"
+ "2005-09-07" => "update_147"
);
function update_110() {
@@ -812,13 +811,6 @@ function update_147() {
return $ret;
}
-function update_148() {
- $ret = array();
-
- $ret[] = update_sql('ALTER TABLE {blocks} ADD PRIMARY KEY (module, delta)');
-
- return $ret;
-}
function update_sql($sql) {
$edit = $_POST["edit"];