Move engines() to Driver

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 051c7df3235681e815d9e6cd9ace294fb865154e..9215d6f3e94085774c1d6a91f38525c5b6c920cd 100644 (file)
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -168,7 +168,7 @@ if (!$_POST) {
 }
 
 $collations = collations();
-$engines = engines();
+$engines = $driver->engines();
 // case of engine may differ
 foreach ($engines as $engine) {
        if (!strcasecmp($engine, $row["Engine"])) {

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 6b573f0495e95401c4f962853ffdb53427e587a5..d21451ec2787065e7470221cc000f21cc888d96a 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -309,10 +309,6 @@ if (isset($_GET["mssql"])) {
                return get_val("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
        }
 
-       function engines() {
-               return array();
-       }
-
        function logged_user() {
                return get_val("SELECT SUSER_NAME()");
        }

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 924b6f9850bf805d1b0f515d64034de6d88966e2..23cff3bf85cc63beb11cc8777d183b7163387fac 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -410,6 +410,16 @@ if (!defined('Adminer\DRIVER')) {
                        }
                        return $c_style;
                }
+
+               function engines() {
+                       $return = array();
+                       foreach (get_rows("SHOW ENGINES") as $row) {
+                               if (preg_match("~YES|DEFAULT~", $row["Support"])) {
+                                       $return[] = $row["Engine"];
+                               }
+                       }
+                       return $return;
+               }
        }
 
 
@@ -508,19 +518,6 @@ if (!defined('Adminer\DRIVER')) {
                return $return;
        }
 
-       /** Get supported engines
-       * @return array
-       */
-       function engines() {
-               $return = array();
-               foreach (get_rows("SHOW ENGINES") as $row) {
-                       if (preg_match("~YES|DEFAULT~", $row["Support"])) {
-                               $return[] = $row["Engine"];
-                       }
-               }
-               return $return;
-       }
-
        /** Get logged user
        * @return string
        */

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index e0bbcc0fd784fa7806cbe21d7a82c6cdd8b59eef..b22c26009b8f3594d1e5653b7115cc8a97761347 100644 (file)
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -247,10 +247,6 @@ ORDER BY 1"
                return get_val("SELECT value FROM nls_database_parameters WHERE parameter = 'NLS_CHARACTERSET'"); //! respect $db
        }
 
-       function engines() {
-               return array();
-       }
-
        function logged_user() {
                return get_val("SELECT USER FROM DUAL");
        }

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 1c8a19875fc121c49c264628de38b814a779b1b1..65ae2b1a8ead2ac8075fc2059a9aeb1795b65d89 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -366,10 +366,6 @@ ORDER BY datname");
                return get_val("SELECT datcollate FROM pg_database WHERE datname = " . q($db));
        }
 
-       function engines() {
-               return array();
-       }
-
        function logged_user() {
                return get_val("SELECT user");
        }

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 4b5639a9d69f75c5920ec24bf591795038ec96ea..c0edd03766e02b5c1ee9739b1430574838d388b8 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -219,10 +219,6 @@ if (isset($_GET["sqlite"])) {
                return get_val("PRAGMA encoding"); // there is no database list so $db == DB
        }
 
-       function engines() {
-               return array();
-       }
-
        function logged_user() {
                return get_current_user(); // should return effective user
        }

diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index 75b462abd09ee01cac177aec4cefd93498070efe..f4a5b17a6dd2ae21f885f7e910e7d8c9b34d10f0 100644 (file)
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -253,6 +253,13 @@ abstract class SqlDriver {
                return false;
        }
 
+       /** Get supported engines
+       * @return array
+       */
+       function engines() {
+               return array();
+       }
+
        /** Check whether table supports indexes
        * @param array result of table_status()
        * @return bool

diff --git a/plugins/drivers/elastic.php b/plugins/drivers/elastic.php
index 92753eb01856c351886c3a1690e8bee39ffc8b36..348ab8d269c70001fe5216796a83a1a7d364c3a5 100644 (file)
--- a/plugins/drivers/elastic.php
+++ b/plugins/drivers/elastic.php
@@ -348,10 +348,6 @@ if (isset($_GET["elastic"])) {
                //
        }
 
-       function engines() {
-               return array();
-       }
-
        function count_tables($databases) {
                $return = connection()->rootQuery('_aliases');
                return array("elastic" => ($return ? count($return) : 0));

diff --git a/plugins/drivers/firebird.php b/plugins/drivers/firebird.php
index 1d319f3975941005ccd261c6a27a7b4c9d7f93df..969347762279c822b0aba807ec0104970d63fe6c 100644 (file)
--- a/plugins/drivers/firebird.php
+++ b/plugins/drivers/firebird.php
@@ -159,10 +159,6 @@ if (isset($_GET["firebird"])) {
        function db_collation($db, $collations) {
        }
 
-       function engines() {
-               return array();
-       }
-
        function logged_user() {
                $adminer = adminer();
                $credentials = $adminer->credentials();

diff --git a/plugins/drivers/imap.php b/plugins/drivers/imap.php
index 8e8cd5ba3eb361a797e16546e9e5c4c1946c9ec1..e467e6917e118d2f52a7e8695ee78ef45fae0487 100644 (file)
--- a/plugins/drivers/imap.php
+++ b/plugins/drivers/imap.php
@@ -252,10 +252,6 @@ if (isset($_GET["imap"])) {
        function fk_support($table_status) {
        }
 
-       function engines() {
-               return array();
-       }
-
        function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
                return connection()->create($name);
        }

diff --git a/plugins/drivers/mongo.php b/plugins/drivers/mongo.php
index 6af8fb075698661acba23f137e225eaffa3d6ab8..ac29c2263e559fe61ec3219aa8c5d2233298712b 100644 (file)
--- a/plugins/drivers/mongo.php
+++ b/plugins/drivers/mongo.php
@@ -500,10 +500,6 @@ if (isset($_GET["mongo"])) {
        function fk_support($table_status) {
        }
 
-       function engines() {
-               return array();
-       }
-
        function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
                if ($table == "") {
                        connection()->_db->createCollection($name);

diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php
index f2493fff3b32186a4ddd3d6f4cd493f49a0085aa..e7fec2b361589097946f5edddf19019ce650c813 100644 (file)
--- a/plugins/drivers/simpledb.php
+++ b/plugins/drivers/simpledb.php
@@ -368,10 +368,6 @@ if (isset($_GET["simpledb"])) {
        function fk_support($table_status) {
        }
 
-       function engines() {
-               return array();
-       }
-
        function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
                return ($table == "" && sdb_request('CreateDomain', array('DomainName' => $name)));
        }