From ca51617f0ec455436d42e1e644093460e1d38781 Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Tue, 23 May 2023 04:29:06 +0400 Subject: [PATCH] There is no need in DeleteUnusedCategories() so let's get rid of it. --- pkg/mindflow/database/sqlite/db.go | 40 ++++--------------- .../sqlite/queries/categoryDeleteUnused.sql | 6 --- pkg/mindflow/mindflow.go | 1 - 3 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 pkg/mindflow/database/sqlite/queries/categoryDeleteUnused.sql diff --git a/pkg/mindflow/database/sqlite/db.go b/pkg/mindflow/database/sqlite/db.go index f7613e5..d73d518 100644 --- a/pkg/mindflow/database/sqlite/db.go +++ b/pkg/mindflow/database/sqlite/db.go @@ -22,8 +22,6 @@ var ( queryCategoryEdit string //go:embed queries/categoryDelete.sql queryCategoryDelete string - //go:embed queries/categoryDeleteUnused.sql - queryCategoryDeleteUnused string //go:embed queries/postGetAll.sql queryPostGetAll string //go:embed queries/postNew.sql @@ -35,15 +33,14 @@ var ( ) var ( - stmtCategoryGetAll *sql.Stmt - stmtCategoryNew *sql.Stmt - stmtCategoryEdit *sql.Stmt - stmtCategoryDelete *sql.Stmt - stmtCategoryDeleteUnused *sql.Stmt - stmtPostGetAll *sql.Stmt - stmtPostNew *sql.Stmt - stmtPostEdit *sql.Stmt - stmtPostDelete *sql.Stmt + stmtCategoryGetAll *sql.Stmt + stmtCategoryNew *sql.Stmt + stmtCategoryEdit *sql.Stmt + stmtCategoryDelete *sql.Stmt + stmtPostGetAll *sql.Stmt + stmtPostNew *sql.Stmt + stmtPostEdit *sql.Stmt + stmtPostDelete *sql.Stmt ) func initDBStatements(db *sql.DB) error { @@ -74,11 +71,6 @@ func initDBStatements(db *sql.DB) error { return errors.Wrap(err, "failed to prepare queryCategoryDelete") } - stmtCategoryDeleteUnused, err = db.Prepare(queryCategoryDeleteUnused) - if err != nil { - return errors.Wrap(err, "failed to prepare queryCategoryDeleteUnused") - } - stmtPostGetAll, err = db.Prepare(queryPostGetAll) if err != nil { return errors.Wrap(err, "failed to prepare queryPostGetAll") @@ -292,22 +284,6 @@ func (s *SQLiteMindflow) DeleteCategory(id int64) (err error) { return nil } -func (s *SQLiteMindflow) DeleteUnusedCategories() (err error) { - tx, err := s.db.Begin() - if err != nil { - return err - } - defer tx.Rollback() - - if _, err = tx.Stmt(stmtCategoryDeleteUnused).Exec(); err != nil { - return err - } - - tx.Commit() - - return nil -} - func (s *SQLiteMindflow) Close() error { stmtCategoryGetAll.Close() stmtCategoryNew.Close() diff --git a/pkg/mindflow/database/sqlite/queries/categoryDeleteUnused.sql b/pkg/mindflow/database/sqlite/queries/categoryDeleteUnused.sql deleted file mode 100644 index 6f1a3b5..0000000 --- a/pkg/mindflow/database/sqlite/queries/categoryDeleteUnused.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM `category` - WHERE `category`.`category_id` NOT IN ( - SELECT `category_id` - FROM `post` - GROUP BY `post`.`category_id` - HAVING COUNT(`post`.`post_id`) > 0 ); \ No newline at end of file diff --git a/pkg/mindflow/mindflow.go b/pkg/mindflow/mindflow.go index 327c37e..ea9218a 100644 --- a/pkg/mindflow/mindflow.go +++ b/pkg/mindflow/mindflow.go @@ -52,7 +52,6 @@ type Mindflow interface { NewCategory(category *Category) (int64, error) EditCategory(category *Category) error DeleteCategory(id int64) error - DeleteUnusedCategories() error Categories() ([]Category, error) Close() error }