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 list memos
Stevenf05a89315c1f
diff --git a/bin/memos/main.go b/bin/memos/main.goindex 3a8a9d8b5..310ad11f5 100644--- a/bin/memos/main.go+++ b/bin/memos/main.go@@ -58,14 +58,14 @@ var (return}- store := store.New(dbDriver, profile)- if err := store.MigrateManually(ctx); err != nil {+ storeInstance := store.New(dbDriver, profile)+ if err := storeInstance.MigrateManually(ctx); err != nil {cancel()log.Error("failed to migrate manually", zap.Error(err))return}- s, err := server.NewServer(ctx, profile, store)+ s, err := server.NewServer(ctx, profile, storeInstance)if err != nil {cancel()log.Error("failed to create server", zap.Error(err))diff --git a/store/db/postgres/memo.go b/store/db/postgres/memo.goindex ad74a3724..772191226 100644--- a/store/db/postgres/memo.go+++ b/store/db/postgres/memo.go@@ -100,8 +100,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoquery := `SELECT ` + strings.Join(fields, ", ") + `FROM memo- 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'+ 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 ") + `ORDER BY ` + strings.Join(orders, ", ")if find.Limit != nil {diff --git a/store/db/sqlite/memo.go b/store/db/sqlite/memo.goindex ab5cede61..2257a0e58 100644--- a/store/db/sqlite/memo.go+++ b/store/db/sqlite/memo.go@@ -99,7 +99,7 @@ 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` AND `memo`.`creator_id` = `memo_organizer`.`user_id` " +- "FULL JOIN `memo_relation` ON `memo`.`id` = `memo_relation`.`memo_id` AND `memo_relation`.`type` = \"COMMENT\"" + " " ++ "LEFT JOIN `memo_relation` ON `memo`.`id` = `memo_relation`.`memo_id` AND `memo_relation`.`type` = \"COMMENT\" " +"WHERE " + strings.Join(where, " AND ") + " " +"ORDER BY " + strings.Join(orders, ", ")if find.Limit != nil {