summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-17 18:12:21 +0100
committerErik Johnston <erik@matrix.org>2016-08-17 18:12:21 +0100
commit732cf72b861c99492b240a21e4539a3c40474596 (patch)
tree844f8b966c6398c7b3ebc57a41ec35c50db2ddde
parentMake push Measure finer grained (diff)
downloadsynapse-732cf72b861c99492b240a21e4539a3c40474596.tar.xz
Fix push_display_name_rename schema update
-rw-r--r--synapse/storage/schema/delta/34/push_display_name_rename.sql3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/storage/schema/delta/34/push_display_name_rename.sql b/synapse/storage/schema/delta/34/push_display_name_rename.sql
index 51d9f82393..0d9fe1a99a 100644
--- a/synapse/storage/schema/delta/34/push_display_name_rename.sql
+++ b/synapse/storage/schema/delta/34/push_display_name_rename.sql
@@ -13,5 +13,8 @@
  * limitations under the License.
  */
 
+DELETE FROM push_rules WHERE rule_id = 'global/override/.m.rule.contains_display_name';
 UPDATE push_rules SET rule_id = 'global/override/.m.rule.contains_display_name' WHERE rule_id = 'global/underride/.m.rule.contains_display_name';
+
+DELETE FROM push_rules_enable WHERE rule_id = 'global/override/.m.rule.contains_display_name';
 UPDATE push_rules_enable SET rule_id = 'global/override/.m.rule.contains_display_name' WHERE rule_id = 'global/underride/.m.rule.contains_display_name';