From 3516c2b4a5357f5ec82fa6247333ad8b63e7f27a Mon Sep 17 00:00:00 2001
From: xxj <346944475@qq.com>
Date: Tue, 8 Dec 2020 18:06:18 +0800
Subject: [PATCH] delete SingularTable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除单表配置模式
---
 README.md                 |  2 --
 README_zh_cn.md           |  2 --
 config.yml                |  1 -
 data/cmd/cmd.go           |  6 +-----
 data/config/MyIni.go      | 17 ++++++++---------
 data/config/common.go     | 22 +++++++++++-----------
 data/config/test_def.go   |  1 -
 data/dlg/cui.go           |  3 ---
 data/dlg/i18n.go          |  6 ------
 data/view/model/common.go |  6 +++---
 doc/export.md             | 10 +++++-----
 doc/export_cn.md          | 10 +++++-----
 12 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 976634d..7c40030 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,6 @@ out_dir : "./model"  # out dir
 url_tag : json # web url tag(json,db(https://github.com/google/go-querystring))
 language :  # language(English,中 文)
 db_tag : gorm # DB tag(gorm,db)
-singular_table : true  # Table name plural (big Camel-Case):gorm.SingularTable
 simple : false #simple output
 is_out_sql : false # Whether to output sql
 is_out_func : true # Whether to output function
@@ -97,7 +96,6 @@ Flags:
 ## 4. Support for gorm attributes
    
 - Database tables, column field annotation support
-- singular_table, Table name plural (big Camel-Case)
 - json tag json tag output
 - gorm.Model [Support export gorm.model>>>](doc/export.md)
 - PRIMARY_KEY	Specifies column as primary key
diff --git a/README_zh_cn.md b/README_zh_cn.md
index a8b1dff..a83252e 100644
--- a/README_zh_cn.md
+++ b/README_zh_cn.md
@@ -45,7 +45,6 @@ out_dir: ./model  # 输出目录
 url_tag: json # web url tag(json,db(https://github.com/google/go-querystring))
 language: 中 文  # 语言(English,中 文)
 db_tag: gorm # 数据库标签(gorm,db)
-singular_table: true  # 单表模式:true:禁用表名复数,false:采用表明复数 参考:gorm.SingularTable
 simple: false # 简单输出(默认gorm标签不输出)
 is_out_sql: false # 是否输出 sql 原信息
 is_out_func: true # 是否输出 快捷函数
@@ -105,7 +104,6 @@ Flags:
 ## 4. 支持gorm 相关属性 
    
 - 数据库表,列字段注释支持
