Skip to content

Commit

Permalink
bug:2224 change nb_image_page into smallint(3)
Browse files Browse the repository at this point in the history
git-svn-id: http://piwigo.org/svn/trunk@10341 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
mistic100 committed Apr 12, 2011
1 parent 4232445 commit c01d0c1
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 2 deletions.
2 changes: 1 addition & 1 deletion install/db/101-database.php
Expand Up @@ -33,7 +33,7 @@
{
pwg_query('
ALTER TABLE '.USER_INFOS_TABLE.'
ADD COLUMN `nb_image_page` tinyint(3) unsigned NOT NULL default \'15\'
ADD COLUMN `nb_image_page` smallint(3) unsigned NOT NULL default \'15\'
;');
}
else if (in_array($conf['dblayer'], array('pgsql', 'sqlite', 'pdo-sqlite')))
Expand Down
45 changes: 45 additions & 0 deletions install/db/102-database.php
@@ -0,0 +1,45 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
// | 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('Hacking attempt!');
}

$upgrade_description = 'change nb_image_page into smallint(3)';

// add column
if ('mysql' == $conf['dblayer'])
{
pwg_query('
ALTER TABLE '.USER_INFOS_TABLE.'
CHANGE `nb_image_page` `nb_image_page` SMALLINT(3) UNSIGNED NOT NULL DEFAULT 15
;');
}

echo
"\n"
. $upgrade_description
."\n"
;
?>
2 changes: 1 addition & 1 deletion install/piwigo_structure-mysql.sql
Expand Up @@ -404,7 +404,7 @@ CREATE TABLE `piwigo_user_group` (
DROP TABLE IF EXISTS `piwigo_user_infos`;
CREATE TABLE `piwigo_user_infos` (
`user_id` smallint(5) NOT NULL default '0',
`nb_image_page` tinyint(3) unsigned NOT NULL default '15',
`nb_image_page` smallint(3) unsigned NOT NULL default '15',
`status` enum('webmaster','admin','normal','generic','guest') NOT NULL default 'guest',
`language` varchar(50) NOT NULL default 'en_UK',
`maxwidth` smallint(6) default NULL,
Expand Down

0 comments on commit c01d0c1

Please sign in to comment.