Merge branch '0.9.x' into forward

diff --git a/db/statusnet.sql b/db/statusnet.sql
index 18abcdfdb2d8b479b2b4489205ab31990a21991b..b500b81f2d0c2e00a985df6fd4d0376ba3835f97 100644 (file)
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -585,3 +585,14 @@ create table login_token (
     constraint primary key (user_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
+create table forward (
+
+    profile_id integer not null comment 'profile who forwarded the notice' references profile (id),
+    notice_id integer not null comment 'notice they forwarded' references notice (id),
+
+    created datetime not null comment 'date this record was created',
+
+    constraint primary key (profile_id, notice_id)
+
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+