Skip to content

Commit 06359de

Browse files
fix: using null in comparator function (#53)
1 parent a1e1c73 commit 06359de

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

src/Granada/Orm/Wrapper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,11 +433,11 @@ private function _handleWhereMethod($method, $parameters)
433433
$parameters[0] = $this->adjustTimezoneForWhere($varname, $parameters[0]);
434434
}
435435

436-
if (isset($parameters[0])) {
436+
if (count($parameters)) {
437437
return call_user_func([$this, $target_method], $column_name, $parameters[0]);
438438
}
439439

440-
return call_user_func([$this, $target_method], $column_name);
440+
return call_user_func([$this, $target_method], $column_name);
441441
}
442442
}
443443

tests/granada/GranadaNewTest.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,24 @@ public function testVarnameOrderByNaturalDesc()
527527
$this->assertSame('SELECT * FROM `part` ORDER BY LENGTH(`name`), `name` DESC', ORM::get_last_query());
528528
}
529529

530+
public function testVarnameNotEqual()
531+
{
532+
Part::where_name_not_equal(5)->find_many();
533+
$this->assertSame("SELECT * FROM `part` WHERE `part`.`name` != '5'", ORM::get_last_query());
534+
}
535+
536+
public function testVarnameNotNull()
537+
{
538+
Part::where_name_not_null()->find_many();
539+
$this->assertSame('SELECT * FROM `part` WHERE `part`.`name` IS NOT NULL', ORM::get_last_query());
540+
}
541+
542+
public function testVarnameNotEqualNull()
543+
{
544+
Part::where_name_not_equal(null)->find_many();
545+
$this->assertSame('SELECT * FROM `part` WHERE `part`.`name` IS NOT NULL', ORM::get_last_query());
546+
}
547+
530548
public function testVarnameLtOrNULL()
531549
{
532550
Part::where_name_lt_or_null(5)->find_many();

0 commit comments

Comments
 (0)