From 9eedfd054e7dcf50346e26f6a61238eb8c67a655 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 16 Nov 2014 12:31:02 -0500 Subject: [PATCH] Fixed test break. --- framework/CHANGELOG.md | 2 +- framework/db/pgsql/QueryBuilder.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index c4195c7b11..e733d5d45b 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -32,7 +32,7 @@ Yii Framework 2 Change Log - Enh #4181: Added `yii\bootstrap\Modal::$headerOptions` and `yii\bootstrap\Modal::$footerOptions` (tuxoff, samdark) - Enh #4263: Added migration and SQL schema files for `yii\log\DbTarget` (samdark) - Enh #4457: Added support for using noscript for css files registered through asset bundles and Html helper (samdark) -- Enh #4492: Support PostgreSQL-specific syntax for `QueryBuilder::alterColumn()` (qiangxue) + - Enh #4492: Support PostgreSQL-specific syntax for `QueryBuilder::alterColumn()` (qiangxue) - Enh #4739: Better display of exceptions when the response format is set as "raw" format (qiangxue) - Enh #5223: Query builder now supports selecting sub-queries as columns (qiangxue) - Enh #5367: Added `yii\grid\DataColumn::encodeLabel` (SDKiller) diff --git a/framework/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php index b1ac0014f1..df5ad615d3 100644 --- a/framework/db/pgsql/QueryBuilder.php +++ b/framework/db/pgsql/QueryBuilder.php @@ -157,7 +157,7 @@ class QueryBuilder extends \yii\db\QueryBuilder { // https://github.com/yiisoft/yii2/issues/4492 // http://www.postgresql.org/docs/9.1/static/sql-altertable.html - if (!preg_match('/^(DROP\s+DEFAULT|SET|RESET)\s+/i', $type)) { + if (!preg_match('/^(DROP|SET|RESET)\s+/i', $type)) { $type = 'TYPE ' . $this->getColumnType($type); } return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' ALTER COLUMN '