aykhans/slash-e
1
0
Fork 0
mirror of https://github.com/aykhans/slash-e.git synced 2025-04-18 21:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: update store error check

Browse Source
This commit is contained in:
Steven 2023-06-21 08:40:49 +08:00
parent 895cd8e38c
commit 01ed504735
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
store/shortcut.go
View File

@ -174,10 +174,6 @@ func (s *Store) ListShortcuts(ctx context.Context, find *FindShortcut) ([]*Short
return nil, err return nil, err
} }
if err := tx.Commit(); err != nil {
return nil, err
}
return shortcuts, nil return shortcuts, nil
} }
@ -193,10 +189,6 @@ func (s *Store) GetShortcut(ctx context.Context, find *FindShortcut) (*Shortcut,
return nil, err return nil, err
} }
if err := tx.Commit(); err != nil {
return nil, err
}
if len(shortcuts) == 0 { if len(shortcuts) == 0 {
return nil, nil return nil, nil
} }
@ -210,9 +202,7 @@ func (s *Store) DeleteShortcut(ctx context.Context, delete *DeleteShortcut) erro
} }
defer tx.Rollback() defer tx.Rollback()
if _, err := tx.ExecContext(ctx, ` if _, err := tx.ExecContext(ctx, `DELETE FROM shortcut WHERE id = ?`, delete.ID); err != nil {
DELETE FROM shortcut WHERE id = ?
`, delete.ID); err != nil {
return err return err
} }

12
store/workspace_setting.go
View File

@ -55,10 +55,6 @@ func (s *Store) ListWorkspaceSettings(ctx context.Context, find *FindWorkspaceSe
return nil, err return nil, err
} }
if err := tx.Commit(); err != nil {
return nil, err
}
return list, nil return list, nil
} }
@ -94,11 +90,11 @@ func listWorkspaceSettings(ctx context.Context, tx *sql.Tx, find *FindWorkspaceS
value value
FROM workspace_setting FROM workspace_setting
WHERE ` + strings.Join(where, " AND ") WHERE ` + strings.Join(where, " AND ")
rows, err := tx.QueryContext(ctx, query, args...) rows, err := tx.QueryContext(ctx, query, args...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close() defer rows.Close()
list := []*WorkspaceSetting{} list := []*WorkspaceSetting{}
@ -110,7 +106,13 @@ func listWorkspaceSettings(ctx context.Context, tx *sql.Tx, find *FindWorkspaceS
); err != nil { ); err != nil {
return nil, err return nil, err
} }
list = append(list, workspaceSetting) list = append(list, workspaceSetting)
} }
if err := rows.Err(); err != nil {
return nil, err
}
return list, nil return list, nil
} }