summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-18 09:16:53 +0100
committerGitHub <noreply@github.com>2016-08-18 09:16:53 +0100
commitea166f2ac93b2d62d47bdfd4c21f2eb10473ed52 (patch)
tree844f8b966c6398c7b3ebc57a41ec35c50db2ddde /synapse
parentMake push Measure finer grained (diff)
parentFix push_display_name_rename schema update (diff)
downloadsynapse-ea166f2ac93b2d62d47bdfd4c21f2eb10473ed52.tar.xz
Merge pull request #1023 from matrix-org/erikj/update_fix
Fix push_display_name_rename schema update
Diffstat (limited to 'synapse')
-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';