yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 02:09:23 +02:00
Code Issues Releases Wiki Activity

Fix for issue #1214.

Browse source 
Homogeneize `username` field length in SQL database.

Set the `VARCHAR` field used for `username` to have a maximum size of
255, which was the highest value used across the tables. This should fix
some errors with MySQL strict mode (and potentially unnoticed previous
errors).

Also edited the `fullname` field length to match the `username` field
length.

Closes #1214.
This commit is contained in:
Phyks (Lucas Verney) 2016-06-15 15:00:46 +02:00
parent 2e1486d2ef
commit b8e28b676d
2 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/class/update.class.php
View file

@ -552,6 +552,9 @@ class Update
$update_string = "- Add custom blank album/video default image and alphabet browsing options.<br />"; $update_string = "- Add custom blank album/video default image and alphabet browsing options.<br />";
$version[] = array('version' => '380010', 'description' => $update_string); $version[] = array('version' => '380010', 'description' => $update_string);
$update_string = "- Fix username max size to be the same one across all tables.<br />";
$version[] = array('version' => '380011', 'description' => $update_string);
return $version; return $version;
} }
@ -3937,4 +3940,28 @@ class Update
return $retval; return $retval;
} }
/**
* update_380011
*
* Fix username max size to be the same one across all tables.
*/
public static function update_380011()
{
$retval = true;
$sql = "ALTER TABLE session MODIFY username VARCHAR(255)";
$retval &= Dba::write($sql);
$sql = "ALTER TABLE session_remember MODIFY username VARCHAR(255)";
$retval &= Dba::write($sql);
$sql = "ALTER TABLE user MODIFY username VARCHAR(255)";
$retval &= Dba::write($sql);
$sql = "ALTER TABLE user MODIFY fullname VARCHAR(255)";
$retval &= Dba::write($sql);
return $retval;
}
} }

10
sql/ampache.sql
View file

@ -13,7 +13,7 @@
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- Host: localhost Database: ampache_clean -- Host: localhost Database: ampache_clean
-- ------------------------------------------------------ -- ------------------------------------------------------
-- Server version 5.4.16-log -- Server version 5.4.16-log
@ -804,7 +804,7 @@ CREATE TABLE IF NOT EXISTS `search` (
DROP TABLE IF EXISTS `session`; DROP TABLE IF EXISTS `session`;
CREATE TABLE IF NOT EXISTS `session` ( CREATE TABLE IF NOT EXISTS `session` (
`id` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '', `id` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '',
`username` varchar(16) CHARACTER SET utf8 DEFAULT NULL, `username` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
`expire` int(11) unsigned NOT NULL DEFAULT '0', `expire` int(11) unsigned NOT NULL DEFAULT '0',
`value` longtext COLLATE utf8_unicode_ci NOT NULL, `value` longtext COLLATE utf8_unicode_ci NOT NULL,
`ip` varbinary(255) DEFAULT NULL, `ip` varbinary(255) DEFAULT NULL,
@ -826,7 +826,7 @@ CREATE TABLE IF NOT EXISTS `session` (
DROP TABLE IF EXISTS `session_remember`; DROP TABLE IF EXISTS `session_remember`;
CREATE TABLE IF NOT EXISTS `session_remember` ( CREATE TABLE IF NOT EXISTS `session_remember` (
`username` varchar(16) CHARACTER SET utf8 NOT NULL DEFAULT '', `username` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
`token` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '', `token` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '',
`expire` int(11) DEFAULT NULL, `expire` int(11) DEFAULT NULL,
PRIMARY KEY (`username`,`token`) PRIMARY KEY (`username`,`token`)
@ -1153,8 +1153,8 @@ INSERT INTO `update_info` (`key`, `value`) VALUES
DROP TABLE IF EXISTS `user`; DROP TABLE IF EXISTS `user`;
CREATE TABLE IF NOT EXISTS `user` ( CREATE TABLE IF NOT EXISTS `user` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`username` varchar(128) CHARACTER SET utf8 DEFAULT NULL, `username` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
`fullname` varchar(128) CHARACTER SET utf8 DEFAULT NULL, `fullname` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
`email` varchar(128) CHARACTER SET utf8 DEFAULT NULL, `email` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
`website` varchar(255) CHARACTER SET utf8 DEFAULT NULL, `website` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
`apikey` varchar(255) CHARACTER SET utf8 DEFAULT NULL, `apikey` varchar(255) CHARACTER SET utf8 DEFAULT NULL,