Pass $result to last_id

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 88528e9a95814a407990caff7f843c5e963a261c..6b573f0495e95401c4f962853ffdb53427e587a5 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -547,7 +547,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
                ;
        }
 
-       function last_id() {
+       function last_id($result) {
                return get_val("SELECT SCOPE_IDENTITY()"); // @@IDENTITY can return trigger INSERT
        }
 

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 8466716b8fbd5deb48f092fb95a6dd20d8b7dc82..924b6f9850bf805d1b0f515d64034de6d88966e2 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -1056,9 +1056,10 @@ if (!defined('Adminer\DRIVER')) {
        }
 
        /** Get last auto increment ID
+       * @param Result or true
        * @return string
        */
-       function last_id() {
+       function last_id($result) {
                return get_val("SELECT LAST_INSERT_ID()"); // mysql_insert_id() truncates bigint
        }
 

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index d5e449c9fc0b739adc0870abfcf3163fd1079f5f..e0bbcc0fd784fa7806cbe21d7a82c6cdd8b59eef 100644 (file)
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -495,7 +495,7 @@ AND c_src.TABLE_NAME = " . q($table);
                return apply_queries("DROP TABLE", $tables);
        }
 
-       function last_id() {
+       function last_id($result) {
                return 0; //!
        }
 

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 8646a0d5519e2f726f401e7077d0379abd645d81..e8684cc88f5ce675582f2577e02d077601ab1163 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -780,7 +780,7 @@ ORDER BY SPECIFIC_NAME');
                return idf_escape($name) . "(" . implode(", ", $return) . ")";
        }
 
-       function last_id() {
+       function last_id($result) {
                return 0; // there can be several sequences
        }
 

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 804a85c4fa8870f7042166d7303eeb8f3e9db8fb..4b5639a9d69f75c5920ec24bf591795038ec96ea 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -680,7 +680,7 @@ if (isset($_GET["sqlite"])) {
                return queries("BEGIN");
        }
 
-       function last_id() {
+       function last_id($result) {
                return get_val("SELECT LAST_INSERT_ROWID()");
        }
 

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 07381151232b3e537fc3f9c60abcca9ca50d5b52..c3fdb33ecd5b23fa39764e8a4ad6f8507f1239a1 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -55,7 +55,7 @@ if ($_POST && !$error && !isset($_GET["select"])) {
                        }
                } else {
                        $result = $driver->insert($TABLE, $set);
-                       $last_id = ($result ? last_id() : 0);
+                       $last_id = ($result ? last_id($result) : 0);
                        queries_redirect($location, lang('Item%s has been inserted.', ($last_id ? " $last_id" : "")), $result); //! link
                }
        }

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index eebf3e5b347e63a060f6b9f1d232dad54a2ce1c8..7dcf7a87c153069abde7739d582f16390dc134df 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -150,7 +150,7 @@ if ($_POST && !$error) {
                        }
                        $message = lang('%d item(s) have been affected.', $affected);
                        if ($_POST["clone"] && $result && $affected == 1) {
-                               $last_id = last_id();
+                               $last_id = last_id($result);
                                if ($last_id) {
                                        $message = lang('Item%s has been inserted.', " $last_id");
                                }

diff --git a/plugins/drivers/clickhouse.php b/plugins/drivers/clickhouse.php
index c0476e28e36c6846da92b363b637d98dea767ad8..c37335a295e8df143365bc59dfa663e1d58a489b 100644 (file)
--- a/plugins/drivers/clickhouse.php
+++ b/plugins/drivers/clickhouse.php
@@ -383,7 +383,7 @@ if (isset($_GET["clickhouse"])) {
                return '';
        }
 
-       function last_id() {
+       function last_id($result) {
                return 0; // ClickHouse doesn't have it
        }
 

diff --git a/plugins/drivers/elastic.php b/plugins/drivers/elastic.php
index 01922effea289a7ccc5a67002667af95de029cc4..92753eb01856c351886c3a1690e8bee39ffc8b36 100644 (file)
--- a/plugins/drivers/elastic.php
+++ b/plugins/drivers/elastic.php
@@ -570,7 +570,7 @@ if (isset($_GET["elastic"])) {
                return $return;
        }
 
-       function last_id() {
+       function last_id($result) {
                return connection()->last_id;
        }
 }

diff --git a/plugins/drivers/mongo.php b/plugins/drivers/mongo.php
index f4a497bbfba335b244c436e96cb7516ff3d12051..6af8fb075698661acba23f137e225eaffa3d6ab8 100644 (file)
--- a/plugins/drivers/mongo.php
+++ b/plugins/drivers/mongo.php
@@ -403,7 +403,7 @@ if (isset($_GET["mongo"])) {
                return true;
        }
 
-       function last_id() {
+       function last_id($result) {
                return connection()->last_id;
        }
 

diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php
index 488a10d2f1a962fca96a431d08cbce7d50e2175a..f2493fff3b32186a4ddd3d6f4cd493f49a0085aa 100644 (file)
--- a/plugins/drivers/simpledb.php
+++ b/plugins/drivers/simpledb.php
@@ -395,7 +395,7 @@ if (isset($_GET["simpledb"])) {
                return ($where ? null : $table_status["Rows"]);
        }
 
-       function last_id() {
+       function last_id($result) {
        }
 
        function sdb_request($action, $params = array()) {