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

bug #1351743 undefined function: pma_getservercollation()

Browse Source
This commit is contained in:
Sebastian Mendel
2005-11-09 08:56:35 +00:00
parent 743416fe24
commit c2413163c0
3 changed files with 369 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-11-09 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* server_databases.php, mysql_charsets-lib.php:
bug #1351743 undefined function: pma_getservercollation()
2005-11-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* Documentation.html, browse_foreigners.php, error.php,
header_printview.inc.php, index.php, left.php, translators.html,

557
libraries/mysql_charsets.lib.php
View File

@@ -12,16 +12,15 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
$mysql_charsets_maxlen[$row['Charset']] = $row['Maxlen'];
$mysql_charsets_descriptions[$row['Charset']] = $row['Description'];
}
@PMA_DBI_free_result($res);
unset($res, $row);
$res = PMA_DBI_query('SHOW COLLATION;');
@PMA_DBI_free_result( $res );
$mysql_charsets_count = count($mysql_charsets);
sort($mysql_charsets, SORT_STRING);
$mysql_collations = array_flip($mysql_charsets);
$mysql_default_collations = $mysql_collations_flat = $mysql_charsets_available = $mysql_collations_available = array();
$res = PMA_DBI_query('SHOW COLLATION;');
while ($row = PMA_DBI_fetch_assoc($res)) {
if (!is_array($mysql_collations[$row['Charset']])) {
$mysql_collations[$row['Charset']] = array($row['Collation']);
@@ -36,6 +35,8 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
$mysql_collations_available[$row['Collation']] = TRUE;
$mysql_charsets_available[$row['Charset']] = !empty($mysql_charsets_available[$row['Charset']]) || !empty($mysql_collations_available[$row['Collation']]);
}
@PMA_DBI_free_result( $res );
unset( $res, $row );
$mysql_collations_count = count($mysql_collations_flat);
sort($mysql_collations_flat, SORT_STRING);
@@ -44,270 +45,6 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
reset($mysql_collations[$key]);
}
@PMA_DBI_free_result($res);
unset($res, $row);
function PMA_getCollationDescr($collation) {
static $collation_cache;
if (!is_array($collation_cache)) {
$collation_cache = array();
} elseif (isset($collation_cache[$collation])) {
return $collation_cache[$collation];
}
if ($collation == 'binary') {
return $GLOBALS['strBinary'];
}
$parts = explode('_', $collation);
if (count($parts) == 1) {
$parts[1] = 'general';
} elseif ($parts[1] == 'ci' || $parts[1] == 'cs') {
$parts[2] = $parts[1];
$parts[1] = 'general';
}
$descr = '';
switch ($parts[1]) {
case 'bulgarian':
$descr = $GLOBALS['strBulgarian'];
break;
case 'chinese':
if ($parts[0] == 'gb2312' || $parts[0] == 'gbk') {
$descr = $GLOBALS['strSimplifiedChinese'];
} elseif ($parts[0] == 'big5') {
$descr = $GLOBALS['strTraditionalChinese'];
}
break;
case 'ci':
$descr = $GLOBALS['strCaseInsensitive'];
break;
case 'cs':
$descr = $GLOBALS['strCaseSensitive'];
break;
case 'croatian':
$descr = $GLOBALS['strCroatian'];
break;
case 'czech':
$descr = $GLOBALS['strCzech'];
break;
case 'danish':
$descr = $GLOBALS['strDanish'];
break;
case 'english':
$descr = $GLOBALS['strEnglish'];
break;
case 'esperanto':
$descr = $GLOBALS['strEsperanto'];
break;
case 'estonian':
$descr = $GLOBALS['strEstonian'];
break;
case 'german1':
$descr = $GLOBALS['strGerman'] . ' (' . $GLOBALS['strDictionary'] . ')';
break;
case 'german2':
$descr = $GLOBALS['strGerman'] . ' (' . $GLOBALS['strPhoneBook'] . ')';
break;
case 'hungarian':
$descr = $GLOBALS['strHungarian'];
break;
case 'icelandic':
$descr = $GLOBALS['strIcelandic'];
break;
case 'japanese':
$descr = $GLOBALS['strJapanese'];
break;
case 'latvian':
$descr = $GLOBALS['strLatvian'];
break;
case 'lithuanian':
$descr = $GLOBALS['strLithuanian'];
break;
case 'korean':
$descr = $GLOBALS['strKorean'];
break;
case 'persian':
$descr = $GLOBALS['strPersian'];
break;
case 'polish':
$descr = $GLOBALS['strPolish'];
break;
case 'roman':
$descr = $GLOBALS['strWestEuropean'];
break;
case 'romanian':
$descr = $GLOBALS['strRomanian'];
break;
case 'slovak':
$descr = $GLOBALS['strSlovak'];
break;
case 'slovenian':
$descr = $GLOBALS['strSlovenian'];
break;
case 'spanish':
$descr = $GLOBALS['strSpanish'];
break;
case 'spanish2':
$descr = $GLOBALS['strTraditionalSpanish'];
break;
case 'swedish':
$descr = $GLOBALS['strSwedish'];
break;
case 'thai':
$descr = $GLOBALS['strThai'];
break;
case 'turkish':
$descr = $GLOBALS['strTurkish'];
break;
case 'ukrainian':
$descr = $GLOBALS['strUkrainian'];
break;
case 'unicode':
$descr = $GLOBALS['strUnicode'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
case 'bin':
$is_bin = TRUE;
case 'general':
switch ($parts[0]) {
// Unicode charsets
case 'ucs2':
case 'utf8':
$descr = $GLOBALS['strUnicode'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// West European charsets
case 'ascii':
case 'cp850':
case 'dec8':
case 'hp8':
case 'latin1':
case 'macroman':
$descr = $GLOBALS['strWestEuropean'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// Central European charsets
case 'cp1250':
case 'cp852':
case 'latin2':
case 'macce':
$descr = $GLOBALS['strCentralEuropean'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// Russian charsets
case 'cp866':
case 'koi8r':
$descr = $GLOBALS['strRussian'];
break;
// Simplified Chinese charsets
case 'gb2312':
case 'gbk':
$descr = $GLOBALS['strSimplifiedChinese'];
break;
// Japanese charsets
case 'sjis':
case 'ujis':
case 'cp932':
case 'eucjpms':
$descr = $GLOBALS['strJapanese'];
break;
// Baltic charsets
case 'cp1257':
case 'latin7':
$descr = $GLOBALS['strBaltic'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// Other
case 'armscii8':
case 'armscii':
$descr = $GLOBALS['strArmenian'];
break;
case 'big5':
$descr = $GLOBALS['strTraditionalChinese'];
break;
case 'cp1251':
$descr = $GLOBALS['strCyrillic'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
case 'cp1256':
$descr = $GLOBALS['strArabic'];
break;
case 'euckr':
$descr = $GLOBALS['strKorean'];
break;
case 'hebrew':
$descr = $GLOBALS['strHebrew'];
break;
case 'geostd8':
$descr = $GLOBALS['strGeorgian'];
break;
case 'greek':
$descr = $GLOBALS['strGreek'];
break;
case 'keybcs2':
$descr = $GLOBALS['strCzechSlovak'];
break;
case 'koi8u':
$descr = $GLOBALS['strUkrainian'];
break;
case 'latin5':
$descr = $GLOBALS['strTurkish'];
break;
case 'swe7':
$descr = $GLOBALS['strSwedish'];
break;
case 'tis620':
$descr = $GLOBALS['strThai'];
break;
default:
$descr = $GLOBALS['strUnknown'];
break;
}
if (!empty($is_bin)) {
$descr .= ', ' . $GLOBALS['strBinary'];
}
break;
default: $descr = $GLOBALS['strUnknown'];
}
if (!empty($parts[2])) {
if ($parts[2] == 'ci') {
$descr .= ', ' . $GLOBALS['strCaseInsensitive'];
} elseif ($parts[2] == 'cs') {
$descr .= ', ' . $GLOBALS['strCaseSensitive'];
}
}
$collation_cache[$collation] = $descr;
return $descr;
}
/**
* returns collation of given db
*
* @uses PMA_MYSQL_INT_VERSION
* @uses PMA_DBI_fetch_value()
* @uses PMA_DBI_select_db()
* @uses PMA_sqlAddSlashes()
* @uses $GLOBALS['db']
* @param string $db name of db
* @return string collation of $db
*/
function PMA_getDbCollation( $db ) {
if (PMA_MYSQL_INT_VERSION >= 50000 && $db == 'information_schema') {
// We don't have to check the collation of the virtual
// information_schema database: We know it!
return 'utf8_general_ci';
}
if (PMA_MYSQL_INT_VERSION >= 50006) {
// Since MySQL 5.0.6, we don't have to parse SHOW CREATE DATABASE anymore.
return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
} else if (PMA_MYSQL_INT_VERSION >= 40101) {
// MySQL 4.1.0 does not support seperate charset settings
// for databases.
PMA_DBI_select_db( $db );
$return = PMA_DBI_fetch_value( 'SHOW VARIABLES LIKE "collation_database"', 0, 1 );
if ( ! empty( $GLOBALS['db'] ) && $db !== $GLOBALS['db'] ) {
PMA_DBI_select_db( $GLOBALS['db'] );
}
return $return;
}
return '';
}
define('PMA_CSDROPDOWN_COLLATION', 0);
define('PMA_CSDROPDOWN_CHARSET', 1);
@@ -359,15 +96,289 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
}
/**
* returns default server collation from show variables
* returns collation of given db
*
* @uses PMA_MYSQL_INT_VERSION
* @uses PMA_DBI_fetch_value()
* @return string $server_collation
* @uses PMA_DBI_select_db()
* @uses PMA_sqlAddSlashes()
* @uses $GLOBALS['db']
* @param string $db name of db
* @return string collation of $db
*/
function PMA_getServerCollation() {
return PMA_DBI_fetch_value(
'SHOW VARIABLES LIKE \'collation_server\'', 0, 1 );
function PMA_getDbCollation( $db ) {
if ( PMA_MYSQL_INT_VERSION >= 50000 && $db == 'information_schema' ) {
// We don't have to check the collation of the virtual
// information_schema database: We know it!
return 'utf8_general_ci';
}
if ( PMA_MYSQL_INT_VERSION >= 50006 ) {
// Since MySQL 5.0.6, we don't have to parse SHOW CREATE DATABASE anymore.
return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
} elseif ( PMA_MYSQL_INT_VERSION >= 40101 ) {
// MySQL 4.1.0 does not support seperate charset settings
// for databases.
PMA_DBI_select_db( $db );
$return = PMA_DBI_fetch_value( 'SHOW VARIABLES LIKE "collation_database"', 0, 1 );
if ( ! empty( $GLOBALS['db'] ) && $db !== $GLOBALS['db'] ) {
PMA_DBI_select_db( $GLOBALS['db'] );
}
return $return;
}
return '';
}
} else {
function PMA_getDbCollation( $db ) { return PMA_getServerCollation(); }
}
/**
* returns default server collation from show variables
*
* @uses PMA_DBI_fetch_value()
* @return string $server_collation
*/
function PMA_getServerCollation() {
return PMA_DBI_fetch_value(
'SHOW VARIABLES LIKE \'collation_server\'', 0, 1 );
}
/**
* returns description for given collation
*
* @uses is_array()
* @uses explode()
* @uses count()
* @uses $GLOBALS['str[Languages|Sorting]']
*
* @param string $collation MySQL collation string
* @return string collation description
*/
function PMA_getCollationDescr( $collation ) {
static $collation_cache;
if (!is_array($collation_cache)) {
$collation_cache = array();
} elseif (isset($collation_cache[$collation])) {
return $collation_cache[$collation];
}
if ($collation == 'binary') {
return $GLOBALS['strBinary'];
}
$parts = explode('_', $collation);
if (count($parts) == 1) {
$parts[1] = 'general';
} elseif ($parts[1] == 'ci' || $parts[1] == 'cs') {
$parts[2] = $parts[1];
$parts[1] = 'general';
}
$descr = '';
switch ($parts[1]) {
case 'bulgarian':
$descr = $GLOBALS['strBulgarian'];
break;
case 'chinese':
if ($parts[0] == 'gb2312' || $parts[0] == 'gbk') {
$descr = $GLOBALS['strSimplifiedChinese'];
} elseif ($parts[0] == 'big5') {
$descr = $GLOBALS['strTraditionalChinese'];
}
break;
case 'ci':
$descr = $GLOBALS['strCaseInsensitive'];
break;
case 'cs':
$descr = $GLOBALS['strCaseSensitive'];
break;
case 'croatian':
$descr = $GLOBALS['strCroatian'];
break;
case 'czech':
$descr = $GLOBALS['strCzech'];
break;
case 'danish':
$descr = $GLOBALS['strDanish'];
break;
case 'english':
$descr = $GLOBALS['strEnglish'];
break;
case 'esperanto':
$descr = $GLOBALS['strEsperanto'];
break;
case 'estonian':
$descr = $GLOBALS['strEstonian'];
break;
case 'german1':
$descr = $GLOBALS['strGerman'] . ' (' . $GLOBALS['strDictionary'] . ')';
break;
case 'german2':
$descr = $GLOBALS['strGerman'] . ' (' . $GLOBALS['strPhoneBook'] . ')';
break;
case 'hungarian':
$descr = $GLOBALS['strHungarian'];
break;
case 'icelandic':
$descr = $GLOBALS['strIcelandic'];
break;
case 'japanese':
$descr = $GLOBALS['strJapanese'];
break;
case 'latvian':
$descr = $GLOBALS['strLatvian'];
break;
case 'lithuanian':
$descr = $GLOBALS['strLithuanian'];
break;
case 'korean':
$descr = $GLOBALS['strKorean'];
break;
case 'persian':
$descr = $GLOBALS['strPersian'];
break;
case 'polish':
$descr = $GLOBALS['strPolish'];
break;
case 'roman':
$descr = $GLOBALS['strWestEuropean'];
break;
case 'romanian':
$descr = $GLOBALS['strRomanian'];
break;
case 'slovak':
$descr = $GLOBALS['strSlovak'];
break;
case 'slovenian':
$descr = $GLOBALS['strSlovenian'];
break;
case 'spanish':
$descr = $GLOBALS['strSpanish'];
break;
case 'spanish2':
$descr = $GLOBALS['strTraditionalSpanish'];
break;
case 'swedish':
$descr = $GLOBALS['strSwedish'];
break;
case 'thai':
$descr = $GLOBALS['strThai'];
break;
case 'turkish':
$descr = $GLOBALS['strTurkish'];
break;
case 'ukrainian':
$descr = $GLOBALS['strUkrainian'];
break;
case 'unicode':
$descr = $GLOBALS['strUnicode'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
case 'bin':
$is_bin = TRUE;
case 'general':
switch ($parts[0]) {
// Unicode charsets
case 'ucs2':
case 'utf8':
$descr = $GLOBALS['strUnicode'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// West European charsets
case 'ascii':
case 'cp850':
case 'dec8':
case 'hp8':
case 'latin1':
case 'macroman':
$descr = $GLOBALS['strWestEuropean'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// Central European charsets
case 'cp1250':
case 'cp852':
case 'latin2':
case 'macce':
$descr = $GLOBALS['strCentralEuropean'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// Russian charsets
case 'cp866':
case 'koi8r':
$descr = $GLOBALS['strRussian'];
break;
// Simplified Chinese charsets
case 'gb2312':
case 'gbk':
$descr = $GLOBALS['strSimplifiedChinese'];
break;
// Japanese charsets
case 'sjis':
case 'ujis':
case 'cp932':
case 'eucjpms':
$descr = $GLOBALS['strJapanese'];
break;
// Baltic charsets
case 'cp1257':
case 'latin7':
$descr = $GLOBALS['strBaltic'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
// Other
case 'armscii8':
case 'armscii':
$descr = $GLOBALS['strArmenian'];
break;
case 'big5':
$descr = $GLOBALS['strTraditionalChinese'];
break;
case 'cp1251':
$descr = $GLOBALS['strCyrillic'] . ' (' . $GLOBALS['strMultilingual'] . ')';
break;
case 'cp1256':
$descr = $GLOBALS['strArabic'];
break;
case 'euckr':
$descr = $GLOBALS['strKorean'];
break;
case 'hebrew':
$descr = $GLOBALS['strHebrew'];
break;
case 'geostd8':
$descr = $GLOBALS['strGeorgian'];
break;
case 'greek':
$descr = $GLOBALS['strGreek'];
break;
case 'keybcs2':
$descr = $GLOBALS['strCzechSlovak'];
break;
case 'koi8u':
$descr = $GLOBALS['strUkrainian'];
break;
case 'latin5':
$descr = $GLOBALS['strTurkish'];
break;
case 'swe7':
$descr = $GLOBALS['strSwedish'];
break;
case 'tis620':
$descr = $GLOBALS['strThai'];
break;
default:
$descr = $GLOBALS['strUnknown'];
break;
}
if (!empty($is_bin)) {
$descr .= ', ' . $GLOBALS['strBinary'];
}
break;
default: $descr = $GLOBALS['strUnknown'];
}
if (!empty($parts[2])) {
if ($parts[2] == 'ci') {
$descr .= ', ' . $GLOBALS['strCaseInsensitive'];
} elseif ($parts[2] == 'cs') {
$descr .= ', ' . $GLOBALS['strCaseSensitive'];
}
}
$collation_cache[$collation] = $descr;
return $descr;
}
?>

75
server_databases.php
View File

@@ -124,43 +124,44 @@ if ( count($databases) > 0 ) {
usort( $databases, 'PMA_dbCmp' );
// table col order
$column_order = array(
'DEFAULT_COLLATION_NAME' => array(
'disp_name' => $strCollation,
'description_function' => 'PMA_getCollationDescr',
'format' => 'string',
'footer' => PMA_getServerCollation(),
),
'SCHEMA_TABLES' => array(
'disp_name' => $strNumTables,
'format' => 'number',
'footer' => 0,
),
'SCHEMA_TABLE_ROWS' => array(
'disp_name' => $strRows,
'format' => 'number',
'footer' => 0,
),
'SCHEMA_DATA_LENGTH' => array(
'disp_name' => $strData,
'format' => 'byte',
'footer' => 0,
),
'SCHEMA_INDEX_LENGTH' => array(
'disp_name' => $strIndexes,
'format' => 'byte',
'footer' => 0,
),
'SCHEMA_LENGTH' => array(
'disp_name' => $strTotalUC,
'format' => 'byte',
'footer' => 0,
),
'SCHEMA_DATA_FREE' => array(
'disp_name' => $strOverhead,
'format' => 'byte',
'footer' => 0,
),
// there is no db specific collation or charset prior 4.1.0
if ( PMA_MYSQL_INT_VERSION >= 40100 ) {
$column_order['DEFAULT_COLLATION_NAME'] = array(
'disp_name' => $strCollation,
'description_function' => 'PMA_getCollationDescr',
'format' => 'string',
'footer' => PMA_getServerCollation(),
);
}
$column_order['SCHEMA_TABLES'] = array(
'disp_name' => $strNumTables,
'format' => 'number',
'footer' => 0,
);
$column_order['SCHEMA_TABLE_ROWS'] = array(
'disp_name' => $strRows,
'format' => 'number',
'footer' => 0,
);
$column_order['SCHEMA_DATA_LENGTH'] = array(
'disp_name' => $strData,
'format' => 'byte',
'footer' => 0,
);
$column_order['SCHEMA_INDEX_LENGTH'] = array(
'disp_name' => $strIndexes,
'format' => 'byte',
'footer' => 0,
);
$column_order['SCHEMA_LENGTH'] = array(
'disp_name' => $strTotalUC,
'format' => 'byte',
'footer' => 0,
);
$column_order['SCHEMA_DATA_FREE'] = array(
'disp_name' => $strOverhead,
'format' => 'byte',
'footer' => 0,
);
echo '<form action="./server_databases.php" method="post" name="dbStatsForm">' . "\n"