php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #15878: Fixed migration with a comment containing an apostrophe

Browse Source
This commit is contained in:
Marco Moreno
2018-03-14 17:51:32 -04:00
committed by Carsten Brandt
parent 61186b5bd5
commit f33959419a
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/db/mysql/QueryBuilder.php
View File

@ -291,8 +291,9 @@ class QueryBuilder extends \yii\db\QueryBuilder
*/
public function addCommentOnColumn($table, $column, $comment)
{
$definition = $this->getColumnDefinition($table, $column);
$definition = trim(preg_replace("/COMMENT '(.*?)'/i", '', $definition));
// Strip existing comment which may include escaped quotes
$definition = trim(preg_replace("/COMMENT '(?:''|[^'])*'/i", '',
$this->getColumnDefinition($table, $column)));
return 'ALTER TABLE ' . $this->db->quoteTableName($table)
. ' CHANGE ' . $this->db->quoteColumnName($column)