From f33f9a5fcdb381c073501ba4c81aba3a75ce56e3 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 12 Apr 2005 18:52:47 +0000
Subject: - Patch #19965 by Robin Monks: fixed problem with duplicate block
 titles.

---
 database/database.mysql |  1 -
 database/database.pgsql |  3 +--
 database/updates.inc    | 17 ++++++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'database')

diff --git a/database/database.mysql b/database/database.mysql
index fbb2e76b5..d65c27c69 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -154,7 +154,6 @@ CREATE TABLE boxes (
   info varchar(128) NOT NULL default '',
   format int(4) NOT NULL default '0',
   PRIMARY KEY (bid),
-  UNIQUE KEY title (title),
   UNIQUE KEY info (info)
 ) TYPE=MyISAM;
 
diff --git a/database/database.pgsql b/database/database.pgsql
index a911049f0..92f5dc0b7 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -153,8 +153,7 @@ CREATE TABLE boxes (
   info varchar(128) NOT NULL default '',
   format smallint NOT NULL default '0',
   PRIMARY KEY  (bid),
-  UNIQUE (info),
-  UNIQUE (title)
+  UNIQUE (info)
 );
 
 --
diff --git a/database/updates.inc b/database/updates.inc
index 19eac2c26..bc7785905 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -106,7 +106,8 @@ $sql_updates = array(
   "2005-03-18" => "update_127",
   "2005-03-21" => "update_128",
   "2005-04-08: first update since Drupal 4.6.0 release" => "update_129",
-  "2005-04-10" => "update_130"
+  "2005-04-10" => "update_130",
+  "2005-04-11" => "update_131"
 );
 
 function update_32() {
@@ -2376,4 +2377,18 @@ function update_130() {
   return $ret;
 }
 
+function update_131() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("ALTER TABLE {boxes} DROP INDEX title");
+    $ret[] = update_sql("ALTER TABLE {boxes} ADD INDEX title (title)");
+  }
+  elseif ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql("DROP INDEX boxes_title_idx");;
+    $ret[] = update_sql("CREATE INDEX title ON {boxes} (title)");
+  }
+
+  return $ret;
+}
 ?>
-- 
cgit v1.2.3