mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-11 17:14:07 +02:00
Code Issues Releases Wiki Activity

Pass primary key to insert_update function

Browse Source
This commit is contained in:
Jakub Vrana
2010-07-22 17:57:26 +02:00
parent 2ad8ab4770
commit 6e50eb8ec0
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adminer/drivers/mysql.inc.php
View File

@@ -767,10 +767,10 @@ if (!defined("DRIVER")) {
/** Insert or update data in the table
* @param string
* @param array
* @param array
* @param array columns in keys
* @return bool
*/
function insert_update($table, $set, $indexes) {
function insert_update($table, $set, $primary) {
foreach ($set as $key => $val) {
$set[$key] = "$key = $val";
}

11
adminer/drivers/pgsql.inc.php
View File

@@ -467,20 +467,13 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . $connection->qu
return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
}
function insert_update($table, $set, $indexes) {
function insert_update($table, $set, $primary) {
global $connection;
$primary = array();
foreach ($indexes as $index) {
if ($index["type"] == "PRIMARY") {
$primary = array_map("idf_escape", $index["columns"]);
break;
}
}
$update = array();
$where = array();
foreach ($set as $key => $val) {
$update[] = "$key = $val";
if (in_array($key, $primary)) {
if (isset($primary[$key])) {
$where[] = "$key = $val";
}
}

2
adminer/drivers/sqlite.inc.php
View File

@@ -492,7 +492,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
}
function insert_update($table, $set, $indexes) {
function insert_update($table, $set, $primary) {
return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")");
}