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

Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

Browse Source
This commit is contained in:
Weblate 2015-12-18 15:39:17 +01:00
commit d75c68d589
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

@ -92,7 +92,7 @@ function PMA_generateCharsetQueryPart($collation)
{
if (!PMA_DRIZZLE) {
list($charset) = explode('_', $collation);
return ' CHARACTER SET ' . $charset
return ' CHARSET=' . $charset
. ($charset == $collation ? '' : ' COLLATE ' . $collation);
} else {
return ' COLLATE ' . $collation;

4
test/classes/PMA_Table_test.php
View File

@ -713,8 +713,8 @@ 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 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`";
}

6
test/libraries/PMA_mysql_charsets_test.php
View File

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