From a04a631674b6b1197ecb431565b952d30391c504 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 13 Dec 2019 11:51:40 -0500 Subject: [PATCH] Changed `CONFLICT` to `SQL` for multiline strings This is more consistent with the rest of our codebase. --- app/models/topic_group.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/topic_group.rb b/app/models/topic_group.rb index ad3219e14dc..7f3c4060f34 100644 --- a/app/models/topic_group.rb +++ b/app/models/topic_group.rb @@ -49,10 +49,10 @@ class TopicGroup < ActiveRecord::Base query += 'AND NOT(tag.group_id IN (:already_updated_groups))' unless updated_group_ids.length.zero? - query += <<~CONFLICT + query += <<~SQL ON CONFLICT(topic_id, group_id) DO UPDATE SET last_read_post_number = :post_number, created_at = :now, updated_at = :now - CONFLICT + SQL DB.exec( query,