- Patch #30801 by Allie Micka and m3avrck: performance improvements: improved the database scheme and queries of the block.module.

3 files changed, 14 insertions, 3 deletions

diff --git a/database/database.mysql b/database/database.mysql
index 920782aaa..ea9087668 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -128,7 +128,8 @@ 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
+  pages text NOT NULL,
+  PRIMARY KEY (module, delta)
 ) TYPE=MyISAM;
 
 --
diff --git a/database/database.pgsql b/database/database.pgsql
index f083a3bd9..885a82f4e 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -123,7 +123,8 @@ 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 ''
+  pages text NOT NULL default '',
+  PRIMARY KEY (module, detla)
 );
 
 --
diff --git a/database/updates.inc b/database/updates.inc
index f6027f786..bb73e7235 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -45,7 +45,8 @@ $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-07" => "update_147",
+  "2005-09-12" => "update_148"
 );
 
 function update_110() {
@@ -790,6 +791,14 @@ 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"];
   $result = db_query($sql);