diff options
author | Sarven Capadisli <csarven@status.net> | 2009-11-20 05:28:54 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2009-11-20 05:28:54 +0000 |
commit | c34927ade520082cf988dcb2951cd188ecfbd833 (patch) | |
tree | ffd2249d3632f53bfd432b5db04b90c732bfdb9f | |
parent | c6e4feb815a60a7baf613026c414a24c5c918650 (diff) | |
parent | 0b750c5271da3f4c6f044d0288f64bb91e348394 (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
-rw-r--r-- | db/08to09_pg.sql | 6 | ||||
-rw-r--r-- | db/statusnet_pg.sql | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index d9b57fb84..7aaf3a7a0 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -29,13 +29,13 @@ create table config ( ); -create table user_role ( +create table profile_role ( - user_id integer not null /* comment 'user having the role'*/ references "user" (id), + profile_id integer not null /* comment 'account having the role'*/ references profile (id), role varchar(32) not null /* comment 'string representing the role'*/, created timestamp /* not null comment 'date the role was granted'*/, - primary key (user_id, role) + primary key (profile_id, role) ); diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 8dbaf8598..927925753 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -560,13 +560,13 @@ create table config ( ); -create table user_role ( +create table profile_role ( - user_id integer not null /* comment 'user having the role'*/ references "user" (id), + profile_id integer not null /* comment 'account having the role'*/ references profile (id), role varchar(32) not null /* comment 'string representing the role'*/, created timestamp /* not null comment 'date the role was granted'*/, - primary key (user_id, role) + primary key (profile_id, role) ); |