From d18374e72a9f85ce24a8a72ffce1b0559ab3ebc6 Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Tue, 23 May 2023 04:31:22 +0400 Subject: [PATCH] Put Categories() down under the New*, Edit*, and DeleteCategory methods. --- pkg/mindflow/database/sqlite/db.go | 56 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkg/mindflow/database/sqlite/db.go b/pkg/mindflow/database/sqlite/db.go index d73d518..5427668 100644 --- a/pkg/mindflow/database/sqlite/db.go +++ b/pkg/mindflow/database/sqlite/db.go @@ -201,34 +201,6 @@ func (s *SQLiteMindflow) Posts() (posts []mindflow.Post, err error) { return posts, nil } -func (s *SQLiteMindflow) Categories() (categories []mindflow.Category, err error) { - tx, err := s.db.Begin() - if err != nil { - return nil, err - } - defer tx.Rollback() - - rows, err := tx.Stmt(stmtCategoryGetAll).Query() - if err != nil { - return nil, err - } - defer rows.Close() - - for rows.Next() { - var category mindflow.Category - - if err = rows.Scan(&category.ID, &category.Name); err != nil { - return nil, err - } - - categories = append(categories, category) - } - - tx.Commit() - - return categories, nil -} - func (s *SQLiteMindflow) NewCategory(category *mindflow.Category) (int64, error) { tx, err := s.db.Begin() if err != nil { @@ -284,6 +256,34 @@ func (s *SQLiteMindflow) DeleteCategory(id int64) (err error) { return nil } +func (s *SQLiteMindflow) Categories() (categories []mindflow.Category, err error) { + tx, err := s.db.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + + rows, err := tx.Stmt(stmtCategoryGetAll).Query() + if err != nil { + return nil, err + } + defer rows.Close() + + for rows.Next() { + var category mindflow.Category + + if err = rows.Scan(&category.ID, &category.Name); err != nil { + return nil, err + } + + categories = append(categories, category) + } + + tx.Commit() + + return categories, nil +} + func (s *SQLiteMindflow) Close() error { stmtCategoryGetAll.Close() stmtCategoryNew.Close()