From d09f05b01bb916ecb138df2a24d7e73b74cd247f Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 1 Jun 2011 17:05:09 +0200
Subject: [PATCH] Display column collation in tooltip (thanks to bene)

---
 adminer/table.inc.php | 2 +-
 changes.txt           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index 516b0bf1..021e3472 100644
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -18,7 +18,7 @@ if ($fields) {
 	echo "<thead><tr><th>" . lang('Column') . "<td>" . lang('Type') . (support("comment") ? "<td>" . lang('Comment') : "") . "</thead>\n";
 	foreach ($fields as $field) {
 		echo "<tr" . odd() . "><th title='" . h($field["default"] !== "" ? $field["default"] : " ") . "'>" . h($field["field"]);
-		echo "<td>" . h($field["full_type"]) . ($field["null"] ? " <i>NULL</i>" : "") . ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
+		echo "<td title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . ($field["null"] ? " <i>NULL</i>" : "") . ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
 		echo (support("comment") ? "<td>" . nbsp($field["comment"]) : "");
 		echo "\n";
 	}
diff --git a/changes.txt b/changes.txt
index 53a020c3..ba71092f 100644
--- a/changes.txt
+++ b/changes.txt
@@ -5,6 +5,7 @@ Append new index with auto index selection (bug #3282127)
 Bit type default value
 Display foreign key name in tooltip
 Display default column value in tooltip
+Display column collation in tooltip
 Pagination support (Oracle)
 Autocomplete for big foreign keys (Editor)
 Display name of the referenced record in PostgreSQL (Editor)