Merge pull request #86 from kohana/3.2/master

acoulton · acoulton · commit c352da30fed2 · 2014-11-11T11:10:24.000Z
Merge 3.2/master into 3.3/develop Closes #86, merged manually due to github merge problem
diff --git a/classes/Kohana/Database/Query/Builder.php b/classes/Kohana/Database/Query/Builder.php
@@ -80,7 +80,7 @@ protected function _compile_conditions(Database $db, array $conditions)
 							// Convert "val = NULL" to "val IS NULL"
 							$op = 'IS';
 						}
-						elseif ($op === '!=')
+						elseif ($op === '!=' OR $op === '<>')
 						{
 							// Convert "val != NULL" to "valu IS NOT NULL"
 							$op = 'IS NOT';

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected function _compile_conditions(Database $db, array $conditions)`
`80`	`80`	`// Convert "val = NULL" to "val IS NULL"`
`81`	`81`	`$op = 'IS';`
`82`	`82`	`}`
`83`		`- elseif ($op === '!=')`
	`83`	`+ elseif ($op === '!=' OR $op === '<>')`
`84`	`84`	`{`
`85`	`85`	`// Convert "val != NULL" to "valu IS NOT NULL"`
`86`	`86`	`$op = 'IS NOT';`