[limb-svn] r6048 - in 3.x/trunk/limb/dbal: src/criteria tests/cases/non-driver/criteria tests/cases/non-driver/query

svn at limb-project.com svn at limb-project.com
Tue Jul 3 12:41:58 MSD 2007


Author: pachanga
Date: 2007-07-03 12:41:58 +0400 (Tue, 03 Jul 2007)
New Revision: 6048
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6048

Removed:
   3.x/trunk/limb/dbal/src/criteria/lmbSQLFalseCriteria.class.php
   3.x/trunk/limb/dbal/src/criteria/lmbSQLTableFieldCriteria.class.php
   3.x/trunk/limb/dbal/src/criteria/lmbSQLTrueCriteria.class.php
   3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLFalseCriteriaTest.class.php
   3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLTableFieldCriteriaTest.class.php
Modified:
   3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php
   3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php
   3.x/trunk/limb/dbal/src/criteria/lmbSQLFieldCriteria.class.php
   3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCriteriaTest.class.php
   3.x/trunk/limb/dbal/tests/cases/non-driver/query/lmbSelectRawQueryTest.class.php
Log:
-- lmbSQLTableFieldCriteria, lmbSQLTrueCriteria, lmbSQLFalseCriteria classes removed
-- lmbSQLCriteria :: not() is now an instance method not a static one. It only negates the value of the criteria itself.
-- lmbSQLCriteria :: notAll() method added, it negates the value of all criteria with all attached other criteria objects

Modified: 3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -20,13 +20,15 @@
   const _AND_ = " AND ";
   const _OR_ = " OR ";
 
-  protected $clauses = array();
+  protected $criteria = array();
   protected $conjunctions = array();
+  protected $not = false;
+  protected $not_all = false;
 
   //'and' & 'or' are keywords in php :(
   function addAnd($criteria)
   {
-    $this->clauses[] = lmbSQLCriteria :: objectify($criteria);
+    $this->criteria[] = lmbSQLCriteria :: objectify($criteria);
     $this->conjunctions[] = self::_AND_;
     return $this;
   }
@@ -38,19 +40,31 @@
 
   function addOr($criteria)
   {
-    $this->clauses[] = lmbSQLCriteria :: objectify($criteria);
+    $this->criteria[] = lmbSQLCriteria :: objectify($criteria);
     $this->conjunctions[] = self::_OR_;
     return $this;
   }
 
+  function not()
+  {
+    $this->not = !$this->not;
+    return $this;
+  }
+
+  function notAll()
+  {
+    $this->not_all = !$this->not_all;
+    return $this;
+  }
+
   function isComplex()
   {
-    return sizeof($this->clauses) > 0;
+    return sizeof($this->criteria) > 0;
   }
 
   protected function _getClauses()
   {
-    return $this->clauses;
+    return $this->criteria;
   }
 
   protected function _getConjunctions()
@@ -70,11 +84,20 @@
     if(!is_object($conn))
       $conn = lmbToolkit :: instance()->getDefaultDbConnection();
 
+    if($this->not_all)
+      $str .= 'NOT(';
+
+    if($this->not)
+      $str .= 'NOT(';
+
     $this->_appendExpressionToStatement($str, $values, $conn);
 
-    for($i=0; $i < count($this->clauses); $i++)
+    if($this->not)
+      $str .= ')';
+
+    for($i=0; $i < count($this->criteria); $i++)
     {
-      $criteria = $this->clauses[$i];
+      $criteria = $this->criteria[$i];
       $str .= $this->conjunctions[$i];
 
       if($criteria->isComplex())
@@ -85,6 +108,9 @@
       if($criteria->isComplex())
         $str .= ')';
     }
+
+    if($this->not_all)
+      $str .= ')';
   }
 
   protected function _appendExpressionToStatement(&$str, &$values, $conn){}

