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

MySQL: Speed up displaying tables in large databases (bug #700)

Browse source
This commit is contained in:
Jakub Vrana 2019-08-19 18:14:16 +02:00
parent ab76024da7
commit 67b84d1167
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
adminer/drivers/mysql.inc.php
View file

@ -583,18 +583,24 @@ if (!defined("DRIVER")) {
* @return array array($name => array("db" => , "ns" => , "table" => , "source" => array(), "target" => array(), "on_delete" => , "on_update" => )) * @return array array($name => array("db" => , "ns" => , "table" => , "source" => array(), "target" => array(), "on_delete" => , "on_update" => ))
*/ */
function foreign_keys($table) { function foreign_keys($table) {
global $connection, $on_actions;
static $pattern = '(?:`(?:[^`]|``)+`|(?:"(?:[^"]|"")+"))';
$return = array(); $return = array();
foreach (get_rows("SELECT * FROM information_schema.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table)) as $row) { $create_table = $connection->result("SHOW CREATE TABLE " . table($table), 1);
$columns = get_key_vals("SELECT COLUMN_NAME, REFERENCED_COLUMN_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE CONSTRAINT_SCHEMA = DATABASE() AND CONSTRAINT_NAME = " . q($row["CONSTRAINT_NAME"]) . " ORDER BY ORDINAL_POSITION"); if ($create_table) {
$db = $row["UNIQUE_CONSTRAINT_SCHEMA"]; preg_match_all("~CONSTRAINT ($pattern) FOREIGN KEY ?\\(((?:$pattern,? ?)+)\\) REFERENCES ($pattern)(?:\\.($pattern))? \\(((?:$pattern,? ?)+)\\)(?: ON DELETE ($on_actions))?(?: ON UPDATE ($on_actions))?~", $create_table, $matches, PREG_SET_ORDER);
$return[$row["CONSTRAINT_NAME"]] = array( foreach ($matches as $match) {
"db" => ($db == DB ? "" : $db), preg_match_all("~$pattern~", $match[2], $source);
"table" => $row["REFERENCED_TABLE_NAME"], preg_match_all("~$pattern~", $match[5], $target);
"source" => array_keys($columns), $return[idf_unescape($match[1])] = array(
"target" => array_values($columns), "db" => idf_unescape($match[4] != "" ? $match[3] : $match[4]),
"on_delete" => $row["DELETE_RULE"], "table" => idf_unescape($match[4] != "" ? $match[4] : $match[3]),
"on_update" => $row["UPDATE_RULE"], "source" => array_map('idf_unescape', $source[0]),
); "target" => array_map('idf_unescape', $target[0]),
"on_delete" => ($match[6] ? $match[6] : "RESTRICT"),
"on_update" => ($match[7] ? $match[7] : "RESTRICT"),
);
}
} }
return $return; return $return;
} }

3
changes.txt
View file

@ -1,4 +1,5 @@
Adminer 4.7.3-dev: Adminer 4.7.3-dev:
MySQL: Speed up displaying tables in large databases (bug #700)
MySQL: Skip editing generated columns MySQL: Skip editing generated columns
SQLite: Quote strings stored in integer columns in export (bug #696) SQLite: Quote strings stored in integer columns in export (bug #696)
@ -8,7 +9,7 @@ Stretch footer over the whole table width (bug #624)
Allow overwriting tables when copying them Allow overwriting tables when copying them
Fix displaying SQL command after Save and continue edit Fix displaying SQL command after Save and continue edit
Cache busting for adminer.css Cache busting for adminer.css
MySQL: Fix displaying multi-columns foreign keys (bug #675) MySQL: Fix displaying multi-columns foreign keys (bug #675, regression from 4.7.0)
MySQL: Fix creating users and changing password in MySQL 8 (bug #663) MySQL: Fix creating users and changing password in MySQL 8 (bug #663)
MySQL: Pass SRID to GeomFromText MySQL: Pass SRID to GeomFromText
PostgreSQL: Fix setting column comments on new table PostgreSQL: Fix setting column comments on new table