Abstract UPDATE

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 4bcb240a6cd2a768b8735673214bfab167035ad0..245a7e98f9e2a35c8a3347e4add778e7f60c1275 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -41,11 +41,10 @@ if ($_POST && !$error && !isset($_GET["select"])) {
                        if (!$set) {
                                redirect($location);
                        }
-                       $query = table($TABLE) . " SET" . implode(",", $set);
-                       query_redirect(
-                               "UPDATE" . ($unique_array ? " $query$query_where" : limit1($query, $query_where)),
+                       queries_redirect(
                                $location,
-                               lang('Item has been updated.')
+                               lang('Item has been updated.'),
+                               $driver->update($TABLE, $set, $query_where, !$unique_array)
                        );
                        if (is_ajax()) {
                                page_headers();

diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index 5321a06676ea9c3d3581d9d8e904cb488b1a73b2..bec94e575e616cf8ae76d480aec7ea135a62fe72 100644 (file)
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -21,6 +21,18 @@
                return queries("DELETE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
        }
        
+       /** Update data in table
+       * @param string
+       * @param array
+       * @param string " WHERE ..."
+       * @param int 0 or 1
+       * @return bool
+       */
+       function update($table, $set, $queryWhere, $limit = 0) {
+               $query = table($table) . " SET" . implode(",", $set);
+               return queries("UPDATE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
+       }
+       
        /** Insert data into table
        * @param string
        * @param array

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 84ea1e32797aa268e763d32564b97515071fabdc..a5d287c3dc2ec98992a969e0a399a4b49876e8f0 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -86,7 +86,6 @@ if ($_POST && !$error) {
                if ($_POST["save"] || $_POST["delete"]) { // edit
                        $result = true;
                        $affected = 0;
-                       $query = table($TABLE);
                        $set = array();
                        if (!$_POST["delete"]) {
                                foreach ($columns as $name => $val) { //! should check also for edit or insert privileges
@@ -95,22 +94,22 @@ if ($_POST && !$error) {
                                                if ($_POST["clone"]) {
                                                        $set[idf_escape($name)] = ($val !== false ? $val : idf_escape($name));
                                                } elseif ($val !== false) {
-                                                       $set[] = idf_escape($name) . " = $val";
+                                                       $set[] = "\n" . idf_escape($name) . " = $val";
                                                }
                                        }
                                }
-                               $query .= ($_POST["clone"] ? " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE) : " SET\n" . implode(",\n", $set));
                        }
                        if ($_POST["delete"] || $set) {
-                               $command = "UPDATE";
                                if ($_POST["clone"]) {
-                                       $command = "INSERT";
-                                       $query = "INTO $query";
+                                       $query = "INTO " . table($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE);
                                }
                                if ($_POST["all"] || ($unselected === array() && is_array($_POST["check"])) || $is_group) {
                                        $result = ($_POST["delete"]
                                                ? $driver->delete($TABLE, $where_check)
-                                               : queries("$command $query$where_check")
+                                               : ($_POST["clone"]
+                                                       ? queries("INSERT $query$where_check")
+                                                       : $driver->update($TABLE, $set, $where_check)
+                                               )
                                        );
                                        $affected = $connection->affected_rows;
                                } else {
@@ -119,7 +118,10 @@ if ($_POST && !$error) {
                                                $where2 = "\nWHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($val, $fields);
                                                $result = ($_POST["delete"]
                                                        ? $driver->delete($TABLE, $where2, 1)
-                                                       : queries($command . limit1($query, $where2))
+                                                       : ($_POST["clone"]
+                                                               ? queries("INSERT" . limit1($query, $where2))
+                                                               : $driver->update($TABLE, $set, $where2)
+                                                       )
                                                );
                                                if (!$result) {
                                                        break;
@@ -148,11 +150,14 @@ if ($_POST && !$error) {
                                        $set = array();
                                        foreach ($row as $key => $val) {
                                                $key = bracket_escape($key, 1); // 1 - back
-                                               $set[] = idf_escape($key) . " = " . (ereg('char|text', $fields[$key]["type"]) || $val != "" ? $adminer->processInput($fields[$key], $val) : "NULL");
+                                               $set[] = " " . idf_escape($key) . " = " . (ereg('char|text', $fields[$key]["type"]) || $val != "" ? $adminer->processInput($fields[$key], $val) : "NULL");
                                        }
-                                       $query = table($TABLE) . " SET " . implode(", ", $set);
-                                       $where2 = " WHERE " . where_check($unique_idf, $fields) . ($where ? " AND " . implode(" AND ", $where) : "");
-                                       $result = queries("UPDATE" . ($is_group || $unselected === array() ? " $query$where2" : limit1($query, $where2))); // can change row on a different page without unique key
+                                       $result = $driver->update(
+                                               $TABLE,
+                                               $set,
+                                               " WHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($unique_idf, $fields),
+                                               !($is_group || $unselected === array())
+                                       );
                                        if (!$result) {
                                                break;
                                        }