beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move SimpleDB fields computation

Browse source
This commit is contained in:
Jakub Vrana 2013-07-06 22:22:13 -07:00
parent d17b17e515
commit 1060a3f9eb
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
adminer/drivers/simpledb.inc.php
View file

@ -285,7 +285,20 @@ if (isset($_GET["simpledb"])) {
} }
function fields($table) { function fields($table) {
return array(); $return = array();
foreach ((array) $_POST["field_keys"] as $key => $val) {
if ($val != "") {
$_POST["fields"][bracket_escape($val)] = $_POST["field_vals"][$key];
}
}
foreach ((array) $_POST["fields"] as $key => $val) {
$name = bracket_escape($key, 1); // 1 - back
$return[$name] = array("field" => $name, "privileges" => array("insert" => 1, "update" => 1));
if (isset($_POST["function"][$key])) {
$return[$name]["null"] = true;
}
}
return $return;
} }
function foreign_keys($table) { function foreign_keys($table) {

17
adminer/edit.inc.php
View file

@ -21,21 +21,6 @@ if ($_POST && !$error && !isset($_GET["select"])) {
$unique_array = unique_array($_GET["where"], $indexes); $unique_array = unique_array($_GET["where"], $indexes);
$query_where = "\nWHERE $where"; $query_where = "\nWHERE $where";
if (!support("table")) {
foreach ($_POST["field_keys"] as $key => $val) {
if ($val != "") {
$_POST["fields"][bracket_escape($val)] = $_POST["field_vals"][$key];
}
}
foreach ($_POST["fields"] as $key => $val) {
$name = bracket_escape($key, 1); // 1 - back
$fields[$name] = array("field" => $name);
if (isset($_POST["function"][$key])) {
$fields[$name]["null"] = true;
}
}
}
if (isset($_POST["delete"])) { if (isset($_POST["delete"])) {
queries_redirect( queries_redirect(
$location, $location,
@ -118,7 +103,7 @@ if (!support("table") && !$fields) {
} }
if ($row) { if ($row) {
foreach ($row as $key => $val) { foreach ($row as $key => $val) {
if (!$_POST["save"] && !$where) { if (!$where) {
$row[$key] = null; $row[$key] = null;
} }
$fields[$key] = array("field" => $key, "null" => ($key != "itemName()")); $fields[$key] = array("field" => $key, "null" => ($key != "itemName()"));