From cda4a6f93f695cf35eea334ba17e8694aeeab58c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 10 Apr 2015 10:19:50 +0100
Subject: [PATCH] Revert non-trivial changes to upgrade scripts

---
 synapse/storage/schema/delta/12/v12.sql | 4 ++--
 synapse/storage/schema/delta/13/v13.sql | 4 ++--
 synapse/storage/schema/delta/14/v14.sql | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/synapse/storage/schema/delta/12/v12.sql b/synapse/storage/schema/delta/12/v12.sql
index ed8a2f3f1..f0d7e74b8 100644
--- a/synapse/storage/schema/delta/12/v12.sql
+++ b/synapse/storage/schema/delta/12/v12.sql
@@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS rejections(
 
 -- Push notification endpoints that users have configured
 CREATE TABLE IF NOT EXISTS pushers (
-  id BIGINT PRIMARY KEY,
+  id BIGINT PRIMARY KEY AUTOINCREMENT,
   user_name VARCHAR(150) NOT NULL,
   profile_tag VARCHAR(32) NOT NULL,
   kind VARCHAR(8) NOT NULL,
@@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS pushers (
 );
 
 CREATE TABLE IF NOT EXISTS push_rules (
-  id BIGINT PRIMARY KEY,
+  id BIGINT PRIMARY KEY AUTOINCREMENT,
   user_name VARCHAR(150) NOT NULL,
   rule_id VARCHAR(150) NOT NULL,
   priority_class TINYINT NOT NULL,
diff --git a/synapse/storage/schema/delta/13/v13.sql b/synapse/storage/schema/delta/13/v13.sql
index ef6551f3a..202adc720 100644
--- a/synapse/storage/schema/delta/13/v13.sql
+++ b/synapse/storage/schema/delta/13/v13.sql
@@ -14,7 +14,7 @@
  */
 
 CREATE TABLE IF NOT EXISTS application_services(
-    id BIGINT PRIMARY KEY,
+    id BIGINT PRIMARY KEY AUTOINCREMENT,
     url VARCHAR(150),
     token VARCHAR(150),
     hs_token VARCHAR(150),
@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS application_services(
 );
 
 CREATE TABLE IF NOT EXISTS application_services_regex(
-    id BIGINT PRIMARY KEY,
+    id BIGINT PRIMARY KEY AUTOINCREMENT,
     as_id BIGINT NOT NULL,
     namespace INTEGER,  /* enum[room_id|room_alias|user_id] */
     regex VARCHAR(150),
diff --git a/synapse/storage/schema/delta/14/v14.sql b/synapse/storage/schema/delta/14/v14.sql
index f1208c731..db091fcd5 100644
--- a/synapse/storage/schema/delta/14/v14.sql
+++ b/synapse/storage/schema/delta/14/v14.sql
@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS push_rules_enable (
-  id BIGINT PRIMARY KEY,
+  id BIGINT PRIMARY KEY AUTOINCREMENT,
   user_name VARCHAR(150) NOT NULL,
   rule_id VARCHAR(150) NOT NULL,
   enabled TINYINT,