Skip to content

Commit a1b69ce

Browse files
authored
Merge pull request #24 from ukfast/allow_null_sort_order_to_be_changed
Remove quotes from function call
2 parents d0dd552 + 9266a6f commit a1b69ce

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Sieve.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ public function apply($queryBuilder)
8181
}
8282

8383
if ($this->getSort() == "$property:asc_nulls_last") {
84-
$queryBuilder->orderByRaw("ISNULL(\"$column\") asc")
84+
$queryBuilder->orderByRaw("ISNULL($column) asc")
8585
->orderBy($column, 'asc');
8686
}
8787

8888
if ($this->getSort() == "$property:desc_nulls_first") {
89-
$queryBuilder->orderByRaw("ISNULL(\"$column\") desc")
89+
$queryBuilder->orderByRaw("ISNULL($column) desc")
9090
->orderBy($column, 'desc');
9191
}
9292
}

tests/SieveTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function applies_sieve_sorts_to_a_query_builder_asc_nulls_last()
9393
$seive->apply($builder);
9494

9595
$this->assertEquals(
96-
'select * from "pets" order by ISNULL("name") asc, "name" asc',
96+
'select * from "pets" order by ISNULL(name) asc, "name" asc',
9797
$builder->toSql()
9898
);
9999
}
@@ -117,7 +117,7 @@ public function applies_sieve_sorts_to_a_query_builder_desc_nulls_first()
117117
$seive->apply($builder);
118118

119119
$this->assertEquals(
120-
'select * from "pets" order by ISNULL("name") desc, "name" desc',
120+
'select * from "pets" order by ISNULL(name) desc, "name" desc',
121121
$builder->toSql()
122122
);
123123
}

0 commit comments

Comments
 (0)