Merge 146a517 into 90def2a

mysociety · Mar 13, 2024 · d68191c · d68191c
2 parents 90def2a + 146a517
commit d68191c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20210114161442
+# Schema version: 20240313094449
 #
 # Table name: censor_rules
 #
@@ -13,7 +13,7 @@
 #  last_edit_comment :text             not null
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
-#  regexp            :boolean
+#  regexp            :boolean          default(FALSE), not null
 #
 
 # models/censor_rule.rb:

diff --git a/db/migrate/20240313094449_add_not_null_constraint_to_censor_rule_regexp.rb b/db/migrate/20240313094449_add_not_null_constraint_to_censor_rule_regexp.rb
@@ -0,0 +1,12 @@
+class AddNotNullConstraintToCensorRuleRegexp < ActiveRecord::Migration[7.0]
+  def up
+    change_column_default :censor_rules, :regexp, false
+    CensorRule.where(regexp: nil).update_all(regexp: false)
+    change_column_null :censor_rules, :regexp, false
+  end
+
+  def down
+    change_column_null :censor_rules, :regexp, true
+    change_column_default :censor_rules, :regexp, nil
+  end
+end
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Highlighted Features
 
+* Add default value and not null constraint to `CensorRule#regexp` (Gareth Rees)
 * Reduce amount of storage related background jobs (Graeme Porteous)
 * Add automatic parsing of emails contain Excel spreadsheets (Graeme Porteous)
 * Improve rendering of admin hidden request prominence and explanations (Graeme

diff --git a/spec/factories/censor_rules.rb b/spec/factories/censor_rules.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20210114161442
+# Schema version: 20240313094449
 #
 # Table name: censor_rules
 #
@@ -13,7 +13,7 @@
 #  last_edit_comment :text             not null
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
-#  regexp            :boolean
+#  regexp            :boolean          default(FALSE), not null
 #
 
 FactoryBot.define do

diff --git a/spec/models/censor_rule_spec.rb b/spec/models/censor_rule_spec.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20210114161442
+# Schema version: 20240313094449
 #
 # Table name: censor_rules
 #
@@ -13,7 +13,7 @@
 #  last_edit_comment :text             not null
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
-#  regexp            :boolean
+#  regexp            :boolean          default(FALSE), not null
 #
 
 require 'spec_helper'