diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
| commit | ffba97807746f6f0d7a8820c0d980f188dcad08c (patch) | |
| tree | 36301e98cdc6400afe71b89fc4b0c8beccd0deea /scripts/synapse_port_db | |
| parent | Merge pull request #2540 from 4nd3r/patch-1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-ffba97807746f6f0d7a8820c0d980f188dcad08c.tar.xz | |
Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0
Diffstat (limited to 'scripts/synapse_port_db')
| -rwxr-xr-x | scripts/synapse_port_db | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db index bc167b59af..dc7fe940e8 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db @@ -376,10 +376,13 @@ class Porter(object): " VALUES (?,?,?,?,to_tsvector('english', ?),?,?)" ) - rows_dict = [ - dict(zip(headers, row)) - for row in rows - ] + rows_dict = [] + for row in rows: + d = dict(zip(headers, row)) + if "\0" in d['value']: + logger.warn('dropping search row %s', d) + else: + rows_dict.append(d) txn.executemany(sql, [ ( |