-- singular_table 表名复数(大驼峰)
 - json tag json标签输出
 - gorm.Model 基本模型   [支持gorm.Model模式导出>>>](https://github.com/xxjwxc/gormt/tree/master/doc/export_cn.md)
 - PRIMARY_KEY	将列指定为主键
diff --git a/config.yml b/config.yml
index 6f9e143..a4a7d7f 100644
--- a/config.yml
+++ b/config.yml
@@ -4,7 +4,6 @@ out_dir : ./model  # 输出目录
 url_tag : json # web url tag(json,db(https://github.com/google/go-querystring))
 language :  # 语言(English,中 文)
 db_tag : gorm # 数据库标签(gorm,db)
-singular_table : true  # 单表模式:true:禁用表名复数,false:采用表名复数 参考:gorm.SingularTable
 simple : false # 简单输出(默认gorm标签不输出)
 is_out_sql : false # 是否输出 sql 原信息
 is_out_func : true # 是否输出 快捷函数
diff --git a/data/cmd/cmd.go b/data/cmd/cmd.go
index 6bfda8f..d400c44 100644
--- a/data/cmd/cmd.go
+++ b/data/cmd/cmd.go
@@ -100,13 +100,9 @@ func MergeMysqlDbInfo() {
 	mycobra.IfReplace(rootCmd, "outdir", &dir) // 如果设置了，更新
 	config.SetOutDir(dir)
 
-	st := config.GetSingularTable()
-	mycobra.IfReplace(rootCmd, "singular", &st) // 如果设置了，更新
-	config.SetSingularTable(st)
-
 	fk := config.GetIsForeignKey()
 	mycobra.IfReplace(rootCmd, "foreign", &fk) // 如果设置了，更新
-	config.SetForeignKey(st)
+	config.SetForeignKey(fk)
 
 	funcKey := config.GetIsOutFunc()
 	mycobra.IfReplace(rootCmd, "fun", &funcKey) // 如果设置了，更新
diff --git a/data/config/MyIni.go b/data/config/MyIni.go
index 5fc6258..9025324 100644
--- a/data/config/MyIni.go
+++ b/data/config/MyIni.go
@@ -17,7 +17,6 @@ type Config struct {
 	Simple           bool   `yaml:"simple"`
 	IsWEBTag         bool   `yaml:"is_web_tag"`
 	IsWebTagPkHidden bool   `yaml:"is_web_tag_pk_hidden"` // web标记是否隐藏主键
-	SingularTable    bool   `yaml:"singular_table"`
 	IsForeignKey     bool   `yaml:"is_foreign_key"`
 	IsOutSQL         bool   `yaml:"is_out_sql"`
 	IsOutFunc        bool   `yaml:"is_out_func"`
@@ -71,15 +70,15 @@ func GetOutDir() string {
 	return _map.OutDir
 }
 
-// SetSingularTable Set Disabled Table Name Plurals.设置禁用表名复数
-func SetSingularTable(b bool) {
-	_map.SingularTable = b
-}
+// // SetSingularTable Set Disabled Table Name Plurals.设置禁用表名复数
+// func SetSingularTable(b bool) {
+// 	_map.SingularTable = b
+// }
 
-// GetSingularTable Get Disabled Table Name Plurals.获取禁用表名复数
-func GetSingularTable() bool {
-	return _map.SingularTable
-}
+// // GetSingularTable Get Disabled Table Name Plurals.获取禁用表名复数
+// func GetSingularTable() bool {
+// 	return _map.SingularTable
+// }
 
 // GetSimple simple output.简单输出
 func GetSimple() bool {
diff --git a/data/config/common.go b/data/config/common.go
index fef9c79..ed48cff 100644
--- a/data/config/common.go
+++ b/data/config/common.go
@@ -31,17 +31,17 @@ var _map = Config{
 		Password: "root",
 		Database: "test",
 	},
-	OutDir:        "./model",
-	URLTag:        "json",
-	Language:      "中 文",
-	DbTag:         "gorm",
-	Simple:        false,
-	IsWEBTag:      false,
-	SingularTable: true,
-	IsForeignKey:  true,
-	IsOutSQL:      false,
-	IsOutFunc:     true,
-	IsGUI:         false,
+	OutDir:   "./model",
+	URLTag:   "json",
+	Language: "中 文",
+	DbTag:    "gorm",
+	Simple:   false,
+	IsWEBTag: false,
+	// SingularTable: true,
+	IsForeignKey: true,
+	IsOutSQL:     false,
+	IsOutFunc:    true,
+	IsGUI:        false,
 }
 
 var configPath string
diff --git a/data/config/test_def.go b/data/config/test_def.go
index 476449a..f97b794 100644
--- a/data/config/test_def.go
+++ b/data/config/test_def.go
@@ -13,7 +13,6 @@ service_displayname :  #服务显示名
 sercice_desc :    #服务描述
 is_dev : false  # 是否开发者模式
 out_dir : ./db  # 输出目录
-singular_table : true  # 单表模式:true:禁用表名复数,false:采用表明复数 参考:gorm.SingularTable
 simple : true #简单输出
 isJsonTag : true #是否打json标记
 mysql_info:
diff --git a/data/dlg/cui.go b/data/dlg/cui.go
index 9f55b4d..df9d814 100644
--- a/data/dlg/cui.go
+++ b/data/dlg/cui.go
@@ -221,8 +221,6 @@ func enterSet(g *gocui.Gui, v *gocui.View) error {
 		AddOptions(SLocalize("true"), SLocalize("false")).SetSelected(SLocalize(tools.AsString(config.GetIsDev())))
 	form.AddSelect("is_simple", SLocalize("is_simple"), formPart[0], formPart[2]).
 		AddOptions(SLocalize("true"), SLocalize("false")).SetSelected(SLocalize(tools.AsString(config.GetSimple())))
-	form.AddSelect("is_singular", SLocalize("is_singular"), formPart[0], formPart[2]).
-		AddOptions(SLocalize("true"), SLocalize("false")).SetSelected(SLocalize(tools.AsString(config.GetSingularTable())))
 	form.AddSelect("is_out_sql", SLocalize("is_out_sql"), formPart[0], formPart[2]).
 		AddOptions(SLocalize("true"), SLocalize("false")).SetSelected(SLocalize(tools.AsString(config.GetIsOutSQL())))
 	form.AddSelect("is_out_func", SLocalize("is_out_func"), formPart[0], formPart[2]).
@@ -294,7 +292,6 @@ func buttonSave(g *gocui.Gui, v *gocui.View) error {
 
 	config.SetIsDev(getBool(mp["is_dev"]))
 	config.SetSimple(getBool(mp["is_simple"]))
-	config.SetSingularTable(getBool(mp["is_singular"]))
 	config.SetIsOutSQL(getBool(mp["is_out_sql"]))
 	config.SetIsOutFunc(getBool(mp["is_out_func"]))
 	config.SetForeignKey(getBool(mp["is_foreign_key"]))
diff --git a/data/dlg/i18n.go b/data/dlg/i18n.go
index fe679ae..dc0319b 100644
--- a/data/dlg/i18n.go
+++ b/data/dlg/i18n.go
@@ -74,9 +74,6 @@ func addChinese() error {
 	}, &i18n.Message{
 		ID:    "is_dev",
 		Other: " 开 发 模 式:",
-	}, &i18n.Message{
-		ID:    "is_singular",
-		Other: " 单 表 模 式 :",
 	}, &i18n.Message{
 		ID:    "is_simple",
 		Other: " 简 单 输 出 :",
@@ -174,9 +171,6 @@ func addEnglish() error {
 	}, &i18n.Message{
 		ID:    "is_simple",
 		Other: "is simple :",
-	}, &i18n.Message{
-		ID:    "is_singular",
-		Other: "is singular :",
 	}, &i18n.Message{
 		ID:    "is_out_sql",
 		Other: "is out sql :",
diff --git a/data/view/model/common.go b/data/view/model/common.go
index ac2a275..b536f6b 100644
--- a/data/view/model/common.go
+++ b/data/view/model/common.go
@@ -16,9 +16,9 @@ import (
 
 // getCamelName Big Hump or Capital Letter.大驼峰或者首字母大写
 func getCamelName(name string) string {
-	if !config.GetSingularTable() { // If the table name plural is globally disabled.如果全局禁用表名复数
-		return mybigcamel.Marshal(strings.TrimSuffix(name, "s"))
-	}
+	// if !config.GetSingularTable() { // If the table name plural is globally disabled.如果全局禁用表名复数
+	// 	return mybigcamel.Marshal(strings.TrimSuffix(name, "s"))
+	// }
 
 	return mybigcamel.Marshal(name)
 }
diff --git a/doc/export.md b/doc/export.md
index 6d87276..e63d698 100644
--- a/doc/export.md
+++ b/doc/export.md
@@ -36,7 +36,7 @@ CREATE TABLE `user_account_tbl` (
 
 ### Mult complex export without foreign key
 
-- param:singular_table = false simple = false  is_foreign_key = false
+- param: simple = false  is_foreign_key = false
 
 ###### --->export result
 
@@ -60,7 +60,7 @@ type UserAccountTbl struct {
 
 ### Simple-export-with-JSON
 
-- param:singular_table = false simple = true is_web_tag = true  is_foreign_key = false
+- param: simple = true is_web_tag = true  is_foreign_key = false
 
 ###### --->export result
 
@@ -84,7 +84,7 @@ type UserAccountTbl struct {
 
 ### Simple export without JSON
 
-- param:singular_table = false simple = true is_web_tag = false  is_foreign_key = false
+- param: simple = true is_web_tag = false  is_foreign_key = false
 
 ###### --->export result
 
@@ -108,7 +108,7 @@ type UserAccountTbl struct {
 
 ### Simple with foreign key mode export
 
-- param:singular_table = false simple = true is_web_tag = false  is_foreign_key = true
+- param: simple = true is_web_tag = false  is_foreign_key = true
 
 ###### --->export result
 
@@ -147,7 +147,7 @@ CREATE TABLE `user_info_tbl` (
 
 ### Support export gorm.model
 
-- param:singular_table = false simple = true is_web_tag = false 
+- param: simple = true is_web_tag = false 
 
 ###### --->export result
 
diff --git a/doc/export_cn.md b/doc/export_cn.md
index 037086d..2b75685 100644
--- a/doc/export_cn.md
+++ b/doc/export_cn.md
@@ -36,7 +36,7 @@ CREATE TABLE `user_account_tbl` (
 
 ### 复杂不带外键导出
 
-- 参数:singular_table = false simple = false  is_foreign_key = false
+- 参数: simple = false  is_foreign_key = false
 
 ###### --->导出结果
 
@@ -60,7 +60,7 @@ type UserAccountTbl struct {
 
 ### 简单带json导出
 
-- 参数:singular_table = false simple = true is_web_tag = true  is_foreign_key = false
+- 参数: simple = true is_web_tag = true  is_foreign_key = false
 
 ###### --->导出结果
 
@@ -84,7 +84,7 @@ type UserAccountTbl struct {
 
 ### 简单不带json导出
 
-- 参数:singular_table = false simple = true is_web_tag = false  is_foreign_key = false
+- 参数: simple = true is_web_tag = false  is_foreign_key = false
 
 ###### --->导出结果
 
@@ -108,7 +108,7 @@ type UserAccountTbl struct {
 
 ### 简单带外键模式导出
 
-- 参数:singular_table = false simple = true is_web_tag = false  is_foreign_key = true
+- 参数: simple = true is_web_tag = false  is_foreign_key = true
 
 ###### --->导出结果
 
@@ -147,7 +147,7 @@ CREATE TABLE `user_info_tbl` (
 
 ### 支持gorm.Model模式导出
 
-- 参数:singular_table = false simple = true is_web_tag = false 
+- 参数: simple = true is_web_tag = false 
 
 ###### --->导出结果