Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

1 files changed, 10 insertions, 0 deletions

diff --git a/db/laconica.sql b/db/laconica.sql
index 7f52a5ef7..bc824fc4d 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -483,3 +483,13 @@ create table file_to_post (
 
     unique(file_id, post_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table group_block (
+   group_id integer not null comment 'group profile is blocked from' references user_group (id),
+   blocked integer not null comment 'profile that is blocked' references profile (id),
+   blocker integer not null comment 'user making the block' references user (id),
+   modified timestamp comment 'date of blocking',
+
+   constraint primary key (group_id, blocked)
+
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;