From 15792c4ddfec9741324c6968cc3e70fb23cef8ad Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Mon, 27 Dec 2010 22:16:29 +0100
Subject: [PATCH] Added changes to installer and upgrader scripts to support
 INSERT ON DUPLICATE KEY UPDATE SYNTAX in cache lib

---
 installer/install.sql                         | 2 +-
 modules/gallery/helpers/gallery_installer.php | 7 ++++++-
 modules/gallery/module.info                   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/installer/install.sql b/installer/install.sql
index 427a328385..baee2b9daf 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -43,7 +43,7 @@ CREATE TABLE {caches} (
   `expiration` int(9) NOT NULL,
   `cache` longblob,
   PRIMARY KEY (`id`),
-  KEY `key` (`key`),
+  UNIQUE KEY `key` (`key`),
   KEY `tags` (`tags`)
 ) DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index a6b8e6a22e..ecabc766bc 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -309,7 +309,7 @@ static function install() {
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 41);
+    module::set_version("gallery", 42);
   }
 
   static function upgrade($version) {
@@ -642,6 +642,11 @@ static function upgrade($version) {
       module::clear_var("gallery", "_cache");
       module::set_version("gallery", $version = 41);
     }
+
+    if ($version == 41) {
+      $db->query("ALTER TABLE {caches} DROP INDEX `key`, ADD UNIQUE `key` (`key`)");
+      module::set_version("gallery", $version = 42);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 2b684e5e5a..0cc3f6d14e 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 41
+version = 42