Merge pull request #145 from raw34/fix/primary

fix: fix misspell word primary

README.md

@@ -162,7 +162,7 @@ type UserAccountTbl struct {
 ## 6. support func export
 ### The exported function is only the auxiliary class function of Gorm, and calls Gorm completely
 ```
-// FetchByPrimaryKey primay or index 获取唯一内容
+// FetchByPrimaryKey primary or index 获取唯一内容
 func (obj *_UserAccountTblMgr) FetchByPrimaryKey(ID int) (result UserAccountTbl, err error) {
 	err = obj.DB.Table(obj.GetTableName()).Where("id = ?", ID).Find(&result).Error
 	if err == nil && obj.isRelated {

README_zh_cn.md

@@ -171,7 +171,7 @@ type UserAccountTbl struct {
 ## 6. 支持函数导出(导出函数只是 gorm 的辅助类函数，完全兼调用 gorm)
 
 ```
-// FetchByPrimaryKey primay or index 获取唯一内容
+// FetchByPrimaryKey primary or index 获取唯一内容
 func (obj *_UserAccountTblMgr) FetchByPrimaryKey(ID int) (result UserAccountTbl, err error) {
 	err = obj.DB.Table(obj.GetTableName()).Where("id = ?", ID).Find(&result).Error
 	if err == nil && obj.isRelated {

data/view/genfunc/def.go

@@ -203,8 +203,8 @@ func (obj *_{{$obj.StructName}}Mgr) GetBatchFrom{{$oem.ColStructName}}({{CapLowe
 }
  {{end}}
  //////////////////////////primary index case ////////////////////////////////////////////
- {{range $ofm := $obj.Primay}}
- // {{GenFListIndex $ofm 1}} primay or index 获取唯一内容
+ {{range $ofm := $obj.Primary}}
+ // {{GenFListIndex $ofm 1}} primary or index 获取唯一内容
  func (obj *_{{$obj.StructName}}Mgr) {{GenFListIndex $ofm 1}}({{GenFListIndex $ofm 2}}) (result {{$obj.StructName}}, err error) {
 	err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{GenFListIndex $ofm 3}}", {{GenFListIndex $ofm 4}}).Find(&result).Error
 	{{GenPreloadList $obj.PreloadList false}}

data/view/genfunc/genfunc_test.go

@@ -125,7 +125,7 @@ func TestFuncFetchBy(t *testing.T) {
 	accountMgr := model.AccountMgr(db)
 	accountMgr.SetIsRelated(true) // 打开预加载 (外键)
 
-	account, err := accountMgr.FetchByPrimaryKey(2) // primay key
+	account, err := accountMgr.FetchByPrimaryKey(2) // primary key
 	fmt.Println(err)
 	fmt.Println(account)
 

data/view/genfunc/model/matrix.gen.account.go

@@ -277,7 +277,7 @@ func (obj *_AccountMgr) GetBatchFromName(names []string) (results []*Account, er
 
 //////////////////////////primary index case ////////////////////////////////////////////
 
-// FetchByPrimaryKey primay or index 获取唯一内容
+// FetchByPrimaryKey primary or index 获取唯一内容
 func (obj *_AccountMgr) FetchByPrimaryKey(id int) (result Account, err error) {
 	err = obj.WithContext(obj.ctx).Table(obj.GetTableName()).Where("id = ?", id).Find(&result).Error
 	if err == nil && obj.isRelated {
@@ -291,7 +291,7 @@ func (obj *_AccountMgr) FetchByPrimaryKey(id int) (result Account, err error) {
 	return
 }
 
-// FetchUniqueIndexByAccount primay or index 获取唯一内容
+// FetchUniqueIndexByAccount primary or index 获取唯一内容
 func (obj *_AccountMgr) FetchUniqueIndexByAccount(accountID int, userID int) (result Account, err error) {
 	err = obj.WithContext(obj.ctx).Table(obj.GetTableName()).Where("account_id = ? AND user_id = ?", accountID, userID).Find(&result).Error
 	if err == nil && obj.isRelated {

data/view/genfunc/model/matrix.gen.user.go

@@ -149,7 +149,7 @@ func (obj *_UserMgr) GetBatchFromJob(jobs []int) (results []*User, err error) {
 
 //////////////////////////primary index case ////////////////////////////////////////////
 
-// FetchByPrimaryKey primay or index 获取唯一内容
+// FetchByPrimaryKey primary or index 获取唯一内容
 func (obj *_UserMgr) FetchByPrimaryKey(userID int) (result User, err error) {
 	err = obj.WithContext(obj.ctx).Table(obj.GetTableName()).Where("user_id = ?", userID).Find(&result).Error
 

data/view/model/def.go

@@ -115,7 +115,7 @@ type funDef struct {
 	TableName   string
 	PreloadList []PreloadInfo // 外键列表，(生成关联数据)
 	Em          []EmInfo      // index 列表
-	Primay      []FList       // primay unique
+	Primary     []FList       // primary unique
 	Index       []FList       // index
 }
 

data/view/model/model.go

@@ -376,9 +376,9 @@ func (m *_Model) generateFunc() (genOut []GenOutInfo) {
 			// ---------end--
 		}
 
-		data.Primay = append(data.Primay, primary...)
-		data.Primay = append(data.Primay, unique...)
-		data.Primay = append(data.Primay, uniqueIndex...)
+		data.Primary = append(data.Primary, primary...)
+		data.Primary = append(data.Primary, unique...)
+		data.Primary = append(data.Primary, uniqueIndex...)
 		data.Index = append(data.Index, index...)
 		tmpl, err := template.New("gen_logic").
 			Funcs(template.FuncMap{"GenPreloadList": GenPreloadList, "GenFListIndex": GenFListIndex, "CapLowercase": CapLowercase, "GetTablePrefixName": GetTablePrefixName}).