IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: don't raise exception when a quote was already extracted

Browse Source
This commit is contained in:
Régis Hanol
2016-11-30 17:18:34 +01:00
parent 3cc6fabb62
commit dec8a861f0
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/models/quoted_post.rb
View File

@@ -20,22 +20,22 @@ class QuotedPost < ActiveRecord::Base
next if uniq[[topic_id,post_number]]
uniq[[topic_id,post_number]] = true
begin
# It would be so much nicer if we used post_id in quotes
results = exec_sql "INSERT INTO quoted_posts(post_id, quoted_post_id, created_at, updated_at)
SELECT :post_id, p.id, current_timestamp, current_timestamp
FROM posts p
LEFT JOIN quoted_posts q on q.post_id = :post_id AND q.quoted_post_id = p.id
WHERE post_number = :post_number AND
topic_id = :topic_id AND
q.id IS NULL
RETURNING quoted_post_id
", post_id: post.id, post_number: post_number, topic_id: topic_id
# It would be so much nicer if we used post_id in quotes
results = exec_sql "INSERT INTO quoted_posts(post_id, quoted_post_id, created_at, updated_at)
SELECT :post_id, p.id, current_timestamp, current_timestamp
FROM posts p
LEFT JOIN quoted_posts q on q.post_id = :post_id AND q.quoted_post_id = p.id
WHERE post_number = :post_number AND
topic_id = :topic_id AND
q.id IS NULL
RETURNING quoted_post_id
", post_id: post.id, post_number: post_number, topic_id: topic_id
results = results.to_a
if results.length > 0
ids << results[0]["quoted_post_id"].to_i
results = results.to_a
ids << results[0]["quoted_post_id"].to_i if results.length > 0
rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
# it's fine
end
end