Skip to content

Removed explicit escaping for pgsql driver in FilterPartial#maybeSpecifyEscapeChar. Fixes #941 #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 3, 2024
Merged

Removed explicit escaping for pgsql driver in FilterPartial#maybeSpecifyEscapeChar. Fixes #941 #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b02582
Fix styling
Talpx1 Sep 9, 2024
0033fe1
Removed explicit escaping for pgsql driver in FilterPartial#maybeSpec…
Talpx1 Sep 9, 2024
485430a
Fix styling
Talpx1 Sep 9, 2024
d95574d
Merge branch 'main' into fix-941
AlexVanderbist Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Filters/FiltersPartial.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ protected static function escapeLike(string $value): string
}

/**
* @param 'sqlite'|'pgsql'|'sqlsrc'|'mysql' $driver
* @param 'sqlite'|'pgsql'|'sqlsrc'|'mysql'|'mariadb' $driver
* @return string
*/
protected static function maybeSpecifyEscapeChar(string $driver): string
{
if (! in_array($driver, ['sqlite','pgsql','sqlsrv'])) {
if (! in_array($driver, ['sqlite','sqlsrv'])) {
return '';
}

Expand Down
11 changes: 8 additions & 3 deletions tests/FilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@
});

it('specifies escape character in supported databases', function (string $dbDriver) {
if ($dbDriver === 'mariadb' && ! in_array('mariadb', DB::supportedDrivers())) {
$this->markTestSkipped('mariadb driver not supported in the installed version of illuminate/database dependency');
}

$fakeConnection = "test_{$dbDriver}";

DB::connectUsing($fakeConnection, [
Expand All @@ -100,6 +104,7 @@
]);

DB::usingConnection($fakeConnection, function () use ($dbDriver) {

$request = new Request([
'filter' => ['name' => 'to_find'],
]);
Expand All @@ -108,10 +113,10 @@
->allowedFilters('name', 'id')
->toSql();

expect($queryBuilderSql)->when(in_array($dbDriver, ["sqlite","pgsql","sqlsrv"]), fn (Expectation $query) => $query->toContain("ESCAPE '\'"));
expect($queryBuilderSql)->when($dbDriver === 'mysql', fn (Expectation $query) => $query->not->toContain("ESCAPE '\'"));
expect($queryBuilderSql)->when(in_array($dbDriver, ["sqlite","sqlsrv"]), fn (Expectation $query) => $query->toContain("ESCAPE '\'"));
expect($queryBuilderSql)->when(in_array($dbDriver, ["mysql","mariadb", "pgsql"]), fn (Expectation $query) => $query->not->toContain("ESCAPE '\'"));
});
})->with(['sqlite', 'mysql', 'pgsql', 'sqlsrv']);
})->with(['sqlite', 'mysql', 'pgsql', 'sqlsrv', 'mariadb']);

it('can filter results based on the existence of a property in an array', function () {
$results = createQueryFromFilterRequest([
Expand Down