Add SQL IN statement and its test. (But not test yet wait for Sandbox…

… setting up on slow internet)
KrisJordan · Aug 29, 2009 · a8b7f0c · a8b7f0c
1 parent c626be5
commit a8b7f0c
Show file tree

Hide file tree

Showing 7 changed files with 450 additions and 408 deletions.
diff --git a/recess/recess/database/pdo/PdoDataSet.class.php b/recess/recess/database/pdo/PdoDataSet.class.php
@@ -341,5 +341,11 @@ function range($start, $finish) { $copy = clone $this; $copy->sqlBuilder->range(
 	 * @return PdoDataSet
 	 */	
 	function orderBy($clause) { $copy = clone $this; $copy->sqlBuilder->orderBy($clause); return $copy; }
+
+	/**
+	 * @see SqlBuilder::in
+	 * @return PdoDataSet
+	 */		
+	function in($lhs, $rhs) { $copy = clone $this; $copy->sqlBuilder->in($lhs,$rhs); return $copy; }
 }
 ?>
diff --git a/recess/recess/database/sql/ISqlConditions.class.php b/recess/recess/database/sql/ISqlConditions.class.php
@@ -19,6 +19,7 @@ function lessThan($column, $value);
 	function lessThanOrEqualTo($column, $value);
 	function like($column, $value);
 	function notLike($column, $value);
+	function in($column, $value);
 
 }
 ?>
diff --git a/recess/recess/database/sql/SqlBuilder.class.php b/recess/recess/database/sql/SqlBuilder.class.php
@@ -338,6 +338,16 @@ public function isNull($column)        { return $this->addCondition($column, nul
 	 */
 	public function isNotNull($column)        { return $this->addCondition($column, null, Criterion::IS_NOT_NULL); }
 
+	/**
+	 * IN to expression for WHERE clause of update, delete, or select statements.
+	 *
+	 * @param string $column
+	 * @param array $value
+	 * @return SqlBuilder
+	 */
+	public function in($column, $value)        { return $this->addCondition($column, $value, Criterion::IN); }
+
+
 	/**
 	 * Add a condition to the SqlBuilder statement. Additional logic here to prepend
 	 * a table name and also keep track of which columns have already been assigned conditions
@@ -703,6 +713,12 @@ public function getQueryParameter() {
 		if(is_numeric($this->value)) {
 			return $this->value;
 		}
+
+		if(is_array($this->value)) {
+      $hack_value = '('.join(',', $this->value).')';
+      return $hack_value;
+		}		
+
 		// End workaround
 
 		if($this->operator == self::ASSIGNMENT) { 

diff --git a/recess/test/recess/database/PdoDsnSettings.php b/recess/test/recess/database/PdoDsnSettings.php
@@ -1,5 +1,5 @@
 <?php
 // DSN, Database Name, Username, Password
-$_ENV['dsn.mysql'] = array('mysql:host=localhost;dbname=recess', 'recess', 'recess', 'recess');
+$_ENV['dsn.mysql'] = array('mysql:host=localhost;dbname=recess', 'root', 'root', 'root');
 $_ENV['dsn.sqlite'] = array('sqlite::memory:','','','');
 ?>