From 9d76797b17d65540a903ef37eee6edca3e83108b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 16 Sep 2009 22:23:32 -0700
Subject: Changed the search module installer to explicitly specify MyISAM as
 the database type. Changed the packager to not remove the engine
 specification if the table is search_records. Fixes Ticket #774

---
 modules/search/helpers/search_installer.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'modules/search/helpers')

diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index 10d8211f..096f46c7 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -28,6 +28,7 @@ class search_installer {
                  PRIMARY KEY (`id`),
                  KEY(`item_id`),
                  FULLTEXT INDEX (`data`))
+               ENGINE=MYISAM
                DEFAULT CHARSET=utf8;");
     module::set_version("search", 1);
   }
@@ -47,4 +48,13 @@ class search_installer {
   static function uninstall() {
     Database::instance()->query("DROP TABLE {search_records}");
   }
+
+  static function upgrade($version) {
+    $db = Database::instance();
+    if ($version == 1) {
+      $db->query("ALTER TABLE {search_records} ENGINE=MYISAM");
+      module::set_version("search", 2);
+    }
+  }
+
 }
-- 
cgit v1.2.3


From 6458b47e3ed3ef31d08080a66781ee53bf0f25ed Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 17 Sep 2009 12:38:59 -0700
Subject: Remove the update code introduced with 9d7d79.  In addition,
 captialize MyISAM correctly.

---
 modules/search/helpers/search_installer.php | 11 +----------
 modules/search/module.info                  |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'modules/search/helpers')

diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index 096f46c7..f3225b4e 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -28,7 +28,7 @@ class search_installer {
                  PRIMARY KEY (`id`),
                  KEY(`item_id`),
                  FULLTEXT INDEX (`data`))
-               ENGINE=MYISAM
+               ENGINE=MyISAM
                DEFAULT CHARSET=utf8;");
     module::set_version("search", 1);
   }
@@ -48,13 +48,4 @@ class search_installer {
   static function uninstall() {
     Database::instance()->query("DROP TABLE {search_records}");
   }
-
-  static function upgrade($version) {
-    $db = Database::instance();
-    if ($version == 1) {
-      $db->query("ALTER TABLE {search_records} ENGINE=MYISAM");
-      module::set_version("search", 2);
-    }
-  }
-
 }
diff --git a/modules/search/module.info b/modules/search/module.info
index 2f2ebdf1..f417c4fa 100644
--- a/modules/search/module.info
+++ b/modules/search/module.info
@@ -1,3 +1,3 @@
 name = "Search"
 description = "Allows users to search their Gallery"
-version = 2
+version = 1
-- 
cgit v1.2.3