summary refs log tree commit diff
path: root/synapse/storage/schema
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-04-10 10:22:35 +0100
committerGitHub <noreply@github.com>2019-04-10 10:22:35 +0100
commite446921deffd976bdb123ef80a518019fe2272ad (patch)
tree2796a39c131ded7b85e058b29efc558ab14efd27 /synapse/storage/schema
parentFix disappearing exceptions in manhole. (#5035) (diff)
parentNewsfile (diff)
downloadsynapse-e446921deffd976bdb123ef80a518019fe2272ad.tar.xz
Merge pull request #5033 from matrix-org/erikj/fix_schema_delta
Fix schema upgrade when dropping tables
Diffstat (limited to 'synapse/storage/schema')
-rw-r--r--synapse/storage/schema/delta/54/drop_legacy_tables.sql4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/schema/delta/54/drop_legacy_tables.sql b/synapse/storage/schema/delta/54/drop_legacy_tables.sql
index ecca005d9b..dbbe682697 100644
--- a/synapse/storage/schema/delta/54/drop_legacy_tables.sql
+++ b/synapse/storage/schema/delta/54/drop_legacy_tables.sql
@@ -13,8 +13,10 @@
  * limitations under the License.
  */
 
-DROP TABLE IF EXISTS application_services;
+-- we need to do this first due to foreign constraints
 DROP TABLE IF EXISTS application_services_regex;
+
+DROP TABLE IF EXISTS application_services;
 DROP TABLE IF EXISTS transaction_id_to_pdu;
 DROP TABLE IF EXISTS stats_reporting;
 DROP TABLE IF EXISTS current_state_resets;