From b841c1ce32ae01c9c590ca37a1a4ffc20e52ee40 Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Wed, 20 Aug 2025 10:02:19 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20ReadObje?= =?UTF-8?q?ct=5Fctx()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crud_objects/crud_tables_object_function.go_ | 16 +++++++++------- .../crud_readobject_tables_crud.go | 4 ++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bin/templates/pkg/db/crud_objects/crud_tables_object_function.go_ b/bin/templates/pkg/db/crud_objects/crud_tables_object_function.go_ index 3e6375f..55847b9 100644 --- a/bin/templates/pkg/db/crud_objects/crud_tables_object_function.go_ +++ b/bin/templates/pkg/db/crud_objects/crud_tables_object_function.go_ @@ -1,10 +1,12 @@ //FieldNameTable - ModelNameColumn:= TableNameForeign.ModelNameForeign{} - ModelNameColumnID := m.FieldNameTable - ModelNameColumn.PrimaryKeyNameFK = IntFromAlias(ModelNameColumnID) - err = crud_TableNameForeign.Read_ctx(ctx, db, &ModelNameColumn) - if err != nil { - err = fmt.Errorf(ModelNameColumn.TableNameDB()+" Read() FieldNamesWithPercent, error: %w", FieldNamesWithCommaM, err) + if m.FieldNameTable != ReplaceDefaultValue { + ModelNameColumn := TableNameForeign.ModelNameForeign{} + ModelNameColumnID := m.FieldNameTable + ModelNameColumn.PrimaryKeyNameFK = IntFromAlias(ModelNameColumnID) + err = crud_TableNameForeign.Read_ctx(ctx, db, &ModelNameColumn) + if err != nil { + err = fmt.Errorf(ModelNameColumn.TableNameDB()+" Read() FieldNamesWithPercent, error: %w", FieldNamesWithCommaM, err) + } + m.ModelNameColumn = ModelNameColumn } - m.ModelNameColumn = ModelNameColumn diff --git a/internal/create_files/crud_readobject_tables/crud_readobject_tables_crud.go b/internal/create_files/crud_readobject_tables/crud_readobject_tables_crud.go index 0ae3397..69deb33 100644 --- a/internal/create_files/crud_readobject_tables/crud_readobject_tables_crud.go +++ b/internal/create_files/crud_readobject_tables/crud_readobject_tables_crud.go @@ -224,6 +224,10 @@ func CreateFiles_ReadObject_Table1(MapAll map[string]*types.Table, Table1 *types //crud_ Otvet = strings.ReplaceAll(Otvet, " crud_", " "+config.Settings.PREFIX_CRUD) + // + DefaultValue := create_files.FindText_DefaultValue(Column1.TypeGo) + Otvet = strings.ReplaceAll(Otvet, "ReplaceDefaultValue", DefaultValue) + return Otvet }