diff --git a/internal/create_files/create_files.go b/internal/create_files/create_files.go index fd26435..b488d3f 100644 --- a/internal/create_files/create_files.go +++ b/internal/create_files/create_files.go @@ -347,7 +347,7 @@ func ReplacePrimaryKeyOtvetID_ManyPK1(Text string, Table1 *types.Table, Variable TextOtvetIDID = TextOtvetIDID + "\t" + VariableName + "." + Column1.NameGo + " = " + Column1.NameGo + "\n" RequestColumnName := FindRequestColumnName(Table1, Column1) TextIDRequestID = TextIDRequestID + "\t" + Column1.NameGo + " := Request." + RequestColumnName + "\n" - TextM := ConvertColumnToAlias(Otvet, Table1, Column1, "m") + TextM := FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m") TextRequestIDmID = TextRequestIDmID + "\t" + VariableName + "." + RequestColumnName + " = " + TextM + "\n" TextInt64ID := FindTextConvertGolangTypeToProtobufType(Table1, Column1, "") TextRequestIDInt64ID = TextRequestIDInt64ID + "\t" + VariableName + "." + RequestColumnName + " = " + TextInt64ID + "\n" @@ -439,9 +439,12 @@ func ReplacePrimaryKeyM_ID1(Text string, Table1 *types.Table) string { Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(m.ID)", OtvetColumnName) Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(ID)", Alias+"("+ColumnNamePK+")") } else { + DefaultValue := FindTextDefaultValue(ColumnTypeGoPK) + Otvet = strings.ReplaceAll(Otvet, "IntFromAlias(m.ID) == 0", "m."+ColumnNamePK+" == "+DefaultValue) Otvet = strings.ReplaceAll(Otvet, "IntFromAlias(m.ID)", "m."+ColumnNamePK+"") Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(m.ID)", OtvetColumnName) Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(ID)", "ID") + Otvet = strings.ReplaceAll(Otvet, " ID=0", " "+ColumnNamePK+"="+DefaultValue) } return Otvet @@ -1785,7 +1788,7 @@ func FindTextConvertGolangTypeToProtobufType(Table1 *types.Table, Column1 *types return Otvet } - Otvet = VariableName + Column1.NameGo + Otvet = VariableName + "." + Column1.NameGo //TableName := Table1.Name //IDName := Column1.Name @@ -1804,21 +1807,21 @@ func FindTextConvertGolangTypeToProtobufType(Table1 *types.Table, Column1 *types //преобразуем alias в обычный тип, и дату в timestamp switch Column1.TypeGo { case "time.Time": - Otvet = "timestamppb.New(" + VariableName + Column1.NameGo + ")" + Otvet = "timestamppb.New(" + VariableName + "." + Column1.NameGo + ")" case "string": - Otvet = "string(" + VariableName + Column1.NameGo + ")" + Otvet = "string(" + VariableName + "." + Column1.NameGo + ")" case "int64": - Otvet = "int64(" + VariableName + Column1.NameGo + ")" + Otvet = "int64(" + VariableName + "." + Column1.NameGo + ")" case "int32": - Otvet = "int32(" + VariableName + Column1.NameGo + ")" + Otvet = "int32(" + VariableName + "." + Column1.NameGo + ")" case "bool": - Otvet = "bool(" + VariableName + Column1.NameGo + ")" + Otvet = "bool(" + VariableName + "." + Column1.NameGo + ")" case "float32": - Otvet = "float32(" + VariableName + Column1.NameGo + ")" + Otvet = "float32(" + VariableName + "." + Column1.NameGo + ")" case "float64": - Otvet = "float64(" + VariableName + Column1.NameGo + ")" + Otvet = "float64(" + VariableName + "." + Column1.NameGo + ")" case "uuid.UUID": - Otvet = VariableName + Column1.NameGo + ".String()" + Otvet = VariableName + "." + Column1.NameGo + ".String()" } return Otvet diff --git a/internal/create_files/grpc_client_tables/grpc_client_tables.go b/internal/create_files/grpc_client_tables/grpc_client_tables.go index 38a9426..ad5f029 100644 --- a/internal/create_files/grpc_client_tables/grpc_client_tables.go +++ b/internal/create_files/grpc_client_tables/grpc_client_tables.go @@ -529,7 +529,7 @@ func FindTextUpdateEveryColumn1(TextGRPC_ClientUpdateFunc string, Table1 *types. Otvet = create_files.ReplacePrimaryKeyM_ID(Otvet, Table1) // - ColumnNameGolang := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m.") + ColumnNameGolang := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m") _, IDTypeGo := create_files.FindPrimaryKeyNameTypeGo(Table1) diff --git a/internal/create_files/server_grpc_tables/server_grpc_tables.go b/internal/create_files/server_grpc_tables/server_grpc_tables.go index fce8ae4..06e3f90 100644 --- a/internal/create_files/server_grpc_tables/server_grpc_tables.go +++ b/internal/create_files/server_grpc_tables/server_grpc_tables.go @@ -527,7 +527,7 @@ func FindTextUpdateEveryColumn1(TextGRPCServerUpdateFunc string, Table1 *types.T //замена ID на PrimaryKey Otvet = create_files.ReplacePrimaryKeyM_ID(Otvet, Table1) - //ColumnNameGolang := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m.") + //ColumnNameGolang := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m") Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_MODEL+"_Update", ModelName+"_"+FuncName) Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_MODEL, ModelName) @@ -685,7 +685,7 @@ func FindTextUpdateEveryColumnTest1(TextGRPCServerUpdateFunc string, Table1 *typ ColumnName := Column1.NameGo FuncName := "Update_" + ColumnName _, TextRequestField, TextRequestFieldGolang, _ := create_files.FindTextProtobufRequest_ID_Type(Table1, Column1, "Request2.") - TextModelColumnName := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m.") + TextModelColumnName := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m") TextRequestID := create_files.FindTextProtobufRequest_ManyPK(Table1) //Postgres_ID_Test = ID Minimum