Skip to content

Y
yii2
Commit 1e7a359c by Qiang Xue
Options

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

gii additional table prefix fixes
parents 4bee9e84 cdfbcd92
Showing with 2 additions and 7 deletions
extensions/yii/gii/generators/model/Generator.php
...@@ -550,13 +550,8 @@ class Generator extends \yii\gii\Generator ...@@ -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)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment