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

[svn at limb-project.com]

Author: pachanga
Date: 2007-07-02 18:02:25 +0400 (Mon, 02 Jul 2007)
New Revision: 6045
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6045

Modified:
   3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php
   3.x/trunk/limb/dbal/src/lmbSimpleDb.class.php
   3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCompositeCriteriaTest.class.php
Log:
-- unnecessary getSelectQuery removed from lmbSimpleDb

Modified: 3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php	2007-07-02 13:39:54 UTC (rev 6044)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLBaseCriteria.class.php	2007-07-02 14:02:25 UTC (rev 6045)
@@ -92,9 +92,9 @@
 
   function getAttachedCriterias()
   {
-      $crits = array();
-      $this->_traverseCriteria($this, $crits);
-      return $crits;
+    $crits = array();
+    $this->_traverseCriteria($this, $crits);
+    return $crits;
   }
 
   protected function _traverseCriteria($c, &$a)

Modified: 3.x/trunk/limb/dbal/src/lmbSimpleDb.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/lmbSimpleDb.class.php	2007-07-02 13:39:54 UTC (rev 6044)
+++ 3.x/trunk/limb/dbal/src/lmbSimpleDb.class.php	2007-07-02 14:02:25 UTC (rev 6045)
@@ -40,7 +40,7 @@
 
   function select($table, $criteria = null, $order = '')
   {
-    $query = $this->getSelectQuery($table);
+    $query = new lmbSelectQuery($table);
 
     if($criteria)
       $query->addCriteria(lmbSQLCriteria :: objectify($criteria));
@@ -81,11 +81,6 @@
       return 0;
   }
 
-  function getSelectQuery($table)
-  {
-    return new lmbSelectQuery($table, $this->conn);
-  }
-
   function insert($table, $values, $primary_key = 'id')
   {
     $query = new lmbInsertQuery($table, $this->conn);

Modified: 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCompositeCriteriaTest.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCompositeCriteriaTest.class.php	2007-07-02 13:39:54 UTC (rev 6044)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCompositeCriteriaTest.class.php	2007-07-02 14:02:25 UTC (rev 6045)
@@ -1,10 +1,10 @@
 <?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 
+/*
+ * 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/lmbSQLCompositeCriteria.class.php');
 lmb_require('limb/dbal/src/criteria/lmbSQLRawCriteria.class.php');
@@ -43,11 +43,12 @@
     $this->assertEqual($c->toStatementString($values), '(a=1 AND b=2 OR c=3)');
   }
 
-  function testNestedCriterias()
+  function testNestedCriteria()
   {
     $c = new lmbSQLCompositeCriteria();
     $c1 = new lmbSQLRawCriteria('a=1');
     $c2 = new lmbSQLRawCriteria('b=2');
+    $c3 = new lmbSQLRawCriteria('d=4');
     $c2->addOr(new lmbSQLRawCriteria('c=3'));
 
     $c->addAnd($c1);