summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2021-02-10 14:12:57 -0600
committerGitHub <noreply@github.com>2021-02-10 20:12:57 +0000
commit80d6dc9783aa80886a133756028984dbf8920168 (patch)
tree2e87a3640eabda1d3dae52d4c21073e2dc1f4aba /scripts-dev
parentMerge pull request #9361 from matrix-org/babolivier/third_party_validation (diff)
downloadsynapse-80d6dc9783aa80886a133756028984dbf8920168.tar.xz
Remove conflicting sqlite tables that are "reserved" (shadow fts4 tables) (#9003)
Remove conflicting sqlite tables that throw sqlite3.OperationalError: object name reserved for internal use: event_search_content when running the twisted unit tests.

Fix #8996
Diffstat (limited to 'scripts-dev')
-rwxr-xr-xscripts-dev/make_full_schema.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts-dev/make_full_schema.sh b/scripts-dev/make_full_schema.sh
index 60e8970a35..b8d1e636f1 100755
--- a/scripts-dev/make_full_schema.sh
+++ b/scripts-dev/make_full_schema.sh
@@ -162,12 +162,23 @@ else
 fi
 
 # Delete schema_version, applied_schema_deltas and applied_module_schemas tables
+# Also delete any shadow tables from fts4
 # This needs to be done after synapse_port_db is run
 echo "Dropping unwanted db tables..."
 SQL="
 DROP TABLE schema_version;
 DROP TABLE applied_schema_deltas;
 DROP TABLE applied_module_schemas;
+DROP TABLE event_search_content;
+DROP TABLE event_search_segments;
+DROP TABLE event_search_segdir;
+DROP TABLE event_search_docsize;
+DROP TABLE event_search_stat;
+DROP TABLE user_directory_search_content;
+DROP TABLE user_directory_search_segments;
+DROP TABLE user_directory_search_segdir;
+DROP TABLE user_directory_search_docsize;
+DROP TABLE user_directory_search_stat;
 "
 sqlite3 "$SQLITE_DB" <<< "$SQL"
 psql $POSTGRES_DB_NAME -U "$POSTGRES_USERNAME" -w <<< "$SQL"