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

using $where is now equivalent to $where->text()

Browse Source
This commit is contained in:
Sergey Tsalkov
2012-09-09 14:49:43 -07:00
parent 5b4e5a959a
commit 6b324d1291
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db.class.php
View File

@@ -789,6 +789,8 @@ class WhereClause {
if ($this->negate) $A = '(NOT ' . $A . ')'; if ($this->negate) $A = '(NOT ' . $A . ')';
return $A; return $A;
} }
function __toString() { return $this->text(); }
} }
class DBTransaction { class DBTransaction {

4
simpletest/WhereClauseTest.php
View File

@@ -41,7 +41,7 @@ class WhereClauseTest extends SimpleTest {
$subclause->add('username!=%s', 'Bart'); $subclause->add('username!=%s', 'Bart');
$where->negateLast(); $where->negateLast();
$result = DB::query("SELECT * FROM accounts WHERE %l", $where->text()); $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
$this->assert(count($result) === 1); $this->assert(count($result) === 1);
$this->assert($result[0]['age'] === '15'); $this->assert($result[0]['age'] === '15');
} }
@@ -53,7 +53,7 @@ class WhereClauseTest extends SimpleTest {
$subclause->add('username!=%s', 'Bart'); $subclause->add('username!=%s', 'Bart');
$subclause->negate(); $subclause->negate();
$result = DB::query("SELECT * FROM accounts WHERE %l", $where->text()); $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
$this->assert(count($result) === 1); $this->assert(count($result) === 1);
$this->assert($result[0]['age'] === '15'); $this->assert($result[0]['age'] === '15');
} }