Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix: ListTag not support omit params (#2366)

Athurg Gooth425b43b3bb63
diff --git a/store/db/mysql/tag.go b/store/db/mysql/tag.go
index e7ab173e1..ccfe8093a 100644
--- a/store/db/mysql/tag.go
+++ b/store/db/mysql/tag.go
@@ -18,7 +18,12 @@ func (d *DB) UpsertTag(ctx context.Context, upsert *store.Tag) (*store.Tag, erro
}
func (d *DB) ListTags(ctx context.Context, find *store.FindTag) ([]*store.Tag, error) {
- where, args := []string{"`creator_id` = ?"}, []any{find.CreatorID}
+ where, args := []string{"1 = 1"}, []any{}
+
+ if find.CreatorID != 0 {
+ where, args = append(where, "`creator_id` = ?"), append(args, find.CreatorID)
+ }
+
query := "SELECT `name`, `creator_id` FROM `tag` WHERE " + strings.Join(where, " AND ") + " ORDER BY name ASC"
rows, err := d.db.QueryContext(ctx, query, args...)
if err != nil {
diff --git a/store/db/sqlite/tag.go b/store/db/sqlite/tag.go
index fce43c5a5..2c6d313f4 100644
--- a/store/db/sqlite/tag.go
+++ b/store/db/sqlite/tag.go
@@ -27,7 +27,12 @@ func (d *DB) UpsertTag(ctx context.Context, upsert *store.Tag) (*store.Tag, erro
}
func (d *DB) ListTags(ctx context.Context, find *store.FindTag) ([]*store.Tag, error) {
- where, args := []string{"creator_id = ?"}, []any{find.CreatorID}
+ where, args := []string{"1 = 1"}, []any{}
+
+ if find.CreatorID != 0 {
+ where, args = append(where, "`creator_id` = ?"), append(args, find.CreatorID)
+ }
+
query := `
SELECT
name,