summary refs log tree commit diff
path: root/scripts/port_from_sqlite_to_postgres.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-04-29 13:04:22 +0100
committerMark Haines <mjark@negativecurvature.net>2015-04-29 13:04:22 +0100
commit19167fd21fb74c10c95f61808d2b3c453ea36e8d (patch)
treed29e65d35d444b6e1b426fe44547585a2af2afcf /scripts/port_from_sqlite_to_postgres.py
parentminimal doc (diff)
parentMake postgres database error slightly more helpful (diff)
downloadsynapse-19167fd21fb74c10c95f61808d2b3c453ea36e8d.tar.xz
Merge pull request #135 from matrix-org/erikj/postgres_charset_check
Check that postgres database has correct charset set
Diffstat (limited to 'scripts/port_from_sqlite_to_postgres.py')
-rw-r--r--scripts/port_from_sqlite_to_postgres.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/port_from_sqlite_to_postgres.py b/scripts/port_from_sqlite_to_postgres.py

index 3296f1f54f..da760af087 100644 --- a/scripts/port_from_sqlite_to_postgres.py +++ b/scripts/port_from_sqlite_to_postgres.py
@@ -283,6 +283,10 @@ class Porter(object): self.sqlite_store = Store(sqlite_db_pool, sqlite_engine) self.postgres_store = Store(postgres_db_pool, postgres_engine) + yield self.postgres_store.execute( + postgres_engine.check_database + ) + # Step 1. Set up databases. self.progress.set_state("Preparing SQLite3") self.setup_db(sqlite_config, sqlite_engine)