From 01ed50473531f0133d728281f0fecf4a5d09e83f Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Wed, 21 Jun 2023 08:40:49 +0800
Subject: [PATCH] chore: update store error check

---
 store/shortcut.go          | 12 +-----------
 store/workspace_setting.go | 12 +++++++-----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/store/shortcut.go b/store/shortcut.go
index bbe9af8..e97a8d9 100644
--- a/store/shortcut.go
+++ b/store/shortcut.go
@@ -174,10 +174,6 @@ func (s *Store) ListShortcuts(ctx context.Context, find *FindShortcut) ([]*Short
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, err
-	}
-
 	return shortcuts, nil
 }
 
@@ -193,10 +189,6 @@ func (s *Store) GetShortcut(ctx context.Context, find *FindShortcut) (*Shortcut,
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, err
-	}
-
 	if len(shortcuts) == 0 {
 		return nil, nil
 	}
@@ -210,9 +202,7 @@ func (s *Store) DeleteShortcut(ctx context.Context, delete *DeleteShortcut) erro
 	}
 	defer tx.Rollback()
 
-	if _, err := tx.ExecContext(ctx, `
-		DELETE FROM shortcut WHERE id = ?
-	`, delete.ID); err != nil {
+	if _, err := tx.ExecContext(ctx, `DELETE FROM shortcut WHERE id = ?`, delete.ID); err != nil {
 		return err
 	}
 
diff --git a/store/workspace_setting.go b/store/workspace_setting.go
index f420dad..2dd67e5 100644
--- a/store/workspace_setting.go
+++ b/store/workspace_setting.go
@@ -55,10 +55,6 @@ func (s *Store) ListWorkspaceSettings(ctx context.Context, find *FindWorkspaceSe
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, err
-	}
-
 	return list, nil
 }
 
@@ -94,11 +90,11 @@ func listWorkspaceSettings(ctx context.Context, tx *sql.Tx, find *FindWorkspaceS
 			value
 		FROM workspace_setting
 		WHERE ` + strings.Join(where, " AND ")
-
 	rows, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
 		return nil, err
 	}
+
 	defer rows.Close()
 
 	list := []*WorkspaceSetting{}
@@ -110,7 +106,13 @@ func listWorkspaceSettings(ctx context.Context, tx *sql.Tx, find *FindWorkspaceS
 		); err != nil {
 			return nil, err
 		}
+
 		list = append(list, workspaceSetting)
 	}
+
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
 	return list, nil
 }