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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: fix memo parent_id
Stevenfd8333eeda67
diff --git a/store/db/mysql/memo.go b/store/db/mysql/memo.goindex 41c828c71..ca4a7c48a 100644--- a/store/db/mysql/memo.go+++ b/store/db/mysql/memo.go@@ -38,7 +38,7 @@ func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, e}func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo, error) {- where, args := []string{"1 = 1"}, []any{}+ where, having, args := []string{"1 = 1"}, []string{"1 = 1"}, []any{}if v := find.ID; v != nil {where, args = append(where, "`memo`.`id` = ?"), append(args, *v)@@ -69,7 +69,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memowhere = append(where, fmt.Sprintf("`memo`.`visibility` in (%s)", strings.Join(placeholder, ",")))}if find.ExcludeComments {- where = append(where, "parent_id IS NULL")+ having = append(having, "`parent_id` IS NULL")}orders := []string{}@@ -91,10 +91,10 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo"`memo`.`row_status` AS `row_status`","`memo`.`content` AS `content`","`memo`.`visibility` AS `visibility`",- "MAX(CASE WHEN `memo_organizer`.`pinned` = 1 THEN 1 ELSE 0 END) AS `pinned`",- "(SELECT `related_memo_id` from `memo_relation` where `memo_id` = `id` AND `type` = \"COMMENT\" LIMIT 1) as `parent_id`",+ "`memo_organizer`.`pinned` AS `pinned`",+ "`memo_relation`.`related_memo_id` AS `parent_id`",}- query := "SELECT " + strings.Join(fields, ",\n") + " FROM `memo` LEFT JOIN `memo_organizer` ON `memo`.`id` = `memo_organizer`.`memo_id` WHERE " + strings.Join(where, " AND ") + " GROUP BY `memo`.`id` ORDER BY " + strings.Join(orders, ", ")+ query := "SELECT " + strings.Join(fields, ",\n") + " FROM `memo` LEFT JOIN `memo_organizer` ON `memo`.`id` = `memo_organizer`.`memo_id` AND `memo`.`creator_id` = `memo_organizer`.`user_id` LEFT JOIN `memo_relation` ON `memo`.`id` = `memo_relation`.`memo_id` AND `memo_relation`.`type` = \"COMMENT\" WHERE " + strings.Join(where, " AND ") + " HAVING " + strings.Join(having, " AND ") + " ORDER BY " + strings.Join(orders, ", ")if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)if find.Offset != nil {@@ -111,6 +111,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memolist := make([]*store.Memo, 0)for rows.Next() {var memo store.Memo+ pinned := sql.NullBool{}if err := rows.Scan(&memo.ID,&memo.CreatorID,@@ -119,11 +120,14 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo&memo.RowStatus,&memo.Content,&memo.Visibility,- &memo.Pinned,+ &pinned,&memo.ParentID,); err != nil {return nil, err}+ if pinned.Valid {+ memo.Pinned = pinned.Bool+ }list = append(list, &memo)}diff --git a/store/db/postgres/memo.go b/store/db/postgres/memo.goindex f28b3198c..6359e0789 100644--- a/store/db/postgres/memo.go+++ b/store/db/postgres/memo.go@@ -60,7 +60,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memowhere = append(where, fmt.Sprintf("memo.visibility in (%s)", strings.Join(holders, ", ")))}if find.ExcludeComments {- where = append(where, "parent_id IS NULL")+ where = append(where, "memo_relation.related_memo_id IS NULL")}orders := []string{}@@ -81,8 +81,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo`memo.updated_ts AS updated_ts`,`memo.row_status AS row_status`,`memo.visibility AS visibility`,- `MAX(CASE WHEN memo_organizer.pinned = 1 THEN 1 ELSE 0 END) AS pinned`,- "(SELECT related_memo_id from memo_relation where memo_id = id AND type = 'COMMENT' LIMIT 1) as parent_id",+ `memo_organizer.pinned AS pinned`,+ `memo_relation.related_memo_id AS parent_id`,}if !find.ExcludeContent {fields = append(fields, `memo.content AS content`)@@ -90,9 +90,9 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoquery := `SELECT ` + strings.Join(fields, ", ") + `FROM memo- LEFT JOIN memo_organizer ON memo.id = memo_organizer.memo_id+ FULl JOIN memo_organizer ON memo.id = memo_organizer.memo_id AND memo.creator_id = memo_organizer.user_id+ FULL JOIN memo_relation ON memo.id = memo_relation.memo_id AND memo_relation.type = 'COMMENT'WHERE ` + strings.Join(where, " AND ") + `- GROUP BY memo.idORDER BY ` + strings.Join(orders, ", ")if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)@@ -110,6 +110,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memolist := make([]*store.Memo, 0)for rows.Next() {var memo store.Memo+ pinned := sql.NullBool{}dests := []any{&memo.ID,&memo.CreatorID,@@ -117,7 +118,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo&memo.UpdatedTs,&memo.RowStatus,&memo.Visibility,- &memo.Pinned,+ &pinned,&memo.ParentID,}if !find.ExcludeContent {@@ -126,6 +127,9 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoif err := rows.Scan(dests...); err != nil {return nil, err}+ if pinned.Valid {+ memo.Pinned = pinned.Bool+ }list = append(list, &memo)}diff --git a/store/db/sqlite/memo.go b/store/db/sqlite/memo.goindex fc3f9afa0..43e347bc4 100644--- a/store/db/sqlite/memo.go+++ b/store/db/sqlite/memo.go@@ -80,8 +80,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo`memo.updated_ts AS updated_ts`,`memo.row_status AS row_status`,`memo.visibility AS visibility`,- `CASE WHEN memo_organizer.pinned = 1 THEN 1 ELSE 0 END AS pinned`,- "(SELECT related_memo_id from memo_relation where memo_id = id AND type = \"COMMENT\" LIMIT 1) as parent_id",+ `memo_organizer.pinned AS pinned`,+ `memo_relation.related_memo_id AS parent_id`,}if !find.ExcludeContent {fields = append(fields, `memo.content AS content`)@@ -89,9 +89,9 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoquery := `SELECT ` + strings.Join(fields, ", ") + `FROM memo- LEFT JOIN memo_organizer ON memo.id = memo_organizer.memo_id+ LEFT JOIN memo_organizer ON memo.id = memo_organizer.memo_id AND memo.creator_id = memo_organizer.user_id+ FULL JOIN memo_relation ON memo.id = memo_relation.memo_id AND memo_relation.type = "COMMENT"WHERE ` + strings.Join(where, " AND ") + `- GROUP BY memo.idORDER BY ` + strings.Join(orders, ", ")if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)@@ -109,6 +109,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memolist := make([]*store.Memo, 0)for rows.Next() {var memo store.Memo+ pinned := sql.NullBool{}dests := []any{&memo.ID,&memo.CreatorID,@@ -116,7 +117,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo&memo.UpdatedTs,&memo.RowStatus,&memo.Visibility,- &memo.Pinned,+ &pinned,&memo.ParentID,}if !find.ExcludeContent {@@ -125,6 +126,9 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoif err := rows.Scan(dests...); err != nil {return nil, err}+ if pinned.Valid {+ memo.Pinned = pinned.Bool+ }list = append(list, &memo)}