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

Fixes #916: generation of class name from table name has problem.

Browse Source
This commit is contained in:
Qiang Xue
2013-10-03 11:01:52 -04:00
parent 8c9dadf362
commit 38c0b197f9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/yii/gii/generators/model/Generator.php
View File

@@ -514,7 +514,8 @@ class Generator extends \yii\gii\Generator
$patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/'; $patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
} }
if (!empty($db->tablePrefix)) { if (!empty($db->tablePrefix)) {
$patterns[] = "/^{$db->tablePrefix}(.*?)|(.*?){$db->tablePrefix}$/"; $patterns[] = "/^{$db->tablePrefix}(.*?)$/";
$patterns[] = "/^(.*?){$db->tablePrefix}$/";
} else { } else {
$patterns[] = "/^tbl_(.*?)$/"; $patterns[] = "/^tbl_(.*?)$/";
} }
@@ -523,6 +524,7 @@ class Generator extends \yii\gii\Generator
foreach ($patterns as $pattern) { foreach ($patterns as $pattern) {
if (preg_match($pattern, $tableName, $matches)) { if (preg_match($pattern, $tableName, $matches)) {
$className = $matches[1]; $className = $matches[1];
break;
} }
} }
return $this->_classNames[$tableName] = Inflector::id2camel($className, '_'); return $this->_classNames[$tableName] = Inflector::id2camel($className, '_');