From 538d08c16ce72dcbb8c6d041bdf9643cf4a16763 Mon Sep 17 00:00:00 2001
From: Ben Brooks <ben@bbrks.me>
Date: Sat, 7 Apr 2018 21:50:45 +0100
Subject: Add CommentsURL to entry

---
 storage/entry.go               | 10 ++++++----
 storage/entry_query_builder.go |  3 ++-
 storage/migration.go           |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'storage')

diff --git a/storage/entry.go b/storage/entry.go
index 7df88c3..d56d5de 100644
--- a/storage/entry.go
+++ b/storage/entry.go
@@ -25,9 +25,9 @@ func (s *Storage) NewEntryQueryBuilder(userID int64) *EntryQueryBuilder {
 func (s *Storage) createEntry(entry *model.Entry) error {
 	query := `
 		INSERT INTO entries
-		(title, hash, url, published_at, content, author, user_id, feed_id)
+		(title, hash, url, comments_url, published_at, content, author, user_id, feed_id)
 		VALUES
-		($1, $2, $3, $4, $5, $6, $7, $8)
+		($1, $2, $3, $4, $5, $6, $7, $8, $9)
 		RETURNING id
 	`
 	err := s.db.QueryRow(
@@ -35,6 +35,7 @@ func (s *Storage) createEntry(entry *model.Entry) error {
 		entry.Title,
 		entry.Hash,
 		entry.URL,
+		entry.CommentsURL,
 		entry.Date,
 		entry.Content,
 		entry.Author,
@@ -82,14 +83,15 @@ func (s *Storage) UpdateEntryContent(entry *model.Entry) error {
 func (s *Storage) updateEntry(entry *model.Entry) error {
 	query := `
 		UPDATE entries SET
-		title=$1, url=$2, content=$3, author=$4
-		WHERE user_id=$5 AND feed_id=$6 AND hash=$7
+		title=$1, url=$2, comments_url=$3, content=$4, author=$5
+		WHERE user_id=$6 AND feed_id=$7 AND hash=$8
 		RETURNING id
 	`
 	err := s.db.QueryRow(
 		query,
 		entry.Title,
 		entry.URL,
+		entry.CommentsURL,
 		entry.Content,
 		entry.Author,
 		entry.UserID,
diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go
index 6650dbb..4525ce5 100644
--- a/storage/entry_query_builder.go
+++ b/storage/entry_query_builder.go
@@ -158,7 +158,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
 	query := `
 		SELECT
 		e.id, e.user_id, e.feed_id, e.hash, e.published_at at time zone u.timezone, e.title,
-		e.url, e.author, e.content, e.status, e.starred,
+		e.url, e.comments_url, e.author, e.content, e.status, e.starred,
 		f.title as feed_title, f.feed_url, f.site_url, f.checked_at,
 		f.category_id, c.title as category_title, f.scraper_rules, f.rewrite_rules, f.crawler,
 		fi.icon_id,
@@ -199,6 +199,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
 			&entry.Date,
 			&entry.Title,
 			&entry.URL,
+			&entry.CommentsURL,
 			&entry.Author,
 			&entry.Content,
 			&entry.Status,
diff --git a/storage/migration.go b/storage/migration.go
index 9d6316a..d7d40e8 100644
--- a/storage/migration.go
+++ b/storage/migration.go
@@ -12,7 +12,7 @@ import (
 	"github.com/miniflux/miniflux/sql"
 )
 
-const schemaVersion = 15
+const schemaVersion = 16
 
 // Migrate run database migrations.
 func (s *Storage) Migrate() {
-- 
cgit v1.2.3