Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 18 insertions, 0 deletions

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 0bd47dea5..4f8281bc3 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -39,6 +39,16 @@ create table profile_role (
 
 );
 
+create table location_namespace (
+
+    id integer /*comment 'identity for this namespace'*/,
+    description text /* comment 'description of the namespace'*/ ,
+    created integer not null /*comment 'date the record was created*/ ,
+   /* modified timestamp comment 'date this record was modified',*/
+    primary key (id)
+
+);
+
 create table login_token (
     user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
     token char(32) not null /* comment 'token useable for logging in'*/,
@@ -69,3 +79,11 @@ ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ;
 ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
 ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
 ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+
+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 timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (profile_id, notice_id)
+);
+