gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11779 from devenbansod/fix_error_in_11757_correction

Browse Source 
Fix #11777: While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword
This commit is contained in:
Deven Bansod 2015-12-27 10:55:40 +05:30
commit 8bd97563b4
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/Table.class.php
View File

@ -410,7 +410,7 @@ class PMA_Table
$type
);
if (! empty($collation) && $collation != 'NULL' && $matches) {
$query .= PMA_generateCharsetQueryPart($collation);
$query .= PMA_generateCharsetQueryPart($collation, true);
}
if ($null !== false) {

12
libraries/mysql_charsets.lib.php
View File

@ -84,15 +84,21 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
/**
* Generate the charset query part
*
* @param string $collation Collation
* @param string $collation Collation
* @param boolean optional $override force 'CHARACTER SET' keyword
*
* @return string
*/
function PMA_generateCharsetQueryPart($collation)
function PMA_generateCharsetQueryPart($collation, $override = false)
{
if (!PMA_DRIZZLE) {
list($charset) = explode('_', $collation);
return ' CHARSET=' . $charset
$keyword = ' CHARSET=';
if ($override) {
$keyword = ' CHARACTER SET ';
}
return $keyword . $charset
. ($charset == $collation ? '' : ' COLLATE ' . $collation);
} else {
return ' COLLATE ' . $collation;

2
test/classes/PMA_Table_test.php
View File

@ -713,7 +713,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
. "COLLATE charset1 NULL DEFAULT 'VARCHAR' "
. "AUTO_INCREMENT COMMENT 'PMA comment' AFTER `new_name`";
} else {
$expect = "`name` `new_name` VARCHAR(2) new_name CHARSET="
$expect = "`name` `new_name` VARCHAR(2) new_name CHARACTER SET "
. "charset1 NULL DEFAULT 'VARCHAR' "
. "AUTO_INCREMENT COMMENT 'PMA comment' AFTER `new_name`";
}