Fix multi_query
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1323 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
parent
3a76704f58
commit
e94c2b90de
|
@ -20,32 +20,30 @@ if (extension_loaded('pdo')) {
|
|||
}
|
||||
|
||||
function query($query, $unbuffered = false) {
|
||||
$return = parent::query($query);
|
||||
if (!$return) {
|
||||
$result = parent::query($query);
|
||||
if (!$result) {
|
||||
$errorInfo = $this->errorInfo();
|
||||
$this->error = $errorInfo[2];
|
||||
return false;
|
||||
}
|
||||
if ($return->columnCount()) {
|
||||
$this->affected_rows = $return->rowCount();
|
||||
} else {
|
||||
$return->num_rows = $return->rowCount(); // is not guaranteed to work with all drivers
|
||||
}
|
||||
return $return;
|
||||
$this->store_result($result);
|
||||
return $result;
|
||||
}
|
||||
|
||||
function multi_query($query) {
|
||||
return $this->_result = $this->query($query);
|
||||
}
|
||||
|
||||
function store_result() {
|
||||
$return = &$this->_result;
|
||||
if ($return->columnCount()) {
|
||||
$this->affected_rows = $return->rowCount();
|
||||
return true;
|
||||
function store_result($result = null) {
|
||||
if (!$result) {
|
||||
$result = $this->_result;
|
||||
}
|
||||
$return->num_rows = $return->rowCount();
|
||||
return $return;
|
||||
if ($result->columnCount()) {
|
||||
$result->num_rows = $result->rowCount(); // is not guaranteed to work with all drivers
|
||||
return $result;
|
||||
}
|
||||
$this->affected_rows = $result->rowCount();
|
||||
return true;
|
||||
}
|
||||
|
||||
function next_result() {
|
||||
|
|
|
@ -4,12 +4,12 @@
|
|||
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<link rel="selenium.base" href="" />
|
||||
<title>Create database</title>
|
||||
<title>Login</title>
|
||||
</head>
|
||||
<body>
|
||||
<table cellpadding="1" cellspacing="1" border="1">
|
||||
<thead>
|
||||
<tr><td rowspan="1" colspan="3">Create database</td></tr>
|
||||
<tr><td rowspan="1" colspan="3">Login</td></tr>
|
||||
</thead><tbody>
|
||||
<tr>
|
||||
<td>open</td>
|
||||
|
@ -18,7 +18,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>open</td>
|
||||
<td>/adminer/adminer/?lang=en&username=</td>
|
||||
<td>/adminer/adminer/?lang=en&username=ODBC</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
Loading…
Reference in a new issue