Skip to content
Permalink
Browse files

issue #552 change activity.occured_on to TIMESTAMP instead of DATETIM…

…E to make it work on old MySQL versions
  • Loading branch information...
plegall committed Apr 10, 2019
1 parent dc40d19 commit c202897a72270275f242b1e61f6b86288de025ea
Showing with 42 additions and 2 deletions.
  1. +1 −1 install/db/154-database.php
  2. +40 −0 install/db/156-database.php
  3. +1 −1 install/piwigo_structure-mysql.sql
@@ -35,7 +35,7 @@
`object_id` int(11) unsigned NOT NULL,
`action` varchar(255) NOT NULL,
`performed_by` mediumint(8) unsigned NOT NULL,
`occured_on` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`occured_on` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
`details` varchar(255) DEFAULT NULL,
PRIMARY KEY (`activity_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -0,0 +1,40 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2016 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 = 'bug fixing, change column type for activity.occured_on';
$row = pwg_db_fetch_assoc(pwg_query('SHOW COLUMNS FROM `'.PREFIX_TABLE.'activity` LIKE "occured_on";'));
if (!preg_match('/^TIMESTAMP/i', $row['Type']))
{
$query = 'ALTER TABLE `'.PREFIX_TABLE.'activity` CHANGE `occured_on` `occured_on` TIMESTAMP DEFAULT CURRENT_TIMESTAMP;';
pwg_query($query);
}
echo "\n".$upgrade_description."\n";
?>
@@ -17,7 +17,7 @@ CREATE TABLE `piwigo_activity` (
`performed_by` mediumint(8) unsigned NOT NULL,
`session_idx` varchar(255) NOT NULL,
`ip_address` varchar(50) DEFAULT NULL,
`occured_on` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`occured_on` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
`details` varchar(255) DEFAULT NULL,
PRIMARY KEY (`activity_id`)
) ENGINE=MyISAM;

0 comments on commit c202897

Please sign in to comment.
You can’t perform that action at this time.