From a0d89ee93a9233fb1ae4f1df4c5237005f60da88 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 20 Feb 2022 20:52:15 +0000 Subject: [PATCH] Revert "UNSURE explicitly init NullUUIDs" This reverts commit 62085cb69439d36db301dc9097ae1f259fdd0d9e. --- postgres/ynab-import.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/postgres/ynab-import.go b/postgres/ynab-import.go index 8e63cce..8892d8f 100644 --- a/postgres/ynab-import.go +++ b/postgres/ynab-import.go @@ -320,7 +320,7 @@ func (ynab *YNABImport) GetAccount(context context.Context, name string) (*Accou func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.NullUUID, error) { if name == "" { - return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, nil + return uuid.NullUUID{}, nil } for _, pay := range ynab.payees { @@ -331,7 +331,7 @@ func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.Nul payee, err := ynab.queries.CreatePayee(context, CreatePayeeParams{Name: name, BudgetID: ynab.budgetID}) if err != nil { - return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err + return uuid.NullUUID{}, err } ynab.payees = append(ynab.payees, payee) @@ -340,7 +340,7 @@ func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.Nul func (ynab *YNABImport) GetCategory(context context.Context, group string, name string) (uuid.NullUUID, error) { if group == "" || name == "" { - return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, nil + return uuid.NullUUID{}, nil } for _, category := range ynab.categories { @@ -354,7 +354,7 @@ func (ynab *YNABImport) GetCategory(context context.Context, group string, name createCategory := CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID} category, err := ynab.queries.CreateCategory(context, createCategory) if err != nil { - return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err + return uuid.NullUUID{}, err } getCategory := GetCategoriesRow{ @@ -370,13 +370,13 @@ func (ynab *YNABImport) GetCategory(context context.Context, group string, name categoryGroup, err := ynab.queries.CreateCategoryGroup(context, CreateCategoryGroupParams{Name: group, BudgetID: ynab.budgetID}) if err != nil { - return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err + return uuid.NullUUID{}, err } ynab.categoryGroups = append(ynab.categoryGroups, categoryGroup) category, err := ynab.queries.CreateCategory(context, CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID}) if err != nil { - return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err + return uuid.NullUUID{}, err } getCategory := GetCategoriesRow{