Support ->where("NOT id", array()), BC break: unsupport "id NOT"

vrana · Jun 14, 2011 · 2593db8 · 2593db8
1 parent c29ef5f
commit 2593db8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/NotORM/Result.php b/NotORM/Result.php
@@ -352,7 +352,7 @@ function where($condition, $parameters = array()) {
 				if ($in) {
 					$condition .= " IN (" . implode(", ", $in) . ")";
 				} else {
-					$condition .= " IN (NULL)";
+					$condition = "($condition) IS NOT NULL AND $condition IS NULL"; // $condition = "NOT id"
 				}
 			}
 		} elseif (!is_array($parameters)) { // where("column", "x")
@@ -361,7 +361,7 @@ function where($condition, $parameters = array()) {
 			if ($parameters) {
 				$condition .= " IN (" . implode(", ", array_map(array($this, 'quote'), $parameters)) . ")";
 			} else {
-				$condition .= " IN (NULL)";
+				$condition = "($condition) IS NOT NULL AND $condition IS NULL";
 			}
 		}
 		$this->where[] = $condition;

diff --git a/tests/26-in.phpt b/tests/26-in.phpt
@@ -0,0 +1,16 @@
+--TEST--
+IN operator
+--FILE--
+<?php
+include_once dirname(__FILE__) . "/connect.inc.php";
+
+echo $software->application("maintainer_id", array())->count("*") . "\n";
+echo $software->application("maintainer_id", array(11))->count("*") . "\n";
+echo $software->application("NOT maintainer_id", array(11))->count("*") . "\n";
+echo $software->application("NOT maintainer_id", array())->count("*") . "\n";
+?>
+--EXPECTF--
+0
+1
+2
+3