From c69dbe691e827d8996c8d3dcd72b6edd64b80ecd Mon Sep 17 00:00:00 2001
From: mjollnir_ <mjollnir_>
Date: Fri, 2 Sep 2005 05:00:59 +0000
Subject: [PATCH] Merged from MOODLE_15_STABLE: (ish, version numbers
 different): Add an index where we really need it - block_instance.pagetype

---
 blocks/db/mysql.php     | 7 ++++++-
 blocks/db/mysql.sql     | 3 ++-
 blocks/db/postgres7.php | 7 ++++++-
 blocks/db/postgres7.sql | 3 +++
 blocks/version.php      | 2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/blocks/db/mysql.php b/blocks/db/mysql.php
index e6f2d7923dd67..fcf2478f85029 100644
--- a/blocks/db/mysql.php
+++ b/blocks/db/mysql.php
@@ -155,7 +155,12 @@ function blocks_upgrade($oldversion=0) {
            PRIMARY KEY(`id`)
           ) TYPE=MyISAM;");
     }
-
+    
+    if ($oldversion < 2005090200) {
+        execute_sql("ALTER TABLE {$CFG->prefix}block_instance ADD INDEX pagetype (pagetype);",false);  // do it silently, in case it's already there from 1.5
+        modify_database('','ALTER TABLE prefix_block_pinned ADD INDEX pagetype (pagetype);');
+    }
+    
     //Finally, return result
     return $result;
 }
diff --git a/blocks/db/mysql.sql b/blocks/db/mysql.sql
index 6d9282ffa21c0..48c496248fab7 100644
--- a/blocks/db/mysql.sql
+++ b/blocks/db/mysql.sql
@@ -24,7 +24,8 @@ CREATE TABLE `prefix_block_instance` (
   `visible` tinyint(1) not null default '0',
   `configdata` text not null default '',
   PRIMARY KEY(`id`),
-  INDEX pageid(`pageid`)
+  INDEX pageid(`pageid`),
+  INDEX pagetype(`pagetype`)
 ) TYPE=MyISAM;
 
 CREATE TABLE `prefix_block_pinned` (
diff --git a/blocks/db/postgres7.php b/blocks/db/postgres7.php
index 331056e83fab1..35d5ae92dc632 100644
--- a/blocks/db/postgres7.php
+++ b/blocks/db/postgres7.php
@@ -139,7 +139,7 @@ function blocks_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2005022401 && $result) { // Mass cleanup of bad upgrade scripts
-        modify_database('','CREATE INDEX prefix_block_instance_pageid_idx ON prefix_block_instance (pageid)');
+        execute_sql("CREATE INDEX {$CFG->prefix}block_instance_pageid_idx ON {$CFG->prefix}block_instance (pageid)",false); // this one should be quiet...
         modify_database('','ALTER TABLE prefix_block_instance ALTER pagetype SET DEFAULT \'\'');
         modify_database('','ALTER TABLE prefix_block_instance ALTER position SET DEFAULT \'\'');
         modify_database('','ALTER TABLE prefix_block_instance ALTER pagetype SET NOT NULL');
@@ -158,6 +158,11 @@ function blocks_upgrade($oldversion=0) {
           );");
      }
 
+    if ($oldversion < 2005090200) {
+        execute_sql("CREATE INDEX {$CFG->prefix}block_instance_pagetype_idx ON {$CFG->prefix}block_instance (pagetype);",false); // do it silently, in case it's already there from 1.5
+        modify_database('','CREATE INDEX prefix_block_pinned_pagetype_idx ON prefix_block_pinned (pagetype);');
+    }
+
     //Finally, return result
     return $result;
 }
diff --git a/blocks/db/postgres7.sql b/blocks/db/postgres7.sql
index d5acafa17d921..352774cd2a992 100644
--- a/blocks/db/postgres7.sql
+++ b/blocks/db/postgres7.sql
@@ -24,6 +24,7 @@ CREATE TABLE prefix_block_instance (
   configdata text not null default ''
 ) ;
 CREATE INDEX prefix_block_instance_pageid_idx ON prefix_block_instance (pageid);
+CREATE INDEX prefix_block_instance_pagetype_idx ON prefix_block_instance (pagetype);
 
 CREATE TABLE prefix_block_pinned ( 
   id SERIAL8 PRIMARY KEY,
@@ -35,4 +36,6 @@ CREATE TABLE prefix_block_pinned (
   configdata text NOT NULL default 0
 ) ;
       
+CREATE INDEX prefix_block_pinned_pagetype_idx ON prefix_block_pinned (pagetype);
+
 # --------------------------------------------------------
diff --git a/blocks/version.php b/blocks/version.php
index 51b41b68c6a6a..0836067fc6015 100644
--- a/blocks/version.php
+++ b/blocks/version.php
@@ -5,4 +5,4 @@
 // database (blocks_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$blocks_version = 2005081600;   // The current version is a date (YYYYMMDDXX)
+$blocks_version = 2005090200;   // The current version is a date (YYYYMMDDXX)