Bug Fix:Update Remove Draft Articles Scripts to not use Squish (#11445)

forem · Nov 16, 2020 · 048fbe3 · 048fbe3
1 parent ad33d73
commit 048fbe3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -664,6 +664,9 @@ Rails/SkipsModelValidations:
   Reference: 'https://guides.rubyonrails.org/active_record_validations.html#skipping-validations'
   Enabled: false
 
+Rails/SquishedSQLHeredocs:
+  Enabled: false
+
 Rails/WhereExists:
   Description: 'Prefer `exists?(...)` over `where(...).exists?`.'
   Enabled: true

diff --git a/lib/data_update_scripts/20200901085230_remove_draft_articles_with_duplicate_canonical_url.rb b/lib/data_update_scripts/20200901085230_remove_draft_articles_with_duplicate_canonical_url.rb
@@ -6,7 +6,7 @@ def run
       # This statement deletes all draft articles in excess found to be duplicate over canonical_url,
       # excluding those whose body_markdown is different from the other duplicate occurrences
       result = ActiveRecord::Base.connection.execute(
-        <<~SQL.squish,
+        <<-SQL,
           WITH duplicates_draft_articles AS
               (SELECT id
                FROM
@@ -42,7 +42,7 @@ def run
       # with different bodies.
       # We thus select the oldest for removal preserving the most recent one
       result = ActiveRecord::Base.connection.execute(
-        <<~SQL.squish,
+        <<-SQL,
           WITH duplicates_draft_articles AS
               (SELECT id
                FROM

diff --git a/...ata_update_scripts/20200904132553_remove_draft_articles_with_duplicate_feed_source_url.rb b/...ata_update_scripts/20200904132553_remove_draft_articles_with_duplicate_feed_source_url.rb
@@ -6,7 +6,7 @@ def run
       # This statement deletes all draft articles in excess found to be duplicate over feed_source_url,
       # excluding those whose body_markdown is different from the other duplicate occurrences
       result_same_body = ActiveRecord::Base.connection.execute(
-        <<~SQL.squish,
+        <<-SQL,
           WITH duplicates_draft_articles AS
               (SELECT id
                FROM
@@ -33,7 +33,7 @@ def run
       # with different bodies.
       # We thus select the oldest for removal preserving the most recent one
       result_different_bodies = ActiveRecord::Base.connection.execute(
-        <<~SQL.squish,
+        <<-SQL,
           WITH duplicates_draft_articles AS
               (SELECT id
                FROM

diff --git a/...cripts/20200910135958_remove_draft_articles_with_duplicate_user_id_title_body_markdown.rb b/...cripts/20200910135958_remove_draft_articles_with_duplicate_user_id_title_body_markdown.rb
@@ -5,7 +5,7 @@ def run
 
       # This statement deletes all draft articles in excess found to be duplicate over those three columns
       ActiveRecord::Base.connection.execute(
-        <<~SQL.squish,
+        <<-SQL,
           WITH duplicates_draft_articles AS
               (SELECT id
                FROM