From 6b324d1291d89db6542045b653e4874daaf8d962 Mon Sep 17 00:00:00 2001
From: Sergey Tsalkov <stsalkov@gmail.com>
Date: Sun, 9 Sep 2012 14:49:43 -0700
Subject: [PATCH] using $where is now equivalent to $where->text()

---
 db.class.php                   | 2 ++
 simpletest/WhereClauseTest.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/db.class.php b/db.class.php
index 66089b0..6e70b49 100644
--- a/db.class.php
+++ b/db.class.php
@@ -789,6 +789,8 @@ class WhereClause {
     if ($this->negate) $A = '(NOT ' . $A . ')';
     return $A;
   }
+  
+  function __toString() { return $this->text(); }
 }
 
 class DBTransaction {
diff --git a/simpletest/WhereClauseTest.php b/simpletest/WhereClauseTest.php
index e9e2380..5cfca5d 100644
--- a/simpletest/WhereClauseTest.php
+++ b/simpletest/WhereClauseTest.php
@@ -41,7 +41,7 @@ class WhereClauseTest extends SimpleTest {
     $subclause->add('username!=%s', 'Bart');
     $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($result[0]['age'] === '15');
   }
@@ -53,7 +53,7 @@ class WhereClauseTest extends SimpleTest {
     $subclause->add('username!=%s', 'Bart');
     $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($result[0]['age'] === '15');
   }