adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 09:43:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bug 209 fixed: upgrade script did not delete obsolete columns in users

Browse Source 
table. users.password column was not updated by upgrade script. To fix
  this bug, a new upgrade script from 1.5.0 was added even if database model
  did not change, it's just about fixing upgraded database.


git-svn-id: http://piwigo.org/svn/branches/branch-1_5@974 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2005-12-06 22:18:08 +00:00
parent dca8ba0c4a
commit 7d49614752
3 changed files with 217 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/upgrade_1.4.0.php
+64
View File
@@ -287,6 +287,70 @@ foreach ($queries as $query)
pwg_query($query);
}
// delete obsolete users table colums
$queries = array(
"
ALTER TABLE phpwebgallery_users
DROP COLUMN status
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN nb_image_line
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN maxheight
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN language
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN nb_line_page
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN expand
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN template
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN maxwidth
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN show_nb_comments
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN recent_period
;",
"
ALTER TABLE phpwebgallery_users
CHANGE COLUMN password password varchar(32) default NULL
;"
);
foreach ($queries as $query)
{
$query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
pwg_query($query);
}
$infos = array();
if ($prefix_thumbnail != 'TN-')
install/upgrade_1.4.1.php
+64
View File
@@ -287,6 +287,70 @@ foreach ($queries as $query)
pwg_query($query);
}
// delete obsolete users table colums
$queries = array(
"
ALTER TABLE phpwebgallery_users
DROP COLUMN status
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN nb_image_line
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN maxheight
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN language
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN nb_line_page
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN expand
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN template
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN maxwidth
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN show_nb_comments
;",
"
ALTER TABLE phpwebgallery_users
DROP COLUMN recent_period
;",
"
ALTER TABLE phpwebgallery_users
CHANGE COLUMN password password varchar(32) default NULL
;"
);
foreach ($queries as $query)
{
$query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
pwg_query($query);
}
$infos = array();
if ($prefix_thumbnail != 'TN-')
install/upgrade_1.5.0.php
+89
View File
@@ -0,0 +1,89 @@
<?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!');
}
}
// depending on the way the 1.5.0 was installed (from scratch or by upgrade)
// the database structure has small differences that should be corrected.
$query = '
ALTER TABLE phpwebgallery_users
CHANGE COLUMN password password varchar(32) default NULL
;';
pwg_query(
str_replace(
'phpwebgallery_',
PREFIX_TABLE,
$query
)
);
$to_keep = array('id', 'username', 'password', 'mail_address');
$query = '
DESC phpwebgallery_users
;';
$result =
pwg_query(
str_replace(
'phpwebgallery_',
PREFIX_TABLE,
$query
)
);
while ($row = mysql_fetch_array($result))
{
if (!in_array($row['Field'], $to_keep))
{
$query = '
ALTER TABLE phpwebgallery_users
DROP COLUMN '.$row['Field'].'
;';
pwg_query(
str_replace(
'phpwebgallery_',
PREFIX_TABLE,
$query
)
);
}
}
?>