Modified: 3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -18,25 +18,25 @@
  */
 class lmbSQLCriteria extends lmbSQLBaseCriteria
 {
-  protected $sql;
+  protected $raw_sql;
   protected $values;
 
-  function __construct($raw_sql = '1=1', $values = array())
+  function __construct($raw_sql = '1 = 1', $values = array())
   {
-    $this->sql = $raw_sql;
+    $this->raw_sql = $raw_sql;
     $this->values = $values;
   }
   /**
    * Used for chaining
    */
-  static function create($raw_sql = '', $values = array())
+  static function create($raw_sql = '1 = 1', $values = array())
   {
     return new lmbSQLCriteria($raw_sql, $values);
   }
 
   protected function _appendExpressionToStatement(&$str, &$values, $conn)
   {
-    $sql = $this->sql;
+    $sql = $this->raw_sql;
 
     foreach($this->values as $key => $value)
     {
@@ -53,19 +53,14 @@
     $str .= $sql;
   }
 
-  static function not($criteria)
-  {
-    return new lmbSQLCriteria('!(' . self :: objectify($criteria)->toStatementString() . ')');
-  }
-
   static function between($column, $value_from, $value_to)
   {
     return new lmbSQLFieldBetweenCriteria($column, $value_from, $value_to);
   }
 
-  static function in($column, $value)
+  static function in($column, $values)
   {
-    return new lmbSQLFieldCriteria($column, $value, lmbSQLFieldCriteria :: IN);
+    return new lmbSQLFieldCriteria($column, $values, lmbSQLFieldCriteria :: IN);
   }
 
   static function equal($column, $value)
@@ -86,7 +81,7 @@
   static function objectify($args)
   {
     if(is_null($args))
-      return new lmbSQLCriteria("1 = 1");
+      return new lmbSQLCriteria();
 
     if(is_array($args))
     {

Deleted: 3.x/trunk/limb/dbal/src/criteria/lmbSQLFalseCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLFalseCriteria.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLFalseCriteria.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -1,26 +0,0 @@
-<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
- */
-lmb_require('limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php');
-
-/**
- * class lmbSQLFalseCriteria.
- *
- * @package dbal
- * @version $Id$
- */
-class lmbSQLFalseCriteria extends lmbSQLBaseCriteria
-{
-  function __construct(){}
-
-  protected function _appendExpressionToStatement(&$str, &$values, $conn)
-  {
-    $str .= '1 = 0';
-  }
-}
-?>

Modified: 3.x/trunk/limb/dbal/src/criteria/lmbSQLFieldCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLFieldCriteria.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLFieldCriteria.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -2,14 +2,11 @@
 /*
  * Limb PHP Framework
  *
- * @link http://limb-project.com 
+ * @link http://limb-project.com
  * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 lmb_require('limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php');
-lmb_require('limb/dbal/src/criteria/lmbSQLFalseCriteria.class.php');
-lmb_require('limb/dbal/src/criteria/lmbSQLRawCriteria.class.php');
-lmb_require('limb/dbal/src/criteria/lmbSQLTrueCriteria.class.php');
 
 /**
  * class lmbSQLFieldCriteria.
@@ -94,7 +91,7 @@
     {
       // null VALUES need special treatment because the SQL syntax is different
       // i.e. column IS null rather than column = null
-      if ($this->value !== null)
+      if($this->value !== null)
       {
         $str .= $field . $this->comparison . ':' . $stmt_placeholder . ':';
         $values[$stmt_placeholder] = $this->value;
@@ -103,11 +100,11 @@
       {
         // value is null, which means it was either not specified or specifically
         // set to null.
-        if ($this->comparison === self::EQUAL || $this->comparison === self::IS_NULL)
+        if($this->comparison === self::EQUAL || $this->comparison === self::IS_NULL)
         {
           $str .= $field . self::IS_NULL;
         }
-        elseif ($this->comparison === self::NOT_EQUAL || $this->comparison === self::IS_NOT_NULL)
+        elseif($this->comparison === self::NOT_EQUAL || $this->comparison === self::IS_NOT_NULL)
         {
           $str .= $field . self::IS_NOT_NULL;
         }

Deleted: 3.x/trunk/limb/dbal/src/criteria/lmbSQLTableFieldCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLTableFieldCriteria.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLTableFieldCriteria.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -1,39 +0,0 @@
-<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
- */
-lmb_require('limb/dbal/src/criteria/lmbSQLFieldCriteria.class.php');
-
-/**
- * class lmbSQLTableFieldCriteria.
- *
- * @package dbal
- * @version $Id$
- */
-class lmbSQLTableFieldCriteria extends lmbSQLFieldCriteria
-{
-  protected $table;
-
-  function __construct($raw_column, $value, $comparison = null)
-  {
-    @list($table, $column) = explode('.', $raw_column);
-
-    if($column === null)
-      throw new lmbException('Column must contain table name', array('column' => $raw_column));
-
-    parent :: __construct($raw_column, $value, $comparison);
-
-    $this->table = $table;
-  }
-
-  function getTable()
-  {
-    return $this->table;
-  }
-}
-
-?>

Deleted: 3.x/trunk/limb/dbal/src/criteria/lmbSQLTrueCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLTrueCriteria.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLTrueCriteria.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -1,26 +0,0 @@
-<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
- */
-lmb_require('limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php');
-
-/**
- * class lmbSQLTrueCriteria.
- *
- * @package dbal
- * @version $Id$
- */
-class lmbSQLTrueCriteria extends lmbSQLBaseCriteria
-{
-  function __construct(){}
-
-  protected function _appendExpressionToStatement(&$str, &$values, $conn)
-  {
-    $str .= '1 = 1';
-  }
-}
-?>

Modified: 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCriteriaTest.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCriteriaTest.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCriteriaTest.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -41,20 +41,116 @@
     $this->assertEqual($values[$key2], 3);
   }
 
-  function testChaining()
+  function testAndChaining()
   {
     $a = new lmbSQLCriteria('a');
     $b = new lmbSQLCriteria('b');
+    $a->addAnd($b);
+    $this->assertEqual($a->toStatementString(), 'a AND b');
+  }
+
+  function testAndChainingViaAdd()
+  {
+    $a = new lmbSQLCriteria('a');
+    $b = new lmbSQLCriteria('b');
+    $a->add($b);
+    $this->assertEqual($a->toStatementString(), 'a AND b');
+  }
+
+  function testOrChaining()
+  {
+    $a = new lmbSQLCriteria('a');
+    $b = new lmbSQLCriteria('b');
+    $a->addOr($b);
+    $this->assertEqual($a->toStatementString(), 'a OR b');
+  }
+
+  function testComplexCriteriaIsSurroundedWithParenthesis()
+  {
+    $a = new lmbSQLCriteria('a');
+    $b = new lmbSQLCriteria('b');
     $c = new lmbSQLCriteria('c');
+    $a->add($b->add($c));
+    $this->assertEqual($a->toStatementString(), 'a AND (b AND c)');
+  }
+
+  function testComplexChaining()
+  {
+    $a = new lmbSQLCriteria('a');
+    $b = new lmbSQLCriteria('b');
+    $c = new lmbSQLCriteria('c');
     $d = new lmbSQLCriteria('d');
     $e = new lmbSQLCriteria('e');
     $g = new lmbSQLCriteria('g');
+    $h = new lmbSQLCriteria('h');
+    $a->addOr($b->addAnd($c))->addAnd($d->addOr($e)->addAnd($g->addOr($h)));
+    $this->assertEqual($a->toStatementString(), 'a OR (b AND c) AND (d OR e AND (g OR h))');
+  }
 
-    $a->addOr($b->addAnd($c))->addAnd($d->addOr($e)->addAnd($g));
+  function testCreate()
+  {
+    $criteria = lmbSQLCriteria :: create('2 = 2');
+    $this->assertEqual($criteria->toStatementString(), '2 = 2');
+  }
 
-    $this->assertEqual($a->toStatementString(), 'a OR (b AND c) AND (d OR e AND g)');
+  function testEmptyCriteriaChainingIsSafe()
+  {
+    $c = lmbSQLCriteria :: create()->add(new lmbSQLCriteria());
+    $this->assertEqual($c->toStatementString(), '1 = 1 AND 1 = 1');
   }
 
+  function testNot()
+  {
+    $a = new lmbSQLCriteria('a');
+    $a->not();
+    $this->assertEqual($a->toStatementString(), 'NOT(a)');
+  }
+
+  function testToggleNot()
+  {
+    $a = new lmbSQLCriteria('a');
+    $a->not()->not();
+    $this->assertEqual($a->toStatementString(), 'a');
+  }
+
+  function testNotWithChaining()
+  {
+    $a = new lmbSQLCriteria('a');
+    $b = new lmbSQLCriteria('b');
+    $a->not()->add($b);
+    $this->assertEqual($a->toStatementString(), 'NOT(a) AND b');
+  }
+
+  function testNotAll()
+  {
+    $a = new lmbSQLCriteria('a');
+    $a->notAll();
+    $this->assertEqual($a->toStatementString(), 'NOT(a)');
+  }
+
+  function testToggleNotAll()
+  {
+    $a = new lmbSQLCriteria('a');
+    $a->notAll()->notAll();
+    $this->assertEqual($a->toStatementString(), 'a');
+  }
+
+  function testNotAllWithChaining()
+  {
+    $a = new lmbSQLCriteria('a');
+    $b = new lmbSQLCriteria('b');
+    $a->notAll()->add($b);
+    $this->assertEqual($a->toStatementString(), 'NOT(a AND b)');
+  }
+
+  function testNotAllAndNotAtTheSameTime()
+  {
+    $a = new lmbSQLCriteria('a');
+    $b = new lmbSQLCriteria('b');
+    $a->notAll()->not()->add($b);
+    $this->assertEqual($a->toStatementString(), 'NOT(NOT(a) AND b)');
+  }
+
   function testObjectifyString()
   {
     $criteria = lmbSQLCriteria :: objectify("id = 1");
@@ -79,18 +175,6 @@
     $this->assertEqual($criteria->toStatementString(), '2 = 2');
   }
 
-  function testCreate()
-  {
-    $criteria = lmbSQLCriteria :: create('2 = 2');
-    $this->assertEqual($criteria->toStatementString(), '2 = 2');
-  }
-
-  function testNot()
-  {
-    $criteria = lmbSQLCriteria :: not(new lmbSQLCriteria("id = 1"));
-    $this->assertEqual($criteria->toStatementString(), "!(id = 1)");
-  }
-
   function testBetween()
   {
     $criteria = lmbSQLCriteria :: between('id', 1, 100);

Deleted: 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLFalseCriteriaTest.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLFalseCriteriaTest.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLFalseCriteriaTest.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -1,23 +0,0 @@
-<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
- */
-lmb_require('limb/dbal/src/criteria/lmbSQLFalseCriteria.class.php');
-
-class lmbSQLFalseCriteriaTest extends UnitTestCase
-{
-  function testAppendStatementTo()
-  {
-    $c = new lmbSQLFalseCriteria();
-
-    $str = '';
-    $c->appendStatementTo($str);
-    $this->assertEqual($str, '1 = 0');
-  }
-}
-
-?>

Deleted: 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLTableFieldCriteriaTest.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLTableFieldCriteriaTest.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLTableFieldCriteriaTest.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -1,138 +0,0 @@
-<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
- */
-require_once('limb/dbal/tests/common.inc.php');
-lmb_require('limb/dbal/src/criteria/lmbSQLTableFieldCriteria.class.php');
-
-class lmbSQLTableFieldCriteriaTest extends UnitTestCase
-{
-  var $conn;
-
-  function setUp()
-  {
-    $this->conn = new ConnectionTestStub();
-  }
-
-  function testEqual()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'=:p0t_id:");
-    $this->assertEqual($values, array('p0t_id' => 4));
-  }
-
-  function testNotEqual()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4, lmbSQLFieldCriteria::NOT_EQUAL);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'<>:p0t_id:");
-    $this->assertEqual($values, array('p0t_id' => 4));
-  }
-
-  function testGreater()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4, lmbSQLFieldCriteria::GREATER);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'>:p0t_id:");
-    $this->assertEqual($values, array('p0t_id' => 4));
-  }
-
-  function testLess()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4, lmbSQLFieldCriteria::LESS);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'<:p0t_id:");
-    $this->assertEqual($values, array('p0t_id' => 4));
-  }
-
-  function testGreaterEqual()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4, lmbSQLFieldCriteria::GREATER_EQUAL);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'>=:p0t_id:");
-    $this->assertEqual($values, array('p0t_id' => 4));
-  }
-
-  function testLessEqual()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4, lmbSQLFieldCriteria::LESS_EQUAL);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'<=:p0t_id:");
-    $this->assertEqual($values, array('p0t_id' => 4));
-  }
-
-  function testIn()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', array(1, 2, 3), lmbSQLFieldCriteria::IN);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id' IN (:p0_p0t_id:,:p1_p0t_id:,:p2_p0t_id:)");
-    $this->assertEqual($values, array('p0_p0t_id' => 1, 'p1_p0t_id' => 2, 'p2_p0t_id' => 3));
-  }
-
-  function testNotIn()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', array(1, 2, 3), lmbSQLFieldCriteria::NOT_IN);
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id' NOT IN (:p0_p0t_id:,:p1_p0t_id:,:p2_p0t_id:)");
-    $this->assertEqual($values, array('p0_p0t_id' => 1, 'p1_p0t_id' => 2, 'p2_p0t_id' => 3));
-  }
-
-  function testIsNull()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', null);
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id' IS NULL");
-  }
-
-  function testIsNotNull()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', null, lmbSQLFieldCriteria::NOT_EQUAL);
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id' IS NOT NULL");
-  }
-
-  function testAnd()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4);
-    $c->addAnd(new lmbSQLTableFieldCriteria('t.name', 'test'));
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'=:p0t_id: AND 't.name'=:p1t_name:");
-    $this->assertEqual($values, array('p0t_id' => 4, 'p1t_name' => 'test'));
-  }
-
-  function testOr()
-  {
-    $c = new lmbSQLTableFieldCriteria('t.id', 4);
-    $c->addOr(new lmbSQLTableFieldCriteria('t.id', 5));
-
-    $values = array();
-    $this->assertEqual($c->toStatementString($values, $this->conn), "'t.id'=:p0t_id: OR 't.id'=:p1t_id:");
-    $this->assertEqual($values, array('p0t_id' => 4, 'p1t_id' => 5));
-  }
-
-  function testException()
-  {
-    try
-    {
-      $c = new lmbSQLTableFieldCriteria('id', 4);
-      $this->assertTrue(false);
-    }
-    catch(lmbException $e){}
-  }
-}
-
-?>

Modified: 3.x/trunk/limb/dbal/tests/cases/non-driver/query/lmbSelectRawQueryTest.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/query/lmbSelectRawQueryTest.class.php	2007-07-02 22:30:59 UTC (rev 6047)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/query/lmbSelectRawQueryTest.class.php	2007-07-03 08:41:58 UTC (rev 6048)
@@ -359,7 +359,7 @@
     $conn->setReturnReference('newStatement', $stmt);
 
     $sql = new lmbSelectRawQuery('SELECT * FROM test %where%', $conn);
-    $sql->addCriteria(new lmbSQLTableFieldCriteria('t.id', 5));
+    $sql->addCriteria(new lmbSQLFieldCriteria('t.id', 5));
 
     $sql->getStatement();
   }



More information about the limb-svn mailing list