mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-07 22:56:35 +02:00
Code Issues Releases Wiki Activity

PdoDriver: improved detection of query result [Closes #279]

Browse Source
This commit is contained in:
David Grudl
2018-03-28 18:03:39 +02:00
parent bc5e4e378c
commit 6deb7f7d08
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Dibi/Drivers/PdoDriver.php
View File

@@ -101,23 +101,14 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
*/ */
public function query(string $sql): ?Dibi\ResultDriver public function query(string $sql): ?Dibi\ResultDriver
{ {
// must detect if SQL returns result set or num of affected rows $res = $this->connection->query($sql);
$cmd = strtoupper(substr(ltrim($sql), 0, 6)); if ($res) {
static $list = ['UPDATE' => 1, 'DELETE' => 1, 'INSERT' => 1, 'REPLAC' => 1]; $this->affectedRows = $res->rowCount();
$this->affectedRows = null; return $res->columnCount() ? $this->createResultDriver($res) : null;
if (isset($list[$cmd])) {
$this->affectedRows = Helpers::false2Null($this->connection->exec($sql));
if ($this->affectedRows !== null) {
return null;
}
} else {
$res = $this->connection->query($sql);
if ($res) {
return $this->createResultDriver($res);
}
} }
$this->affectedRows = null;
[$sqlState, $code, $message] = $this->connection->errorInfo(); [$sqlState, $code, $message] = $this->connection->errorInfo();
$message = "SQLSTATE[$sqlState]: $message"; $message = "SQLSTATE[$sqlState]: $message";
switch ($this->driverName) { switch ($this->driverName) {