beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Support for virtual foreign keys

Browse source
This commit is contained in:
Jakub Vrana 2010-10-29 13:58:08 +02:00
parent 43f936a0d8
commit 753909ecea
5 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adminer/include/adminer.inc.php
View file

@ -108,6 +108,14 @@ document.getElementById('username').focus();
echo "\n"; echo "\n";
} }
/** Get foreign keys for table
* @param string
* @return array same format as foreign_keys()
*/
function foreignKeys($table) {
return foreign_keys($table);
}
/** Find backward keys for table /** Find backward keys for table
* @param string * @param string
* @param string * @param string

3
adminer/include/functions.inc.php
View file

@ -550,8 +550,9 @@ function hidden_fields_get() {
* @return array array($col => array()) * @return array array($col => array())
*/ */
function column_foreign_keys($table) { function column_foreign_keys($table) {
global $adminer;
$return = array(); $return = array();
foreach (foreign_keys($table) as $foreign_key) { foreach ($adminer->foreignKeys($table) as $foreign_key) {
foreach ($foreign_key["source"] as $val) { foreach ($foreign_key["source"] as $val) {
$return[$val][] = $foreign_key; $return[$val][] = $foreign_key;
} }

30
adminer/schema.inc.php
View file

@ -27,23 +27,21 @@ foreach (table_status() as $row) {
$schema[$row["Name"]]["fields"][$name] = $field; $schema[$row["Name"]]["fields"][$name] = $field;
} }
$schema[$row["Name"]]["pos"] = ($table_pos[$row["Name"]] ? $table_pos[$row["Name"]] : array($top, 0)); $schema[$row["Name"]]["pos"] = ($table_pos[$row["Name"]] ? $table_pos[$row["Name"]] : array($top, 0));
if (fk_support($row)) { foreach ($adminer->foreignKeys($row["Name"]) as $val) {
foreach (foreign_keys($row["Name"]) as $val) { if (!$val["db"]) {
if (!$val["db"]) { $left = $base_left;
$left = $base_left; if ($table_pos[$row["Name"]][1] || $table_pos[$val["table"]][1]) {
if ($table_pos[$row["Name"]][1] || $table_pos[$val["table"]][1]) { $left = min(floatval($table_pos[$row["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1;
$left = min(floatval($table_pos[$row["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1; } else {
} else { $base_left -= .1;
$base_left -= .1;
}
while ($lefts[(string) $left]) {
// find free $left
$left -= .0001;
}
$schema[$row["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
$referenced[$val["table"]][$row["Name"]][(string) $left] = $val["target"];
$lefts[(string) $left] = true;
} }
while ($lefts[(string) $left]) {
// find free $left
$left -= .0001;
}
$schema[$row["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
$referenced[$val["table"]][$row["Name"]][(string) $left] = $val["target"];
$lefts[(string) $left] = true;
} }
} }
$top = max($top, $schema[$row["Name"]]["pos"][0] + 2.5 + $pos); $top = max($top, $schema[$row["Name"]]["pos"][0] + 2.5 + $pos);

1
changes.txt
View file

@ -4,6 +4,7 @@ Highlight and edit SQL command in processlist
Disable XSS "protection" of IE8 Disable XSS "protection" of IE8
Timestamp in export Timestamp in export
Link to bookmark SQL command Link to bookmark SQL command
Support for virtual foreign keys
Immunity against zend.ze1_compatibility_mode Immunity against zend.ze1_compatibility_mode
Fix last page with empty result set Fix last page with empty result set

4
editor/include/adminer.inc.php
View file

@ -65,6 +65,10 @@ document.getElementById('username').focus();
echo "<a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Page') . ": " . lang('last') . "'>&gt;&gt;</a>\n"; echo "<a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Page') . ": " . lang('last') . "'>&gt;&gt;</a>\n";
} }
function foreignKeys($table) {
return foreign_keys($table);
}
function backwardKeys($table, $tableName) { function backwardKeys($table, $tableName) {
$return = array(); $return = array();
foreach (get_rows("SELECT TABLE_NAME, CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_COLUMN_NAME foreach (get_rows("SELECT TABLE_NAME, CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_COLUMN_NAME