Skip to content

Fix the inability to generate a mod in the case of a plural form of table name prefix_table_name(s) #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 9, 2024
Merged

Fix the inability to generate a mod in the case of a plural form of table name prefix_table_name(s) #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a72aba
Update CreateModel.php
hi-noikiy Apr 9, 2024
7ef7a4e
Update
zds-s Apr 9, 2024
d5eb7e2
Merge branch '2.0' into patch-2
zds-s Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG-2.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
- [#58](https://github.com/mineadmin/components/pull/58) New base Secure Authentication Component
- [#59](https://github.com/mineadmin/components/pull/59) Add components for secure access control
- [#61](https://github.com/mineadmin/components/pull/61) Provide associative access to exported path attributes
- [#63](https://github.com/mineadmin/components/pull/63) Fixes the failure to generate files when certain words (category) are pluralized.
- [#63](https://github.com/mineadmin/components/pull/63) Fixes the failure to generate files when certain words (category) are pluralized.
- [#64](https://github.com/mineadmin/components/pull/64) Fix the inability to generate a mod in the case of a plural form of table name prefix_table_name(s)
7 changes: 3 additions & 4 deletions CHANGELOG-2.0.zh_CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# v2.0 - TBD

# v2.0.0-RC 2024年3月25日

## Added
# v2.0.0-RC

- [#53](https://github.com/mineadmin/components/pull/53) 拆分组件 http-server
- [#55](https://github.com/mineadmin/components/pull/55) 拆分优化组件 crontab
- [#56](https://github.com/mineadmin/components/pull/56) 拆分`模块化`组件
- [#58](https://github.com/mineadmin/components/pull/58) 新增基础的 安全认证组件
- [#59](https://github.com/mineadmin/components/pull/59) 添加安全访问控制组件
- [#61](https://github.com/mineadmin/components/pull/61) 为导出 path 属性提供关联访问方式
- [#63](https://github.com/mineadmin/components/pull/63) 修复某些单词（category）复数情况下无法生成文件
- [#63](https://github.com/mineadmin/components/pull/63) 修复某些单词（category）复数情况下无法生成文件
- [#64](https://github.com/mineadmin/components/pull/64) 修复表名为前缀_表名(s)这种复数形式的情况下无法生成model
3 changes: 3 additions & 0 deletions src/mine-core/src/Command/Creater/CreateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public function handle()
if (preg_match(sprintf('/%s(\\b|_[a-zA-Z0-9]+)/i', $module), $tmp)) {
$tableList[] = $tmp;
}
if ($tmp === $table) {
$tableList[] = $tmp;
}
}

if (! empty($table)) {
Expand Down