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

Corrected MSSQL driver name. Fixed array addition to not overwrite matching keys.

Browse Source
This commit is contained in:
Chris Harris
2016-02-26 12:44:20 -08:00
parent 3eecb79420
commit 91018f6c38
7 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/framework/db/mysql/MysqlQueryBuilderTest.php
View File

@@ -17,7 +17,7 @@ class MysqlQueryBuilderTest extends QueryBuilderTest
*/
public function columnTypes()
{
return parent::columnTypes() + [
return array_merge(parent::columnTypes(), [
[
Schema::TYPE_PK . ' AFTER (`col_before`)',
$this->primaryKey()->after('col_before'),
@@ -48,6 +48,6 @@ class MysqlQueryBuilderTest extends QueryBuilderTest
$this->primaryKey(8)->first()->after('col_before'),
'int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST'
],
];
]);
}
}