rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor bugfix: don't drop identical query components in WhereClause (thanks Alexander!)

Browse Source
This commit is contained in:
Sergey Tsalkov
2013-12-06 11:17:54 -08:00
parent 7b0da839de
commit 2707bcba7d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db.class.php
View File

@@ -790,12 +790,11 @@ class WhereClause {
} }
function textAndArgs() { function textAndArgs() {
$sql = ''; $sql = array();
$args = array(); $args = array();
if (count($this->clauses) == 0) return array('(1)', $args); if (count($this->clauses) == 0) return array('(1)', $args);
$sql = array();
foreach ($this->clauses as $clause) { foreach ($this->clauses as $clause) {
if ($clause instanceof WhereClause) { if ($clause instanceof WhereClause) {
list($clause_sql, $clause_args) = $clause->textAndArgs(); list($clause_sql, $clause_args) = $clause->textAndArgs();
@@ -808,7 +807,6 @@ class WhereClause {
$args = array_merge($args, $clause_args); $args = array_merge($args, $clause_args);
} }
$sql = array_unique($sql);
if ($this->type == 'and') $sql = implode(' AND ', $sql); if ($this->type == 'and') $sql = implode(' AND ', $sql);
else $sql = implode(' OR ', $sql); else $sql = implode(' OR ', $sql);

9
simpletest/WhereClauseTest.php
View File

@@ -57,6 +57,15 @@ class WhereClauseTest extends SimpleTest {
$this->assert(count($result) === 1); $this->assert(count($result) === 1);
$this->assert($result[0]['age'] === '15'); $this->assert($result[0]['age'] === '15');
} }
function test_6_or() {
$where = new WhereClause('or');
$where->add('username=%s', 'Bart');
$where->add('username=%s', 'Abe');
$result = DB::query("SELECT * FROM accounts WHERE %l", $where);
$this->assert(count($result) === 2);
}
} }