summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-03-16 10:16:59 +0000
committerKegan Dougal <kegan@matrix.org>2015-03-16 10:16:59 +0000
commit835e01fc7047e34a813936544027596627a112df (patch)
tree3cc833fa3756b7e21750c17f498bf438298cef1f /synapse/storage
parentMerge branch 'develop' into application-services-txn-reliability (diff)
downloadsynapse-835e01fc7047e34a813936544027596627a112df.tar.xz
Minor PR comment tweaks.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/__init__.py2
-rw-r--r--synapse/storage/appservice.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index efef859214..e752b035e6 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -82,7 +82,7 @@ class DataStore(RoomMemberStore, RoomStore,
                 FilteringStore,
                 PusherStore,
                 PushRuleStore,
-                ApplicationServiceTransactionStore
+                ApplicationServiceTransactionStore,
                 ):
 
     def __init__(self, hs):
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index 670e1d56af..e928812bc9 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -365,9 +365,9 @@ class ApplicationServiceTransactionStore(SQLBaseStore):
             may be empty.
         """
         sql = (
-            "SELECT r.*, a.* FROM application_services_state AS s LEFT JOIN "
-            "application_services AS a ON a.id=s.as_id LEFT JOIN "
-            "application_services_regex AS r ON r.as_id=a.id WHERE state = ?"
+            "SELECT r.*, a.* FROM application_services_state AS s LEFT JOIN"
+            " application_services AS a ON a.id=s.as_id LEFT JOIN"
+            " application_services_regex AS r ON r.as_id=a.id WHERE state = ?"
         )
         results = yield self._execute_and_decode(
             "get_appservices_by_state", sql, state