Browse Source

Reformat's ArchiveEntries's query for consistency's sake

And replace the `=ANY` with an `IN`
jvoisin 2 năm trước cách đây
mục cha
commit
66e0eb1bd6
1 tập tin đã thay đổi với 18 bổ sung6 xóa
  1. 18 6
      internal/storage/entry.go

+ 18 - 6
internal/storage/entry.go

@@ -230,12 +230,12 @@ func (s *Storage) GetReadTime(entry *model.Entry, feed *model.Feed) int {
 	var result int
 	var result int
 	s.db.QueryRow(
 	s.db.QueryRow(
 		`SELECT
 		`SELECT
-			reading_time 
-		FROM 
-			entries 
-		WHERE 
+			reading_time
+		FROM
+			entries
+		WHERE
 			user_id=$1 AND
 			user_id=$1 AND
-			feed_id=$2 AND 
+			feed_id=$2 AND
 			hash=$3
 			hash=$3
 		`,
 		`,
 		feed.UserID,
 		feed.UserID,
@@ -333,7 +333,19 @@ func (s *Storage) ArchiveEntries(status string, days, limit int) (int64, error)
 		SET
 		SET
 			status=$1
 			status=$1
 		WHERE
 		WHERE
-			id=ANY(SELECT id FROM entries WHERE status=$2 AND starred is false AND share_code='' AND created_at < now () - '%d days'::interval ORDER BY created_at ASC LIMIT %d)
+			id IN (
+				SELECT
+					id
+				FROM
+					entries
+				WHERE
+					status=$2 AND
+					starred is false AND
+					share_code='' AND
+					created_at < now () - '%d days'::interval
+				ORDER BY
+					created_at ASC LIMIT %d
+				)
 	`
 	`
 
 
 	result, err := s.db.Exec(fmt.Sprintf(query, days, limit), model.EntryStatusRemoved, status)
 	result, err := s.db.Exec(fmt.Sprintf(query, days, limit), model.EntryStatusRemoved, status)