Mark Haines 0b0033c40b Merge branch 'develop' into notifier_performance

2015-05-18 13:50:01 +01:00

..

engines

Don't call 'encode_parameter' no-op

2015-05-05 15:00:30 +01:00

schema

Drop the old table not the new table

2015-05-08 16:04:32 +01:00

util

SYN-377: Make sure that the StreamIdGenerator.get_next.__exit__ is called from the main thread after the transaction completes, not from database thread before the transaction completes.

2015-05-12 11:20:40 +01:00

__init__.py

Bump schema version

2015-05-08 15:58:14 +01:00

_base.py

Add ID generator for push_rules_enable to #resolve SYN-378

2015-05-14 11:44:03 +01:00

appservice.py

txn.execute doesn't return cursors

2015-04-29 16:43:39 +01:00

directory.py

Use generic db exceptions rather than sqlite3 specific ones

2015-04-08 16:53:48 +01:00

event_federation.py

Err, delete the right stuff

2015-05-12 15:02:53 +01:00

events.py

Merge branch 'notifier_unify' into notifier_performance

2015-05-14 11:36:44 +01:00

filtering.py

Give sensible names for '_simple_...' transactions

2015-03-20 15:59:18 +00:00

keys.py

SYN-367: Use upsert rather than insert_or_replace

2015-04-30 15:21:31 +01:00

media_repository.py

Give sensible names for '_simple_...' transactions

2015-03-20 15:59:18 +00:00

presence.py

Implement or_ignore flag on inserts

2015-04-07 12:06:22 +01:00

profile.py

Revert needless change to storage.profile

2015-04-17 16:13:14 +01:00

push_rule.py

Add ID generator for push_rules_enable to #resolve SYN-378

2015-05-14 11:44:03 +01:00

pusher.py

Correctly decode, for sqlite and postgres, rows from pushers table

2015-04-29 19:41:14 +01:00

registration.py

user_id now in user_threepids

2015-05-01 15:04:37 +01:00

rejections.py

Give sensible names for '_simple_...' transactions

2015-03-20 15:59:18 +00:00

room.py

Collect the invalidate callbacks on the transaction object rather than passing around a separate list

2015-05-05 17:32:21 +01:00

roommember.py

Collect the invalidate callbacks on the transaction object rather than passing around a separate list

2015-05-05 17:32:21 +01:00

signatures.py

Collect the invalidate callbacks on the transaction object rather than passing around a separate list

2015-05-05 17:32:21 +01:00

state.py

Collect the invalidate callbacks on the transaction object rather than passing around a separate list

2015-05-05 17:32:21 +01:00

stream.py

Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'

2015-05-12 10:28:10 +01:00

transactions.py

And use buffer(...) there as well

2015-05-05 18:20:01 +01:00