mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-16 19:44:00 +02:00
Code Issues Releases Wiki Activity

Display collation at table structure if different from table

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-19 22:42:02 +01:00
parent 889ffe28c7
commit f2a5d5127a
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adminer/include/adminer.inc.php
View File

@@ -318,9 +318,10 @@ class Adminer {
/** Print table structure in tabular format
* @param array data about individual fields
* @param array
* @return null
*/
function tableStructurePrint($fields) {
function tableStructurePrint($fields, $tableStatus = null) {
global $driver;
echo "<div class='scrollable'>\n";
echo "<table class='nowrap odds'>\n";
@@ -329,8 +330,11 @@ class Adminer {
foreach ($fields as $field) {
echo "<tr><th>" . h($field["field"]);
$type = h($field["full_type"]);
echo "<td><span title='" . h($field["collation"]) . "'>"
. (in_array($type, (array) $structured_types[lang('User types')]) ? "<a href='" . h(ME . 'type=' . urlencode($type)) . "'>$type</a>" : $type)
$collation = h($field["collation"]);
echo "<td><span title='$collation'>"
. (in_array($type, (array) $structured_types[lang('User types')])
? "<a href='" . h(ME . 'type=' . urlencode($type)) . "'>$type</a>"
: $type . ($collation && isset($tableStatus["Collation"]) && $collation != $tableStatus["Collation"] ? " $collation" : ""))
. "</span>"
;
echo ($field["null"] ? " <i>NULL</i>" : "");

2
adminer/include/plugins.inc.php
View File

@@ -258,7 +258,7 @@ class Plugins extends Adminer {
return $this->applyPlugin(__FUNCTION__, $args);
}
function tableStructurePrint($fields) {
function tableStructurePrint($fields, $tableStatus = null) {
$args = func_get_args();
return $this->applyPlugin(__FUNCTION__, $args);
}