From a01944e7e018983fc31c42280576b61554ea8cb6 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Tue, 10 Jul 2007 20:51:14 +0000
Subject: [PATCH] Primary key links

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@107 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 abstraction.inc.php |  1 +
 functions.inc.php   | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/abstraction.inc.php b/abstraction.inc.php
index 771f3875..517c6528 100644
--- a/abstraction.inc.php
+++ b/abstraction.inc.php
@@ -98,6 +98,7 @@ if (extension_loaded("mysqli")) {
 			$row->orgtable = $row->table;
 			$row->orgname = $row->name;
 			$row->charsetnr = ($row->blob ? 63 : 0);
+			$row->flags = ($row->primary_key ? 2 : 0);
 			return $row;
 		}
 		
diff --git a/functions.inc.php b/functions.inc.php
index 56bd91ed..05b70e9b 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -58,11 +58,13 @@ function indexes($table) {
 	global $mysql;
 	$return = array();
 	$result = $mysql->query("SHOW INDEX FROM " . idf_escape($table));
-	while ($row = $result->fetch_assoc()) {
-		$return[$row["Key_name"]]["type"] = ($row["Key_name"] == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? "INDEX" : "UNIQUE")));
-		$return[$row["Key_name"]]["columns"][$row["Seq_in_index"]] = $row["Column_name"];
+	if ($result) {
+		while ($row = $result->fetch_assoc()) {
+			$return[$row["Key_name"]]["type"] = ($row["Key_name"] == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? "INDEX" : "UNIQUE")));
+			$return[$row["Key_name"]]["columns"][$row["Seq_in_index"]] = $row["Column_name"];
+		}
+		$result->free();
 	}
-	$result->free();
 	return $return;
 }
 
@@ -186,6 +188,7 @@ function get_file($key) {
 }
 
 function select($result) {
+	global $SELF;
 	if (!$result->num_rows) {
 		echo "<p class='message'>" . lang('No rows.') . "</p>\n";
 	} else {
@@ -199,8 +202,7 @@ function select($result) {
 				$blobs = array();
 				for ($j=0; $j < count($row); $j++) {
 					$field = $result->fetch_field();
-					if (strlen($field->orgtable) && $field->primary_key) {
-						$links[$j] = $field->orgtable;
+					if (strlen($field->orgtable) && $field->flags & 2) {
 						if (!isset($indexes[$field->orgtable])) {
 							$indexes[$field->orgtable] = array();
 							foreach (indexes($field->orgtable) as $index) {
@@ -211,9 +213,11 @@ function select($result) {
 							}
 							$columns[$field->orgtable] = $indexes[$field->orgtable];
 						}
-						unset($columns[$field->orgtable][$field->orgname]);
-						$indexes[$field->orgtable][$field->orgname] = $j;
-						$links[$j] = $field->orgtable;
+						if (isset($columns[$field->orgtable][$field->orgname])) {
+							unset($columns[$field->orgtable][$field->orgname]);
+							$indexes[$field->orgtable][$field->orgname] = $j;
+							$links[$j] = $field->orgtable;
+						}
 					}
 					if ($field->charsetnr == 63) {
 						$blobs[$j] = true;