708 Commits

Author	SHA1	Message	Date
Mark Haines	29400b45b9	SYN-367: Use upsert rather than insert_or_replace	2015-04-30 15:21:31 +01:00
Erik Johnston	2366d28780	Don't needlessly join on state_events	2015-04-30 14:02:06 +01:00
Erik Johnston	1d7702833d	Make simple query rather than long one and then throw away half the results	2015-04-30 10:16:12 +01:00
Erik Johnston	b1ca784aca	Correctly decode, for sqlite and postgres, rows from pushers table	2015-04-29 19:41:14 +01:00
Erik Johnston	4a9dc5b2f5	pushkey' are also bytes.	2015-04-29 19:27:02 +01:00
Erik Johnston	0ade2712d1	Typo	2015-04-29 19:17:25 +01:00
Erik Johnston	50f96f256f	Also remove yield from within lock in the other generator	2015-04-29 19:17:00 +01:00
Erik Johnston	d2d61a8288	Fix deadlock in id_generators. No idea why this was an actual deadlock.	2015-04-29 19:15:23 +01:00
Erik Johnston	3864b3a8e6	Actually return rows	2015-04-29 18:07:36 +01:00
Erik Johnston	0618978238	Typo, args wrong way round	2015-04-29 18:04:35 +01:00
Erik Johnston	09177f4f2e	Decode buffers in same thread	2015-04-29 18:03:42 +01:00
Erik Johnston	472be88674	We store pusher data as bytes	2015-04-29 17:43:46 +01:00
David Baker	12d381bd5d	Decode the data json in the storage layer (was moved but this part was missed)	2015-04-29 17:13:51 +01:00
David Baker	f8c30faf25	Oops, update the contraint too	2015-04-29 16:58:42 +01:00
David Baker	61cd5d9045	Be more postgressive	2015-04-29 16:57:14 +01:00
David Baker	fb95035a65	Be postgressive	2015-04-29 16:53:41 +01:00
David Baker	4669def000	Oops, forgot the schema delta file	2015-04-29 16:50:16 +01:00
Erik Johnston	0337eaf321	txn.execute doesn't return cursors	2015-04-29 16:43:39 +01:00
Erik Johnston	884fb88e28	txn.execute doesn't return cursors	2015-04-29 16:35:20 +01:00
Erik Johnston	d76c058eea	Fix invalid SQL to work in postgres land	2015-04-29 16:30:25 +01:00
Erik Johnston	c8ed9bd278	pushers table requires an access_token	2015-04-29 15:33:27 +01:00
Erik Johnston	970a9b9d2b	We can't use REPLACE when upgrading databases now we have postgres	2015-04-29 13:55:44 +01:00
Erik Johnston	64991b0c8b	Merge pull request #129 from matrix-org/key_distribution ... Key distribution v2	2015-04-29 13:34:38 +01:00
Mark Haines	e26a3d8d9e	bump database schema version	2015-04-29 13:32:32 +01:00
Mark Haines	a9549fdce3	Use bytea rather than BLOB	2015-04-29 13:16:09 +01:00
Mark Haines	4ad8b45155	Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py	2015-04-29 13:15:14 +01:00
Erik Johnston	cd0864121b	Make postgres database error slightly more helpful	2015-04-29 12:12:25 +01:00
Erik Johnston	4932a7e2d9	Use __all__ instead of assert to stop pyflakes from warning about unused import in __init__	2015-04-29 12:12:25 +01:00
Erik Johnston	a08bf11138	Appease PEP8	2015-04-29 11:44:48 +01:00
Erik Johnston	204132a998	Check that postgres database has correct charset set	2015-04-29 11:42:28 +01:00
Erik Johnston	327ca883ec	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-28 13:39:42 +01:00
Erik Johnston	18f8247701	Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except for a limit	2015-04-28 12:41:33 +01:00
Mark Haines	9182f87664	Merge pull request #126 from matrix-org/csauth ... Client / Server Auth Refactor	2015-04-28 11:00:27 +01:00
Mark Haines	55e1bc8920	And don't bump the schema version unnecessarily	2015-04-28 10:54:15 +01:00
Mark Haines	b96c133034	Add server_keys.sql to the current delta rather than creating a new delta	2015-04-28 10:50:00 +01:00
Erik Johnston	8558e1ec73	Make get_max_token into inlineCallbacks so that the lock works.	2015-04-27 15:19:44 +01:00
Erik Johnston	6f8e2d517e	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-27 14:41:40 +01:00
Erik Johnston	2732be83d9	Shuffle operations so that locking upsert happens last in the txn. This ensures the lock is held for the least amount of time possible.	2015-04-27 13:22:30 +01:00
Erik Johnston	e4c4664d73	Handle the fact that postgres databases can be restarted from under us	2015-04-27 12:40:49 +01:00
David Baker	8a5be236e0	pep8	2015-04-27 11:49:18 +01:00
David Baker	b02e1006b9	Run database check before daemonizing, at the cost of database hygiene.	2015-04-27 11:46:00 +01:00
David Baker	f8152f2708	rename db method to be more informative	2015-04-27 10:16:26 +01:00
David Baker	2f475bd5d5	pep8	2015-04-24 18:15:07 +01:00
David Baker	a7b51f4539	Check users in our table aren't on a different domain to the one we're configured with to try & fix SYN-266	2015-04-24 18:11:21 +01:00
Mark Haines	eede182df7	Merge branch 'develop' into key_distribution	2015-04-24 10:35:49 +01:00
Mark Haines	4e2f8b8722	Copyright notices	2015-04-24 10:35:29 +01:00
Mark Haines	f30d47c876	Implement remote key lookup api	2015-04-22 14:21:08 +01:00
David Baker	91c8f828e1	pep8	2015-04-17 19:56:04 +01:00
David Baker	8db6832db8	Password reset, finally.	2015-04-17 19:53:47 +01:00
David Baker	117f35ac4a	Add endpoint to get threepids from server	2015-04-17 17:20:18 +01:00