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

Merge pull request #1853 from creocoder/gii-table-prefix-fix

Browse Source 
gii additional table prefix fixes
This commit is contained in:
Qiang Xue
2014-01-08 21:22:56 -08:00
parent 4bee9e8430 cdfbcd925c
commit 1e7a359cb3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/yii/gii/generators/model/Generator.php
View File

@@ -550,13 +550,8 @@ class Generator extends \yii\gii\Generator
} }
$patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/'; $patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
} }
if (!empty($db->tablePrefix)) { $patterns[] = "/^{$db->tablePrefix}(.*?)$/";
$patterns[] = "/^{$db->tablePrefix}(.*?)$/"; $patterns[] = "/^(.*?){$db->tablePrefix}$/";
$patterns[] = "/^(.*?){$db->tablePrefix}$/";
} else {
$patterns[] = "/^tbl_(.*?)$/";
}
$className = $tableName; $className = $tableName;
foreach ($patterns as $pattern) { foreach ($patterns as $pattern) {
if (preg_match($pattern, $tableName, $matches)) { if (preg_match($pattern, $tableName, $matches)) {