Merge branch '0.9.x' into 1.0.x

2 files changed, 18 insertions, 1 deletions

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 498a94e68..d3eb64443 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -120,3 +120,21 @@ create table inbox (
 
 );
 
+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)
+
+);
+
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 2db98550c..fe0758de8 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -136,7 +136,6 @@ create table notice (
     is_local integer default 0 /* comment 'notice was generated by a user' */,
     source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */,
     conversation integer /*id of root notice in this conversation' */ references notice (id),
-    location varchar(255) /* comment 'physical location' */,
     lat decimal(10,7) /* comment 'latitude'*/ ,
     lon decimal(10,7) /* comment 'longitude'*/ ,
     location_id integer /* comment 'location id if possible'*/ ,