Fix affected rows after getting warnings
This commit is contained in:
parent
d3cdfc17de
commit
7b0c58af32
|
@ -32,6 +32,7 @@ if (!$error && $_POST) {
|
||||||
$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")";
|
$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")";
|
||||||
$start = microtime(true);
|
$start = microtime(true);
|
||||||
$result = $connection->multi_query($query);
|
$result = $connection->multi_query($query);
|
||||||
|
$affected = $connection->affected_rows; // getting warnigns overwrites this
|
||||||
echo $adminer->selectQuery($query, $start, !$result);
|
echo $adminer->selectQuery($query, $start, !$result);
|
||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
|
@ -47,7 +48,7 @@ if (!$error && $_POST) {
|
||||||
if (is_object($result)) {
|
if (is_object($result)) {
|
||||||
select($result, $connection2);
|
select($result, $connection2);
|
||||||
} else {
|
} else {
|
||||||
echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $connection->affected_rows) . "\n";
|
echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $affected) . "\n";
|
||||||
}
|
}
|
||||||
} while ($connection->next_result());
|
} while ($connection->next_result());
|
||||||
|
|
||||||
|
|
|
@ -278,9 +278,7 @@ if (!defined("DRIVER")) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function warnings() {
|
function warnings() {
|
||||||
$affected = $this->_conn->affected_rows;
|
|
||||||
$result = $this->_conn->query("SHOW WARNINGS");
|
$result = $this->_conn->query("SHOW WARNINGS");
|
||||||
$this->_conn->affected_rows = $affected;
|
|
||||||
if ($result && $result->num_rows) {
|
if ($result && $result->num_rows) {
|
||||||
ob_start();
|
ob_start();
|
||||||
select($result); // select() usually needs to print a big table progressively
|
select($result); // select() usually needs to print a big table progressively
|
||||||
|
|
|
@ -130,6 +130,7 @@ if (!$error && $_POST) {
|
||||||
$time = " <span class='time'>(" . format_time($start) . ")</span>"
|
$time = " <span class='time'>(" . format_time($start) . ")</span>"
|
||||||
. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : "") // 1000 - maximum length of encoded URL in IE is 2083 characters
|
. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : "") // 1000 - maximum length of encoded URL in IE is 2083 characters
|
||||||
;
|
;
|
||||||
|
$affected = $connection->affected_rows; // getting warnigns overwrites this
|
||||||
$warnings = ($_POST["only_errors"] ? "" : $driver->warnings());
|
$warnings = ($_POST["only_errors"] ? "" : $driver->warnings());
|
||||||
$warnings_id = "warnings-$commands";
|
$warnings_id = "warnings-$commands";
|
||||||
if ($warnings) {
|
if ($warnings) {
|
||||||
|
@ -165,7 +166,7 @@ if (!$error && $_POST) {
|
||||||
stop_session();
|
stop_session();
|
||||||
}
|
}
|
||||||
if (!$_POST["only_errors"]) {
|
if (!$_POST["only_errors"]) {
|
||||||
echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
|
echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
|
echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
|
||||||
|
|
Loading…
Reference in a new issue