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

[svn at limb-project.com]

Author: serega
Date: 2007-06-20 10:31:15 +0400 (Wed, 20 Jun 2007)
New Revision: 6007
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6007

Modified:
   3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php
   3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCriteriaTest.class.php
Log:
-- lmbSQLCriteria now accepts optional $raw_sql and $values in constructor just like parent lmbSQLRawCriteria

Modified: 3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php	2007-06-19 21:15:58 UTC (rev 6006)
+++ 3.x/trunk/limb/dbal/src/criteria/lmbSQLCriteria.class.php	2007-06-20 06:31:15 UTC (rev 6007)
@@ -1,24 +1,27 @@
 <?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(dirname(__FILE__) . '/lmbSQLRawCriteria.class.php');
-
+lmb_require(dirname(__FILE__) . '/lmbSQLRawCriteria.class.php');
+
 /**
  * class lmbSQLCriteria.
  *
  * @package dbal
  * @version $Id$
- */
+ */
 class lmbSQLCriteria extends lmbSQLRawCriteria
 {
-  function __construct()
+  function __construct($raw_criteria = '', $values = array())
   {
-    parent :: __construct("1 = 1");
+    if(!$raw_criteria)
+      $raw_criteria = '1 = 1';
+
+    parent :: __construct($raw_criteria, $values);
   }
 
   static function objectify($args)

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-06-19 21:15:58 UTC (rev 6006)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/criteria/lmbSQLCriteriaTest.class.php	2007-06-20 06:31:15 UTC (rev 6007)
@@ -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/lmbSQLCriteria.class.php');
 lmb_require('limb/dbal/src/criteria/lmbSQLCriteria.class.php');
@@ -29,6 +29,11 @@
     $this->assertEqual($criteria->toStatementString(), "1 = 1");
   }
 
+  function testPassRawCriteriaToConstructor()
+  {
+    $criteria = new lmbSQLCriteria('2 = 2');
+    $this->assertEqual($criteria->toStatementString(), '2 = 2');
+  }
 }
 
 ?>