mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-04 21:28:02 +02:00
Code Issues Releases Wiki Activity

DibiFluent::fetch(): fixed limit clause duplication [Closes #188][Closes #186][Closes #185]

Browse Source
This commit is contained in:
castamir
2015-10-07 16:38:35 +02:00
committed by David Grudl
parent 443661f0e9
commit f4ae1e692f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dibi/libs/DibiFluent.php
View File

@@ -316,11 +316,12 @@ class DibiFluent extends DibiObject implements IDataSource
*/ */
public function fetch() public function fetch()
{ {
if ($this->command === 'SELECT') { if ($this->command === 'SELECT' && !$this->clauses['LIMIT']) {
return $this->query($this->_export(NULL, array('%lmt', 1)))->fetch(); $result = $this->query($this->limit(1)->_export())->fetch();
} else { $this->removeClause('LIMIT');
return $this->query($this->_export())->fetch(); return $result;
} }
return $this->query($this->_export())->fetch();
} }
@@ -330,11 +331,12 @@ class DibiFluent extends DibiObject implements IDataSource
*/ */
public function fetchSingle() public function fetchSingle()
{ {
if ($this->command === 'SELECT') { if ($this->command === 'SELECT' && !$this->clauses['LIMIT']) {
return $this->query($this->_export(NULL, array('%lmt', 1)))->fetchSingle(); $result = $this->query($this->limit(1)->_export())->fetchSingle();
} else { $this->removeClause('LIMIT');
return $this->query($this->_export())->fetchSingle(); return $result;
} }
return $this->query($this->_export())->fetchSingle();
} }