php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 13:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #10020: Fixed quoting of column names with dots in MSSQL

Browse Source
This commit is contained in:
Alexander Kartavenko
2019-07-17 16:46:31 +03:00
committed by Alexander Makarov
parent 8b2f34d72c
commit 259c496e2e
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/CHANGELOG.md
View File

@ -4,7 +4,7 @@ Yii Framework 2 Change Log
2.0.24 under development 2.0.24 under development
------------------------ ------------------------
- no changes in this release. - Bug #10020: Fixed quoting of column names with dots in MSSQL (alexkart)
2.0.23 July 16, 2019 2.0.23 July 16, 2019

12
framework/db/mssql/Schema.php
View File

@ -739,4 +739,16 @@ SQL;
return $result[$returnType]; return $result[$returnType];
} }
/**
* {@inheritdoc}
*/
public function quoteColumnName($name)
{
if (preg_match('/^\[.*\]$/', $name)) {
return $name;
}
return parent::quoteColumnName($name);
}
} }

4
tests/framework/db/mssql/ConnectionTest.php
View File

@ -63,6 +63,10 @@ class ConnectionTest extends \yiiunit\framework\db\ConnectionTest
$this->assertEquals('{{%table}}.[column]', $connection->quoteColumnName('{{%table}}.column')); $this->assertEquals('{{%table}}.[column]', $connection->quoteColumnName('{{%table}}.column'));
$this->assertEquals('{{%table}}.[column]', $connection->quoteColumnName('{{%table}}.[column]')); $this->assertEquals('{{%table}}.[column]', $connection->quoteColumnName('{{%table}}.[column]'));
$this->assertEquals('[column.name]', $connection->quoteColumnName('[column.name]'));
$this->assertEquals('[column.name.with.dots]', $connection->quoteColumnName('[column.name.with.dots]'));
$this->assertEquals('[table].[column.name.with.dots]', $connection->quoteColumnName('[table].[column.name.with.dots]'));
$this->assertEquals('[table].[column]', $connection->quoteSql('[[table.column]]')); $this->assertEquals('[table].[column]', $connection->quoteSql('[[table.column]]'));
$this->assertEquals('[table].[column]', $connection->quoteSql('{{table}}.[[column]]')); $this->assertEquals('[table].[column]', $connection->quoteSql('{{table}}.[[column]]'));
$this->assertEquals('[table].[column]', $connection->quoteSql('{{table}}.[column]')); $this->assertEquals('[table].[column]', $connection->quoteSql('{{table}}.[column]'));