From 45f24a8f62d8a9272a9d4fbaeea9cddf290c6109 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Wed, 26 Feb 2025 16:31:20 +0100 Subject: [PATCH] Delete unused functions --- adminer/drivers/mssql.inc.php | 8 -------- adminer/drivers/mysql.inc.php | 6 ++---- adminer/drivers/pgsql.inc.php | 3 --- adminer/drivers/sqlite.inc.php | 12 ------------ compile.php | 5 ++--- plugins/drivers/clickhouse.php | 12 ------------ plugins/drivers/elastic.php | 16 ---------------- plugins/drivers/firebird.php | 12 ------------ plugins/drivers/simpledb.php | 3 --- 9 files changed, 4 insertions(+), 73 deletions(-) diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index e01fe3bb..bd176102 100644 --- a/adminer/drivers/mssql.inc.php +++ b/adminer/drivers/mssql.inc.php @@ -611,14 +611,6 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table) return $return; } - function show_variables() { - return array(); - } - - function show_status() { - return array(); - } - function convert_field($field) { } diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index 25384825..47ba442f 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -999,23 +999,21 @@ if (!defined("DRIVER")) { return ($where || $table_status["Engine"] != "InnoDB" ? null : $table_status["Rows"]); } + /* Not used is MySQL but checked in compile.php: /** Get user defined types * @return array - */ function types() { return array(); } /** Get existing schemas * @return array - */ function schemas() { return array(); } /** Get current schema * @return string - */ function get_schema() { return ""; } @@ -1024,10 +1022,10 @@ if (!defined("DRIVER")) { * @param string * @param Min_DB * @return bool - */ function set_schema($schema, $connection2 = null) { return true; } + */ /** Get SQL command to create table * @param string diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 001f241e..069d3f85 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -882,9 +882,6 @@ AND typelem = 0" return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid")); } - function show_status() { - } - function convert_field($field) { } diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php index ec97e4f0..efe267b8 100644 --- a/adminer/drivers/sqlite.inc.php +++ b/adminer/drivers/sqlite.inc.php @@ -656,18 +656,6 @@ if (isset($_GET["sqlite"])) { return array(); } - function schemas() { - return array(); - } - - function get_schema() { - return ""; - } - - function set_schema($scheme) { - return true; - } - function create_sql($table, $auto_increment, $style) { global $connection; $return = $connection->result("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table)); diff --git a/compile.php b/compile.php index ca9a8f54..bd897ea0 100755 --- a/compile.php +++ b/compile.php @@ -70,13 +70,12 @@ header("Cache-Control: immutable"); "copy" => array("copy_tables"), "database" => array("create_database", "rename_database", "drop_databases"), "dump" => array("use_sql", "create_sql", "truncate_sql", "trigger_sql"), - "indexes" => array("indexes"), "kill" => array("kill_process", "connection_id", "max_connections"), "processlist" => array("process_list"), - "routine" => array("routines", "routine", "routine_languages", "create_routine", "routine_id"), + "routine" => array("routines", "routine", "routine_languages", "routine_id"), "scheme" => array("schemas", "get_schema", "set_schema"), "status" => array("show_status"), - "table" => array("search_tables", "is_view"), + "table" => array("is_view"), "trigger" => array("triggers", "trigger", "trigger_options", "trigger_sql"), "type" => array("types"), "variables" => array("show_variables"), diff --git a/plugins/drivers/clickhouse.php b/plugins/drivers/clickhouse.php index 5b2d615c..aa9d178c 100644 --- a/plugins/drivers/clickhouse.php +++ b/plugins/drivers/clickhouse.php @@ -354,18 +354,6 @@ if (isset($_GET["clickhouse"])) { return array(); } - function schemas() { - return array(); - } - - function get_schema() { - return ""; - } - - function set_schema($schema) { - return true; - } - function auto_increment() { return ''; } diff --git a/plugins/drivers/elastic.php b/plugins/drivers/elastic.php index f6d7892f..b889fa29 100644 --- a/plugins/drivers/elastic.php +++ b/plugins/drivers/elastic.php @@ -503,22 +503,6 @@ if (isset($_GET["elastic"])) { return null; } - /** Create index - * @param string - * @return mixed - */ - function create_database($db) { - return connection()->rootQuery(urlencode($db), null, 'PUT'); - } - - /** Remove index - * @param array - * @return mixed - */ - function drop_databases($databases) { - return connection()->rootQuery(urlencode(implode(',', $databases)), null, 'DELETE'); - } - /** Alter type * @param array * @return mixed diff --git a/plugins/drivers/firebird.php b/plugins/drivers/firebird.php index 34f92d2f..31e93fb9 100644 --- a/plugins/drivers/firebird.php +++ b/plugins/drivers/firebird.php @@ -295,18 +295,6 @@ ORDER BY RDB$INDEX_SEGMENTS.RDB$FIELD_POSITION'; return array(); } - function schemas() { - return array(); - } - - function get_schema() { - return ""; - } - - function set_schema($schema) { - return true; - } - function support($feature) { return preg_match("~^(columns|sql|status|table)$~", $feature); } diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php index ae394132..cfbfc7de 100644 --- a/plugins/drivers/simpledb.php +++ b/plugins/drivers/simpledb.php @@ -327,9 +327,6 @@ if (isset($_GET["simpledb"])) { function information_schema() { } - function is_view($table_status) { - } - function indexes($table, $connection2 = null) { return array( array("type" => "PRIMARY", "columns" => array("itemName()")), -- 2.39.5