Skip to content

Merge 4.2.x up into 4.3.x #6895

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
morozov merged 4 commits into from
Apr 6, 2025
Merged

Merge 4.2.x up into 4.3.x #6895

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
c0ed5f9
Fix merging driver options in the pdo_sqlsrv driver test
morozov Mar 23, 2025
83cf7e1
Merge pull request #6871 from morozov/fix-pdo-sql-driver-test
morozov Mar 24, 2025
1332fee
Do not trim single quote in comments on SQLite
morozov Apr 6, 2025
a11db88
Merge pull request #6892 from morozov/sqlite-quote-comment
morozov Apr 6, 2025
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
5 changes: 1 addition & 4 deletions src/Platforms/SQLitePlatform.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
use function strpos;
use function strtolower;
use function substr;
use function trim;

/**
* The SQLitePlatform class describes the specifics and dialects of the SQLite
Expand Down Expand Up @@ -288,9 +287,7 @@ protected function _getCreateTableSQL(string $name, array $columns, array $optio

$tableComment = '';
if (isset($options['comment'])) {
$comment = trim($options['comment'], " '");

$tableComment = $this->getInlineTableCommentSQL($comment);
$tableComment = $this->getInlineTableCommentSQL($options['comment']);
}

$query = ['CREATE TABLE ' . $name . ' ' . $tableComment . '(' . $queryFields . ')'];
Expand Down
3 changes: 2 additions & 1 deletion tests/Functional/Driver/PDO/SQLSrv/DriverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use PHPUnit\Framework\Attributes\RequiresPhpExtension;

use function array_merge;
use function array_replace;

#[RequiresPhpExtension('pdo_sqlsrv')]
class DriverTest extends AbstractDriverTestCase
Expand Down Expand Up @@ -44,7 +45,7 @@ private function getConnection(array $driverOptions): Connection
$params = TestUtil::getConnectionParams();

if (isset($params['driverOptions'])) {
$driverOptions = array_merge($params['driverOptions'], $driverOptions);
$driverOptions = array_replace($params['driverOptions'], $driverOptions);
}

return (new Driver())->connect(
Expand Down
4 changes: 2 additions & 2 deletions tests/Functional/Schema/SchemaManagerFunctionalTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,11 +1202,11 @@ public function testCommentInTable(): void
{
$table = new Table('table_with_comment');
$table->addColumn('id', Types::INTEGER);
$table->setComment('Foo with control characters \'\\');
$table->setComment('\'\\ Foo with control characters \'\\');
$this->dropAndCreateTable($table);

$table = $this->schemaManager->introspectTable('table_with_comment');
self::assertSame('Foo with control characters \'\\', $table->getComment());
self::assertSame('\'\\ Foo with control characters \'\\', $table->getComment());
}

public function testCreatedCompositeForeignKeyOrderIsCorrectAfterCreation(): void
Expand Down