Merge pull request #1023 from matrix-org/erikj/update_fix

Fix push_display_name_rename schema update
matrix-org · Aug 18, 2016 · ea166f2 · ea166f2
2 parents abcb9ae + 732cf72
commit ea166f2
Showing 1 changed file with 3 additions and 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
@@ -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';