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

Merge branch 'QA_4_5'

Browse Source 
Conflicts:
	libraries/mysql_charsets.lib.php
	po/de.po
	po/el.po
	po/et.po
	po/nl.po
	po/tr.po
	test/classes/TableTest.php
	test/libraries/PMA_mysql_charsets_test.php
This commit is contained in:
Deven Bansod 2015-12-18 20:18:10 +05:30
commit 52c637b383
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mysql_charsets.lib.php
View File

@ -89,7 +89,7 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
function PMA_generateCharsetQueryPart($collation)
{
list($charset) = explode('_', $collation);
return ' CHARACTER SET ' . $charset
return ' CHARSET=' . $charset
. ($charset == $collation ? '' : ' COLLATE ' . $collation);
}

4
test/classes/TableTest.php
View File

@ -682,8 +682,8 @@ class TableTest extends PMATestCase
$extra, $comment, $virtuality, $expression, $move_to
);
$expect = "`name` `new_name` VARCHAR(2) new_name CHARACTER "
. "SET charset1 NULL DEFAULT 'VARCHAR' "
$expect = "`name` `new_name` VARCHAR(2) new_name CHARSET="
. "charset1 NULL DEFAULT 'VARCHAR' "
. "AUTO_INCREMENT COMMENT 'PMA comment' AFTER `new_name`";
$this->assertEquals(

6
test/libraries/PMA_mysql_charsets_test.php
View File

@ -45,9 +45,9 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
public function charsetQueryData()
{
return array(
array("a_b_c_d", " CHARACTER SET a COLLATE a_b_c_d"),
array("a_", " CHARACTER SET a COLLATE a_"),
array("a", " CHARACTER SET a"),
array("a_b_c_d", " CHARSET=a COLLATE a_b_c_d"),
array("a_", " CHARSET=a COLLATE a_"),
array("a", " CHARSET=a"),
);
}