go/crud_generator
1
0
Fork 0
mirror of https://github.com/ManyakRus/crud_generator.git synced 2025-01-20 09:09:22 +02:00
Code Issues Releases Activity

сделал refactoring

Browse Source
This commit is contained in:
Nikitin Aleksandr 2024-09-09 16:26:52 +03:00
parent 5a84dd2719
commit 7b39c5f5f4
5 changed files with 289 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
internal/create_files/create_files.go
View File

@ -1640,27 +1640,6 @@ func IsStringOrUUID(TypeGo string) bool {
return false
}
// Convert_RequestIdToAlias - заменяет ID на Alias
func Convert_RequestIdToAlias(Text string, Table1 *types.Table) string {
Otvet := Text
TableName := Table1.Name
IDName, _ := Find_PrimaryKeyNameType(Table1)
TextConvert, ok := types.MapConvertID[TableName+"."+IDName]
if ok == false {
return Otvet
}
Otvet = strings.ReplaceAll(Otvet, "Request.ID", TextConvert+"(Request.ID)")
if TextConvert[:6] != "alias." {
return Otvet
}
Otvet = CheckAndAdd_ImportAlias(Otvet)
return Otvet
}
// Convert_IDToAlias - заменяет "ID" на "alias.Name(ID)"
func Convert_IDToAlias(Table1 *types.Table, Column1 *types.Column, VariableName string) string {
Otvet := VariableName
@ -2145,68 +2124,6 @@ func FindText_IDMinimum(Column1 *types.Column) string {
return Otvet
}
// Replace_Model_ID_Test - заменяет текст "const LawsuitStatusType_ID_Test = 0" на нужный ИД
func Replace_Model_ID_Test(Text string, Table1 *types.Table) string {
Otvet := Text
//if Table1.PrimaryKeyColumnsCount == 1 {
// PrimaryKeyColumn := Find_PrimaryKeyColumn(Table1)
// if PrimaryKeyColumn == nil {
// return Otvet
// }
//
// Otvet = Replace_Model_ID_Test1(Otvet, Table1, PrimaryKeyColumn)
//} else {
Otvet = Replace_Model_ID_Test_ManyPK(Otvet, Table1)
//}
return Otvet
}
// Replace_Model_ID_Test_ManyPK - заменяет текст "const Postgres_ID_Test = 0" на нужные ИД, для много колонок PrimaryKey
func Replace_Model_ID_Test_ManyPK(Text string, Table1 *types.Table) string {
Otvet := Text
MassPK := Find_PrimaryKeyColumns(Table1)
if len(MassPK) == 0 {
return Otvet
}
//заменим const Postgres_ID_Test = 0
TextFind := "const LawsuitStatusType_ID_Test = 0\n"
TextNew := ""
for _, Column1 := range MassPK {
TextNew = TextNew + Replace_Model_ID_Test1(TextFind, Table1, Column1)
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
//заменим Request.ID = LawsuitStatusType_ID_Test
TextFind = "\tRequest.ID = LawsuitStatusType_ID_Test\n"
TextNew = ""
for _, Column1 := range MassPK {
Name := strings.ToUpper(Column1.NameGo)
VariableName := Table1.NameGo + "_" + Name + "_Test"
//Text1 := Convert_GolangVariableToProtobufVariable(Table1, Column1, VariableName)
RequestColumnName := Find_RequestFieldName(Table1, Column1)
TextNew = TextNew + "\tRequest." + RequestColumnName + " = " + VariableName + "\n"
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
//заменим Request.ID = LawsuitStatusType_ID_Test
TextFind = "\tRequest2.ID = LawsuitStatusType_ID_Test\n"
TextNew = ""
for _, Column1 := range MassPK {
Name := strings.ToUpper(Column1.NameGo)
VariableName := Table1.NameGo + "_" + Name + "_Test"
//Text1 := Convert_GolangVariableToProtobufVariable(Table1, Column1, VariableName)
RequestColumnName := Find_RequestFieldName(Table1, Column1)
TextNew = TextNew + "\tRequest2." + RequestColumnName + " = " + VariableName + "\n"
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
return Otvet
}
// Replace_Model_ID_Test1 - заменяет текст "const LawsuitStatusType_ID_Test = 0" на нужный ИД
func Replace_Model_ID_Test1(Text string, Table1 *types.Table, Column1 *types.Column) string {
Otvet := Text
@ -2263,13 +2180,6 @@ func ReplaceText_RequestID_and_Column(Text string, Table1 *types.Table, Column1
func ReplaceText_RequestID_PrimaryKey(Text string, Table1 *types.Table) string {
Otvet := Text
//if Table1.PrimaryKeyColumnsCount == 1 {
// TextRequest := "Request"
// Otvet = ReplaceText_RequestID_PrimaryKey1(Otvet, Table1, TextRequest)
//
// TextRequest = "Request2"
// Otvet = ReplaceText_RequestID_PrimaryKey1(Otvet, Table1, TextRequest)
//} else {
TextRequest := "Request"
Otvet = ReplaceText_RequestID_PrimaryKey_ManyPK(Otvet, Table1, TextRequest)
@ -2500,19 +2410,6 @@ func Replace_OtvetIDEqual0(Text string, Table1 *types.Table) string {
return Otvet
}
// Replace_ModelIDEqual1 - заменяет Otvet.ID = -1
func Replace_ModelIDEqual1(Text string, Table1 *types.Table) string {
Otvet := Text
//if Table1.PrimaryKeyColumnsCount == 1 {
// Otvet = ReplaceModelIDEqual1_1(Otvet, Table1)
//} else {
Otvet = Replace_ModelIDEqual1_ManyPK(Otvet, Table1)
//}
return Otvet
}
//// Replace_ModelIDEqual1 - заменяет Otvet.ID = -1
//func ReplaceModelIDEqual1_1(Text string, Table1 *types.Table) string {
// Otvet := Text
@ -2529,23 +2426,6 @@ func Replace_ModelIDEqual1(Text string, Table1 *types.Table) string {
// return Otvet
//}
// Replace_ModelIDEqual1_ManyPK - заменяет m.ID = -1
func Replace_ModelIDEqual1_ManyPK(Text string, Table1 *types.Table) string {
Otvet := Text
TextFind := "\tm.ID = -1\n"
TextNew := ""
MassPrimaryKey := Find_PrimaryKeyColumns(Table1)
for _, Column1 := range MassPrimaryKey {
Value := Find_NegativeValue(Column1.TypeGo)
TextNew = TextNew + "\tm." + Column1.NameGo + " = " + Value + "\n"
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
return Otvet
}
// Find_NegativeValue - возвращает -1 для числовых типов
func Find_NegativeValue(TypeGo string) string {
Otvet := ""
@ -2881,3 +2761,24 @@ func Find_ColumnNamesWithComma(MassColumns []*types.Column) string {
return Otvet
}
// Convert_RequestIdToAlias - заменяет ID на Alias
func Convert_RequestIdToAlias(Text string, Table1 *types.Table) string {
Otvet := Text
TableName := Table1.Name
IDName, _ := Find_PrimaryKeyNameType(Table1)
TextConvert, ok := types.MapConvertID[TableName+"."+IDName]
if ok == false {
return Otvet
}
Otvet = strings.ReplaceAll(Otvet, "Request.ID", TextConvert+"(Request.ID)")
if TextConvert[:6] != "alias." {
return Otvet
}
Otvet = CheckAndAdd_ImportAlias(Otvet)
return Otvet
}

63
internal/create_files/server_grpc_tables/server_grpc_tables.go
View File

@ -5,6 +5,7 @@ import (
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"strings"
)
// CreateAllFiles - создаёт все файлы в папке grpc_server
@ -106,3 +107,65 @@ func CreateAllFiles(MapAll map[string]*types.Table) error {
}
return err
}
// Replace_Model_ID_Test - заменяет текст "const LawsuitStatusType_ID_Test = 0" на нужный ИД
func Replace_Model_ID_Test(Text string, Table1 *types.Table) string {
Otvet := Text
//if Table1.PrimaryKeyColumnsCount == 1 {
// PrimaryKeyColumn := Find_PrimaryKeyColumn(Table1)
// if PrimaryKeyColumn == nil {
// return Otvet
// }
//
// Otvet = Replace_Model_ID_Test1(Otvet, Table1, PrimaryKeyColumn)
//} else {
Otvet = Replace_Model_ID_Test_ManyPK(Otvet, Table1)
//}
return Otvet
}
// Replace_Model_ID_Test_ManyPK - заменяет текст "const Postgres_ID_Test = 0" на нужные ИД, для много колонок PrimaryKey
func Replace_Model_ID_Test_ManyPK(Text string, Table1 *types.Table) string {
Otvet := Text
MassPK := create_files.Find_PrimaryKeyColumns(Table1)
if len(MassPK) == 0 {
return Otvet
}
//заменим const Postgres_ID_Test = 0
TextFind := "const LawsuitStatusType_ID_Test = 0\n"
TextNew := ""
for _, Column1 := range MassPK {
TextNew = TextNew + create_files.Replace_Model_ID_Test1(TextFind, Table1, Column1)
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
//заменим Request.ID = LawsuitStatusType_ID_Test
TextFind = "\tRequest.ID = LawsuitStatusType_ID_Test\n"
TextNew = ""
for _, Column1 := range MassPK {
Name := strings.ToUpper(Column1.NameGo)
VariableName := Table1.NameGo + "_" + Name + "_Test"
//Text1 := Convert_GolangVariableToProtobufVariable(Table1, Column1, VariableName)
RequestColumnName := create_files.Find_RequestFieldName(Table1, Column1)
TextNew = TextNew + "\tRequest." + RequestColumnName + " = " + VariableName + "\n"
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
//заменим Request.ID = LawsuitStatusType_ID_Test
TextFind = "\tRequest2.ID = LawsuitStatusType_ID_Test\n"
TextNew = ""
for _, Column1 := range MassPK {
Name := strings.ToUpper(Column1.NameGo)
VariableName := Table1.NameGo + "_" + Name + "_Test"
//Text1 := Convert_GolangVariableToProtobufVariable(Table1, Column1, VariableName)
RequestColumnName := create_files.Find_RequestFieldName(Table1, Column1)
TextNew = TextNew + "\tRequest2." + RequestColumnName + " = " + VariableName + "\n"
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
return Otvet
}

2
internal/create_files/server_grpc_tables/server_grpc_tables_cache.go
View File

@ -155,7 +155,7 @@ func CreateFilesCacheTest(Table1 *types.Table) error {
TextGRPCServer = create_files.Replace_Connect_WithApplicationName(TextGRPCServer)
//Postgres_ID_Test = ID Minimum
TextGRPCServer = create_files.Replace_Model_ID_Test(TextGRPCServer, Table1)
TextGRPCServer = Replace_Model_ID_Test(TextGRPCServer, Table1)
//замена RequestId{}
TextGRPCServer = create_files.ReplaceText_RequestID_PrimaryKey(TextGRPCServer, Table1)

223
internal/create_files/server_grpc_tables/server_grpc_tables_crud.go
View File

@ -9,6 +9,7 @@ import (
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"os"
"sort"
"strings"
)
@ -58,16 +59,16 @@ func CreateFiles(Table1 *types.Table) error {
}
//замена "m.ID = AliasFromInt(ID)"
TextGRPCServer = create_files.Replace_PrimaryKeyM_ID(TextGRPCServer, Table1)
TextGRPCServer = Replace_PrimaryKeyM_ID(TextGRPCServer, Table1)
//замена "ID := Request.ID"
TextGRPCServer = create_files.Replace_PrimaryKeyOtvetID(TextGRPCServer, Table1)
//TextGRPCServer = create_files.Replace_PrimaryKeyOtvetID(TextGRPCServer, Table1)
//замена RequestId{}
TextGRPCServer = create_files.ReplaceText_RequestID_PrimaryKey(TextGRPCServer, Table1)
TextGRPCServer = ReplaceText_RequestID_PrimaryKey(TextGRPCServer, Table1)
//замена int64(ID) на ID
TextGRPCServer = create_files.Replace_IDtoID(TextGRPCServer, Table1)
//TextGRPCServer = create_files.Replace_IDtoID(TextGRPCServer, Table1)
//добавим импорт uuid
TextGRPCServer = create_files.CheckAndAdd_ImportUUID_FromText(TextGRPCServer)
@ -160,19 +161,19 @@ func CreateFilesTest(Table1 *types.Table) error {
}
//Postgres_ID_Test = ID Minimum
TextGRPCServer = create_files.Replace_Model_ID_Test(TextGRPCServer, Table1)
TextGRPCServer = Replace_Model_ID_Test(TextGRPCServer, Table1)
//замена RequestId{}
TextGRPCServer = create_files.ReplaceText_RequestID_PrimaryKey(TextGRPCServer, Table1)
TextGRPCServer = ReplaceText_RequestID_PrimaryKey(TextGRPCServer, Table1)
//замена Otvet.ID = -1
TextGRPCServer = create_files.Replace_ModelIDEqual1(TextGRPCServer, Table1)
TextGRPCServer = Replace_ModelIDEqual1(TextGRPCServer, Table1)
//добавим импорт uuid
TextGRPCServer = create_files.CheckAndAdd_ImportUUID_FromText(TextGRPCServer)
//
TextGRPCServer = create_files.Replace_OtvetIDEqual0(TextGRPCServer, Table1)
TextGRPCServer = Replace_OtvetIDEqual0(TextGRPCServer, Table1)
}
//создание текста
@ -180,20 +181,9 @@ func CreateFilesTest(Table1 *types.Table) error {
TextGRPCServer = create_files.Replace_TemplateTableName_to_TableName(TextGRPCServer, Table1.Name)
TextGRPCServer = create_files.AddText_ModuleGenerated(TextGRPCServer)
//ModelName := Table1.NameGo
//TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_MODEL, ModelName)
//TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_TABLENAME, Table1.Name)
//TextGRPCServer = config.Settings.TEXT_MODULE_GENERATED + TextGRPCServer
//Postgres_ID_Test = ID Minimum
//if Table1.IDMinimum != "" {
// TextFind := "const " + ModelName + "_ID_Test = "
// TextGRPCServer = strings.ReplaceAll(TextGRPCServer, TextFind+"0", TextFind+Table1.IDMinimum)
//}
// замена ID на PrimaryKey
TextGRPCServer = create_files.Replace_PrimaryKeyOtvetID(TextGRPCServer, Table1)
TextGRPCServer = create_files.Replace_PrimaryKeyM_ID(TextGRPCServer, Table1)
//TextGRPCServer = create_files.Replace_PrimaryKeyOtvetID(TextGRPCServer, Table1)
//TextGRPCServer = create_files.Replace_PrimaryKeyM_ID(TextGRPCServer, Table1)
//SkipNow()
TextGRPCServer = create_files.AddSkipNow(TextGRPCServer, Table1)
@ -331,3 +321,194 @@ func DeleteFuncTestFind_byExtID(Text string, Table1 *types.Table) string {
return Otvet
}
// Replace_PrimaryKey_ID - заменяет "m.ID" на название колонки PrimaryKey
func Replace_PrimaryKeyM_ID(Text string, Table1 *types.Table) string {
Otvet := Text
VariableName := "m"
//сортировка по названию таблиц
keys := make([]string, 0, len(Table1.MapColumns))
for k := range Table1.MapColumns {
keys = append(keys, k)
}
sort.Strings(keys)
TextOtvetIDAliasID := ""
TextIfMId := ""
TextIfMIdNot0 := ""
TextM2ID := ""
TextIDRequestID := ""
TextOtvetIDID := ""
TextRequestIDmID := ""
TextRequestIDInt64ID := ""
TextOtvetIDmID := ""
TextMID0 := ""
TextOR := ""
for _, key1 := range keys {
Column1, _ := Table1.MapColumns[key1]
if Column1.IsPrimaryKey != true {
continue
}
TextOtvetIDID = TextOtvetIDID + "\t" + VariableName + "." + Column1.NameGo + " = " + Column1.NameGo + "\n"
RequestColumnName := create_files.Find_RequestFieldName(Table1, Column1)
Value, GolangCode := create_files.Convert_ProtobufVariableToGolangVariable(Table1, Column1, "Request.")
if GolangCode == "" {
TextIDRequestID = TextIDRequestID + "\t" + Column1.NameGo + " := " + Value + "\n"
} else {
TextIDRequestID = TextIDRequestID + "\t" + GolangCode + "\n"
}
TextM := create_files.Convert_GolangVariableToProtobufVariable(Table1, Column1, "m")
TextRequestIDmID = TextRequestIDmID + "\t" + VariableName + "." + RequestColumnName + " = " + TextM + "\n"
TextInt64ID := create_files.Convert_GolangVariableToProtobufVariable(Table1, Column1, "")
TextRequestIDInt64ID = TextRequestIDInt64ID + "\t" + VariableName + "." + RequestColumnName + " = " + TextInt64ID + "\n"
TextOtvetIDmID = TextOtvetIDmID + "\t" + "Otvet." + Column1.NameGo + " = " + VariableName + "." + Column1.NameGo + "\n"
DefaultValue := create_files.FindText_DefaultValue(Column1.TypeGo)
TextM2ID = TextM2ID + "\t" + "m2." + Column1.NameGo + " = " + "m." + Column1.NameGo + "\n"
TextIfMId = TextIfMId + TextOR + "m." + Column1.NameGo + " == " + DefaultValue
TextIfMIdNot0 = TextIfMIdNot0 + TextOR + "m." + Column1.NameGo + " != " + DefaultValue
TextMID0 = TextMID0 + TextOR + " (" + VariableName + "." + Column1.NameGo + " == " + DefaultValue + ")"
TextAlias := create_files.Convert_IDToAlias(Table1, Column1, Column1.NameGo)
TextOtvetIDAliasID = TextOtvetIDAliasID + "\t" + VariableName + "." + Column1.NameGo + " = " + TextAlias + "\n"
TextOR = " || "
}
Otvet = strings.ReplaceAll(Otvet, "\t"+VariableName+".ID = AliasFromInt(ID)", TextOtvetIDAliasID)
//заменим ID := Request.ID
Otvet = strings.ReplaceAll(Otvet, "\tID := Request.ID\n", TextIDRequestID)
return Otvet
}
//// Replace_PrimaryKeyOtvet_ID - заменяет "m.ID" на название колонки PrimaryKey
//func Replace_PrimaryKeyOtvet_ID(Text string, Table1 *types.Table) string {
// Otvet := Text
//
// VariableName := "Otvet"
//
// //сортировка по названию таблиц
// keys := make([]string, 0, len(Table1.MapColumns))
// for k := range Table1.MapColumns {
// keys = append(keys, k)
// }
// sort.Strings(keys)
//
// TextOtvetIDAliasID := ""
// TextIfMId := ""
// TextIfMIdNot0 := ""
// TextM2ID := ""
// TextIDRequestID := ""
// TextOtvetIDID := ""
// TextRequestIDmID := ""
// TextRequestIDInt64ID := ""
// TextOtvetIDmID := ""
// TextMID0 := ""
// TextOR := ""
// for _, key1 := range keys {
// Column1, _ := Table1.MapColumns[key1]
// if Column1.IsPrimaryKey != true {
// continue
// }
// TextOtvetIDID = TextOtvetIDID + "\t" + VariableName + "." + Column1.NameGo + " = " + Column1.NameGo + "\n"
// RequestColumnName := create_files.Find_RequestFieldName(Table1, Column1)
// Value, GolangCode := create_files.Convert_ProtobufVariableToGolangVariable(Table1, Column1, "Request.")
// if GolangCode == "" {
// TextIDRequestID = TextIDRequestID + "\t" + Column1.NameGo + " := " + Value + "\n"
// } else {
// TextIDRequestID = TextIDRequestID + "\t" + GolangCode + "\n"
// }
// TextM := create_files.Convert_GolangVariableToProtobufVariable(Table1, Column1, "m")
// TextRequestIDmID = TextRequestIDmID + "\t" + VariableName + "." + RequestColumnName + " = " + TextM + "\n"
// TextInt64ID := create_files.Convert_GolangVariableToProtobufVariable(Table1, Column1, "")
// TextRequestIDInt64ID = TextRequestIDInt64ID + "\t" + VariableName + "." + RequestColumnName + " = " + TextInt64ID + "\n"
// TextOtvetIDmID = TextOtvetIDmID + "\t" + "Otvet." + Column1.NameGo + " = " + VariableName + "." + Column1.NameGo + "\n"
//
// DefaultValue := create_files.FindText_DefaultValue(Column1.TypeGo)
//
// TextM2ID = TextM2ID + "\t" + "m2." + Column1.NameGo + " = " + "m." + Column1.NameGo + "\n"
// TextIfMId = TextIfMId + TextOR + "m." + Column1.NameGo + " == " + DefaultValue
// TextIfMIdNot0 = TextIfMIdNot0 + TextOR + "m." + Column1.NameGo + " != " + DefaultValue
//
// TextMID0 = TextMID0 + TextOR + " (" + VariableName + "." + Column1.NameGo + " == " + DefaultValue + ")"
// TextAlias := create_files.Convert_IDToAlias(Table1, Column1, Column1.NameGo)
// TextOtvetIDAliasID = TextOtvetIDAliasID + "\t" + VariableName + "." + Column1.NameGo + " = " + TextAlias + "\n"
// TextOR = " || "
// }
//
// Otvet = strings.ReplaceAll(Otvet, "\t"+VariableName+".ID = AliasFromInt(ID)", TextOtvetIDAliasID)
//
// return Otvet
//}
// ReplaceText_RequestID_PrimaryKey - заменяет RequestId{} на RequestString{}
func ReplaceText_RequestID_PrimaryKey(Text string, Table1 *types.Table) string {
Otvet := Text
TextRequestID := create_files.FindText_ProtobufRequest_ManyPK(Table1)
Otvet = strings.ReplaceAll(Otvet, "RequestId{}", TextRequestID+"{}")
Otvet = strings.ReplaceAll(Otvet, "*grpc_proto.RequestId", "*grpc_proto."+TextRequestID)
return Otvet
}
// Replace_ModelIDEqual1 - заменяет Otvet.ID = -1
func Replace_ModelIDEqual1(Text string, Table1 *types.Table) string {
Otvet := Text
Otvet = Replace_ModelIDEqual1_ManyPK(Otvet, Table1)
return Otvet
}
// Replace_ModelIDEqual1_ManyPK - заменяет m.ID = -1
func Replace_ModelIDEqual1_ManyPK(Text string, Table1 *types.Table) string {
Otvet := Text
TextFind := "\tm.ID = -1\n"
TextNew := ""
MassPrimaryKey := create_files.Find_PrimaryKeyColumns(Table1)
for _, Column1 := range MassPrimaryKey {
Value := create_files.Find_NegativeValue(Column1.TypeGo)
TextNew = TextNew + "\tm." + Column1.NameGo + " = " + Value + "\n"
}
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
return Otvet
}
// Replace_OtvetIDEqual0 - заменяет Otvet.ID = -1
func Replace_OtvetIDEqual0(Text string, Table1 *types.Table) string {
Otvet := Text
ColumnsPK := create_files.Find_PrimaryKeyColumns(Table1)
if len(ColumnsPK) == 0 {
return Otvet
}
////
//TextFind := "\tOtvet.ID = 0\n"
//TextNew := ""
//for _, ColumnPK1 := range ColumnsPK {
// Value := create_files.FindText_DefaultValue(ColumnPK1.TypeGo)
// TextNew = TextNew + "\tOtvet." + ColumnPK1.NameGo + " = " + Value + "\n"
//}
//Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
//
TextFind := " Otvet.ID == 0"
for _, ColumnPK1 := range ColumnsPK {
Value := create_files.FindText_DefaultValue(ColumnPK1.TypeGo)
TextNew := " Otvet." + ColumnPK1.NameGo + " == " + Value + ""
Otvet = strings.ReplaceAll(Otvet, TextFind, TextNew)
break
}
return Otvet
}

4
internal/create_files/server_grpc_tables/server_grpc_tables_update.go
View File

@ -261,7 +261,7 @@ func CreateFilesUpdateEveryColumnTest(Table1 *types.Table) error {
TextUpdateEveryColumn := FindTextUpdateEveryColumnTest(TextGRPCServerUpdateFunc, Table1)
//Postgres_ID_Test = ID Minimum
TextGRPCServer = create_files.Replace_Model_ID_Test(TextGRPCServer, Table1)
TextGRPCServer = Replace_Model_ID_Test(TextGRPCServer, Table1)
TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_MODEL, Table1.NameGo)
TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_TABLENAME, Table1.Name)
@ -340,7 +340,7 @@ func FindTextUpdateEveryColumnTest1(TextGRPCServerUpdateFunc string, Table1 *typ
TextRequestID := create_files.FindText_ProtobufRequest_ManyPK(Table1)
//Postgres_ID_Test = ID Minimum
Otvet = create_files.Replace_Model_ID_Test(Otvet, Table1)
Otvet = Replace_Model_ID_Test(Otvet, Table1)
//if TextGolangLine != "" {
// Otvet = strings.ReplaceAll(Otvet, "value := Request.FieldName", TextGolangLine)