Merge with master

1 files changed, 15 insertions, 1 deletions

diff --git a/databaseschema.psql b/databaseschema.psql
index d168882..e12813e 100644
--- a/databaseschema.psql
+++ b/databaseschema.psql
@@ -205,4 +205,18 @@ CONSTRAINT fk_object FOREIGN KEY (object) REFERENCES cacheactivitystream(id)
 CREATE TABLE IF NOT EXISTS removed(
 id varchar(100),
 type varchar(25)
-);
\ No newline at end of file
+);
+
+ALTER TABLE activitystream ADD COLUMN IF NOT EXISTS tripcode varchar(50) default '';
+ALTER TABLE cacheactivitystream ADD COLUMN IF NOT EXISTS tripcode varchar(50) default '';
+
+CREATE TABLE IF NOT EXISTS publicKeyPem(
+id varchar(100) UNIQUE,
+owner varchar(100),
+file varchar(100)
+);
+
+ALTER TABLE actor ADD COLUMN IF NOT EXISTS publicKeyPem varchar(100) default '';
+
+ALTER TABLE activitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
+ALTER TABLE cacheactivitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
\ No newline at end of file