From 1233f248ed20795c544441c5ebd97e344462c70a Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 9 Nov 2006 22:13:33 +0000
Subject: New: upgrade script from 1.6.0 (or 1.6.1) to 1.6.2.
 #user_infos.auto_login_key is added in upgrade_1.6.0.php instead of
 upgrade_1.5.0.php.

Bug fixed: the database structure dump was starting with a "1", very
interesting typo!

Bug fixed: the database structure dump was adding #user_infos.auto_login_key
nullable while the upgrade file was adding it not nullable.


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1599 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 install/phpwebgallery_structure.sql |  4 +--
 install/upgrade_1.5.0.php           |  7 ++---
 install/upgrade_1.6.0.php           | 55 +++++++++++++++++++++++++++++++++++++
 upgrade.php                         |  8 ++++--
 4 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 install/upgrade_1.6.0.php

diff --git a/install/phpwebgallery_structure.sql b/install/phpwebgallery_structure.sql
index 43bf6128b..65ee39eca 100644
--- a/install/phpwebgallery_structure.sql
+++ b/install/phpwebgallery_structure.sql
@@ -1,4 +1,4 @@
-1-- MySQL dump 9.11
+-- MySQL dump 9.11
 --
 -- Host: localhost    Database: pwg-1_6
 -- ------------------------------------------------------
@@ -318,6 +318,7 @@ CREATE TABLE `phpwebgallery_user_infos` (
   `template` varchar(255) NOT NULL default 'yoga/clear',
   `registration_date` datetime NOT NULL default '0000-00-00 00:00:00',
   `enabled_high` enum('true','false') NOT NULL default 'true',
+  `auto_login_key` varchar(64) NOT NULL default '',
   UNIQUE KEY `user_infos_ui1` (`user_id`)
 ) TYPE=MyISAM;
 
@@ -345,7 +346,6 @@ CREATE TABLE `phpwebgallery_users` (
   `username` varchar(100) binary NOT NULL default '',
   `password` varchar(32) default NULL,
   `mail_address` varchar(255) default NULL,
-  `auto_login_key` varchar(64) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `users_ui1` (`username`)
 ) TYPE=MyISAM;
diff --git a/install/upgrade_1.5.0.php b/install/upgrade_1.5.0.php
index 8707c981f..2f69ffe10 100644
--- a/install/upgrade_1.5.0.php
+++ b/install/upgrade_1.5.0.php
@@ -468,9 +468,6 @@ ALTER TABLE '.PREFIX_TABLE.'users
   }
 }
 
-$query = '
-ALTER TABLE '.PREFIX_TABLE.'users
-  ADD auto_login_key varchar(64) NOT NULL
-;';
-pwg_query($query);
+// now we upgrade from 1.6.0 to 1.6.2
+include_once(PHPWG_ROOT_PATH.'install/upgrade_1.6.0.php');
 ?>
diff --git a/install/upgrade_1.6.0.php b/install/upgrade_1.6.0.php
new file mode 100644
index 000000000..1815e33c1
--- /dev/null
+++ b/install/upgrade_1.6.0.php
@@ -0,0 +1,55 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2005-10-23 23:02:21 +0200 (dim, 23 oct 2005) $
+// | last modifier : $Author: plg $
+// | revision      : $Revision: 911 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die ('This page cannot be loaded directly, load upgrade.php');
+}
+else
+{
+  if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
+  {
+    die ('Hacking attempt!');
+  }
+}
+
+$queries = array(
+  "
+ALTER TABLE ".PREFIX_TABLE."user_infos
+  ADD auto_login_key varchar(64) NOT NULL
+;",
+  '
+ALTER TABLE '.PREFIX_TABLE.'users
+  CHANGE username username VARCHAR(100) binary NOT NULL
+;',
+  );
+
+foreach ($queries as $query)
+{
+  pwg_query($query);
+}
+?>
diff --git a/upgrade.php b/upgrade.php
index c2a68a920..636945cbd 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -181,9 +181,13 @@ if (!isset($_GET['version']))
   {
     $current_release = '1.5.0';
   }
+  else if (!in_array('auto_login_key', $columns_of[PREFIX_TABLE.'user_infos']))
+  {
+    $current_release = '1.6.0';
+  }
   else
   {
-    die('You are already on branch 1.6, no upgrade required');
+    die('No upgrade required, the database structure is up to date');
   }
   
   $template->assign_block_vars(
@@ -223,7 +227,7 @@ else
         array(
           'id'          => $upgrade_id,
           'applied'     => CURRENT_DATE,
-          'description' => 'upgrade included in upgrade',
+          'description' => 'upgrade included in migration',
           )
         );
     }
-- 
cgit v1.2.3