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

Abstract schemas()

Browse source
This commit is contained in:
Jakub Vrana 2013-10-24 22:16:24 -07:00
parent 8d9ef7afd2
commit f503d8130b
5 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/db.inc.php
View file

@ -125,7 +125,7 @@ if ($adminer->homepage()) {
: "")))
. (support("table") ? "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm() . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . "> " : "")
. "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . on_help("'DROP TABLE'") . ">\n";
$databases = (support("scheme") ? schemas() : $adminer->databases());
$databases = (support("scheme") ? $adminer->schemas() : $adminer->databases());
if (count($databases) != 1 && $jush != "sqlite") {
$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
echo "<p>" . lang('Move to other database') . ": ";

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

@ -43,6 +43,13 @@ class Adminer {
return get_databases($flush);
}
/** Get list of schemas
* @return array
*/
function schemas() {
return schemas();
}
/** Specify limit for waiting on some slow queries like DB list
* @return float number of seconds
*/
@ -806,7 +813,7 @@ username.form['auth[driver]'].onchange();
* @return null
*/
function databasesPrint($missing) {
global $connection;
global $adminer, $connection;
$databases = $this->databases();
?>
<form action="">
@ -821,7 +828,7 @@ username.form['auth[driver]'].onchange();
echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
if (support("scheme")) {
echo "<br><select name='ns'$db_events>" . optionlist(array("" => "(" . lang('schema') . ")") + schemas(), $_GET["ns"]) . "</select>";
echo "<br><select name='ns'$db_events>" . optionlist(array("" => "(" . lang('schema') . ")") + $adminer->schemas(), $_GET["ns"]) . "</select>";
if ($_GET["ns"] != "") {
set_schema($_GET["ns"]);
}

1
changes.txt
View file

@ -21,6 +21,7 @@ SQLite: Allow editing primary key
SQLite: Allow editing foreign keys
PostgreSQL: Fix handling of nextval() default values
PostgreSQL: Support creating array columns
Customization: Provide schemas()
Thai translation
Adminer 3.7.1 (released 2013-06-29):

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

@ -28,6 +28,10 @@ class Adminer {
}
}
function schemas() {
return schemas();
}
function databases($flush = true) {
return get_databases($flush);
}

5
plugins/plugin.php
View file

@ -107,6 +107,11 @@ class AdminerPlugin extends Adminer {
return $this->_applyPlugin(__FUNCTION__, $args);
}
function schemas() {
$args = func_get_args();
return $this->_applyPlugin(__FUNCTION__, $args);
}
function databases() {
$args = func_get_args();
return $this->_applyPlugin(__FUNCTION__, $args);