From 5629560c0bba3c6928757e25ad6c39b1903f7473 Mon Sep 17 00:00:00 2001 From: Muhammad Adnan Date: Thu, 22 Mar 2012 15:11:42 -0400 Subject: [PATCH 1/2] Patch #3506552 (Contest-2) Show index information in the data dictionary --- db_datadict.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/db_datadict.php b/db_datadict.php index e57206f960..46f4b80b62 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -22,7 +22,7 @@ if (! isset($selected_tbl)) { $cfgRelation = PMA_getRelationsParam(); require_once 'libraries/transformations.lib.php'; - +require_once 'libraries/Index.class.php'; /** * Check parameters @@ -262,6 +262,12 @@ foreach ($tables as $table) { $count++; ?> +0){ + echo PMA_Index::getView($table, $db,true); + } +?> Date: Thu, 22 Mar 2012 15:12:57 -0400 Subject: [PATCH 2/2] Small code cleanup ChangeLog entry --- ChangeLog | 1 + db_datadict.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 004b884cac..f6c4450ba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog + Patch #3502814 for rfe #3187077 Change password buttons should match + rfe #3488640 Expand table-group in non-light navigation frame if only one + Patch #3509360 Contest-3: Option "Truncate table" before "insert" ++ Patch #3506552 Contest-2: Show index information in the data dictionary 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. diff --git a/db_datadict.php b/db_datadict.php index 46f4b80b62..717315e156 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -264,8 +264,8 @@ foreach ($tables as $table) { 0){ - echo PMA_Index::getView($table, $db,true); + if (count(PMA_Index::getFromTable($table, $db)) > 0){ + echo PMA_Index::getView($table, $db, true); } ?>