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

2 files changed, 6 insertions, 4 deletions

diff --git a/synapse/storage/schema/delta/v7.sql b/synapse/storage/schema/delta/v7.sql

index e83f7e7436..b60aeda756 100644
--- a/synapse/storage/schema/delta/v7.sql
+++ b/synapse/storage/schema/delta/v7.sql
@@ -17,11 +17,12 @@ CREATE TABLE IF NOT EXISTS pushers (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   user_name TEXT NOT NULL,
   kind varchar(8) NOT NULL,
-  app varchar(64) NOT NULL,
+  app_id varchar(64) NOT NULL,
+  app_instance_id varchar(64) NOT NULL,
   app_display_name varchar(64) NOT NULL,
   device_display_name varchar(128) NOT NULL,
   pushkey blob NOT NULL,
-  data text,
+  data blob,
   last_token TEXT,
   last_success BIGINT,
   failing_since BIGINT,
diff --git a/synapse/storage/schema/pusher.sql b/synapse/storage/schema/pusher.sql

index e83f7e7436..b60aeda756 100644
--- a/synapse/storage/schema/pusher.sql
+++ b/synapse/storage/schema/pusher.sql
@@ -17,11 +17,12 @@ CREATE TABLE IF NOT EXISTS pushers (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   user_name TEXT NOT NULL,
   kind varchar(8) NOT NULL,
-  app varchar(64) NOT NULL,
+  app_id varchar(64) NOT NULL,
+  app_instance_id varchar(64) NOT NULL,
   app_display_name varchar(64) NOT NULL,
   device_display_name varchar(128) NOT NULL,
   pushkey blob NOT NULL,
-  data text,
+  data blob,
   last_token TEXT,
   last_success BIGINT,
   failing_since BIGINT,