Skip to content

fix(database): escape quote characters in identifiers #2303

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

Open
osbre wants to merge 1 commit into
base: 3.x
Choose a base branch
from
+30 −2
Open

fix(database): escape quote characters in identifiers #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/database/src/Config/DatabaseDialect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public function tableNotFoundCode(): string
public function quoteIdentifier(string $identifier): string
{
return match ($this) {
self::MYSQL, self::SQLITE => sprintf('`%s`', $identifier),
self::POSTGRESQL => sprintf('"%s"', $identifier),
self::MYSQL, self::SQLITE => sprintf('`%s`', str_replace('`', '``', $identifier)),
self::POSTGRESQL => sprintf('"%s"', str_replace('"', '""', $identifier)),
};
}

Expand Down
28 changes: 28 additions & 0 deletions packages/database/tests/Config/DatabaseDialectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

declare(strict_types=1);

namespace Tempest\Database\Tests\Config;

use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\Attributes\TestWith;
use PHPUnit\Framework\TestCase;
use Tempest\Database\Config\DatabaseDialect;

/**
* @internal
*/
final class DatabaseDialectTest extends TestCase
{
#[TestWith([DatabaseDialect::MYSQL, 'title', '`title`'])]
#[TestWith([DatabaseDialect::MYSQL, 'ti`tle', '`ti``tle`'])]
#[TestWith([DatabaseDialect::SQLITE, 'title', '`title`'])]
#[TestWith([DatabaseDialect::SQLITE, 'ti`tle', '`ti``tle`'])]
#[TestWith([DatabaseDialect::POSTGRESQL, 'title', '"title"'])]
#[TestWith([DatabaseDialect::POSTGRESQL, 'ti"tle', '"ti""tle"'])]
#[Test]
public function quote_identifier(DatabaseDialect $dialect, string $identifier, string $expected): void
{
$this->assertSame($expected, $dialect->quoteIdentifier($identifier));
}
}
Loading