Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.

1 files changed, 32 insertions, 22 deletions

diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py

index ce158c4b18..a858e46f3b 100644
--- a/synapse/storage/pusher.py
+++ b/synapse/storage/pusher.py
@@ -25,11 +25,13 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+
 class PusherStore(SQLBaseStore):
     @defer.inlineCallbacks
     def get_all_pushers_after_id(self, min_id):
         sql = (
-            "SELECT id, user_name, kind, app, app_display_name, device_display_name, pushkey, data, "
+            "SELECT id, user_name, kind, app_id, app_instance_id,"
+            "app_display_name, device_display_name, pushkey, data, "
             "last_token, last_success, failing_since "
             "FROM pushers "
             "WHERE id > ?"
@@ -42,14 +44,15 @@ class PusherStore(SQLBaseStore):
                 "id": r[0],
                 "user_name": r[1],
                 "kind": r[2],
-                "app": r[3],
-                "app_display_name": r[4],
-                "device_display_name": r[5],
-                "pushkey": r[6],
-                "data": r[7],
-                "last_token": r[8],
-                "last_success": r[9],
-                "failing_since": r[10]
+                "app_id": r[3],
+                "app_instance_id": r[4],
+                "app_display_name": r[5],
+                "device_display_name": r[6],
+                "pushkey": r[7],
+                "data": r[8],
+                "last_token": r[9],
+                "last_success": r[10],
+                "failing_since": r[11]
             }
             for r in rows
         ]
@@ -57,12 +60,14 @@ class PusherStore(SQLBaseStore):
         defer.returnValue(ret)
 
     @defer.inlineCallbacks
-    def add_pusher(self, user_name, kind, app, app_display_name, device_display_name, pushkey, data):
+    def add_pusher(self, user_name, kind, app_id, app_instance_id,
+                   app_display_name, device_display_name, pushkey, data):
         try:
             yield self._simple_insert(PushersTable.table_name, dict(
                 user_name=user_name,
                 kind=kind,
-                app=app,
+                app_id=app_id,
+                app_instance_id=app_instance_id,
                 app_display_name=app_display_name,
                 device_display_name=device_display_name,
                 pushkey=pushkey,
@@ -76,23 +81,27 @@ class PusherStore(SQLBaseStore):
 
     @defer.inlineCallbacks
     def update_pusher_last_token(self, user_name, pushkey, last_token):
-        yield self._simple_update_one(PushersTable.table_name,
-                                      {'user_name': user_name, 'pushkey': pushkey},
-                                      {'last_token': last_token}
+        yield self._simple_update_one(
+            PushersTable.table_name,
+            {'user_name': user_name, 'pushkey': pushkey},
+            {'last_token': last_token}
         )
 
     @defer.inlineCallbacks
-    def update_pusher_last_token_and_success(self, user_name, pushkey, last_token, last_success):
-        yield self._simple_update_one(PushersTable.table_name,
-                                      {'user_name': user_name, 'pushkey': pushkey},
-                                      {'last_token': last_token, 'last_success': last_success}
+    def update_pusher_last_token_and_success(self, user_name, pushkey,
+                                             last_token, last_success):
+        yield self._simple_update_one(
+            PushersTable.table_name,
+            {'user_name': user_name, 'pushkey': pushkey},
+            {'last_token': last_token, 'last_success': last_success}
         )
 
     @defer.inlineCallbacks
     def update_pusher_failing_since(self, user_name, pushkey, failing_since):
-        yield self._simple_update_one(PushersTable.table_name,
-                                      {'user_name': user_name, 'pushkey': pushkey},
-                                      {'failing_since': failing_since}
+        yield self._simple_update_one(
+            PushersTable.table_name,
+            {'user_name': user_name, 'pushkey': pushkey},
+            {'failing_since': failing_since}
         )
 
 
@@ -103,7 +112,8 @@ class PushersTable(Table):
         "id",
         "user_name",
         "kind",
-        "app"
+        "app_id",
+        "app_instance_id",
         "app_display_name",
         "device_display_name",
         "pushkey",