Merge commit 'origin/0.9.x' into 0.9.x

1 files changed, 19 insertions, 0 deletions

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index c2fabf63b..d3eb64443 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -100,6 +100,25 @@ insert into queue_item_new (frame,transport,created,claimed)
 alter table queue_item rename to queue_item_old;
 alter table queue_item_new rename to queue_item;
 
+ALTER TABLE confirm_address ALTER column sent set default CURRENT_TIMESTAMP;
+
+create table user_location_prefs (
+    user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
+    share_location int default 1 /* comment 'Whether to share location data'*/,
+    created timestamp not null /*comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    primary key (user_id)
+);
+ 
+create table inbox (
+
+    user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
+    notice_ids bytea /* comment 'packed list of notice ids' */,
+
+    primary key (user_id)
+
+);
 
 create table user_location_prefs (
     user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),