diff --git a/bin/memos/main.go b/bin/memos/main.go index 3a8a9d8b..310ad11f 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.go index ad74a372..77219122 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.Memo query := `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.go index ab5cede6..2257a0e5 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.Memo query := "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 {