Merge branch 'master' of git@gitorious.org:statusnet/mainline
This commit is contained in:
commit
c34927ade5
|
@ -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)
|
||||
|
||||
);
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user