Changeset 1599

Timestamp:

Nov 9, 2006, 11:13:33 PM (17 years ago)

Author:

plg

Message:

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.

Location:

branches/branch-1_6

Files:

• install/phpwebgallery_structure.sql (modified) (3 diffs)
• install/upgrade_1.5.0.php (modified) (1 diff)
• install/upgrade_1.6.0.php (added)
• upgrade.php (modified) (2 diffs)

branches/branch-1_6/install/phpwebgallery_structure.sql

@@ -1 @@
-1-- MySQL dump 9.11
+-- MySQL dump 9.11
 --
 -- Host: localhost    Database: pwg-1_6
@@ -319 +319 @@
   `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;
@@ -346 +347 @@
   `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`)

branches/branch-1_6/install/upgrade_1.5.0.php

@@ -469 +469 @@
 }
 
-$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');
 ?>

branches/branch-1_6/upgrade.php

@@ -182 +182 @@
     $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');
   }
   
@@ -224 +228 @@
           'id'          => $upgrade_id,
           'applied'     => CURRENT_DATE,
-          'description' => 'upgrade included in upgrade',
+          'description' => 'upgrade included in migration',
           )
         );