X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=schema.sql;h=7f6a0bcdceb07f394be1a37ac5f22a84b4b5de1e;hb=df5ece768e1f6197ca618c89490563e0420fce9d;hp=20ddccb955bc2d7cb17f63c1ded302e55eb14241;hpb=ceddf4b06d5bc343c8de8016ead00ab99abdfeac;p=cavote.git

diff --git a/schema.sql b/schema.sql
index 20ddccb..7f6a0bc 100644
--- a/schema.sql
+++ b/schema.sql
@@ -1,8 +1,9 @@
+drop table if exists user_choice;
 drop table if exists choices;
 drop table if exists attachments;
 drop table if exists votes;
-drop table if exists user_role;
-drop table if exists roles;
+drop table if exists user_group;
+drop table if exists groups;
 drop table if exists users;
 
 create table users (
@@ -15,18 +16,18 @@ create table users (
     key TEXT
 );
 
-create table roles (
+create table groups (
     id INTEGER primary key autoincrement,
     name TEXT,
     system INTEGER default 0 not null 
 );
 
-create table user_role (
+create table user_group (
     id_user INTEGER,
-    id_role INTEGER,
+    id_group INTEGER,
     FOREIGN KEY(id_user) REFERENCES users(id),
-    FOREIGN KEY(id_role) REFERENCES roles(id),
-    PRIMARY KEY(id_user, id_role)
+    FOREIGN KEY(id_group) REFERENCES groups(id),
+    PRIMARY KEY(id_user, id_group)
 );
 
 create table votes (
@@ -42,9 +43,9 @@ create table votes (
     is_weighted INTEGER default 0 not null,
     is_open INTEGER default 0 not null,
     id_author INTEGER, -- :COMMENT:maethor:120528: not null ?
-    id_role INTEGER default 1 not null,
+    id_group INTEGER default 1 not null,
     FOREIGN KEY(id_author) REFERENCES users(id)
-    FOREIGN KEY(id_role) REFERENCES roles(id)
+    FOREIGN KEY(id_group) REFERENCES groups(id)
 );
 
 create table attachments (
@@ -61,10 +62,19 @@ create table choices (
     FOREIGN KEY(id_vote) REFERENCES vote(id)
 );
 
+create table user_choice (
+    id_user INTEGER,
+    id_choice INTEGER,
+    weight INTEGER,
+    FOREIGN KEY(id_user) REFERENCES users(id),
+    FOREIGN KEY(id_choice) REFERENCES choices(id),
+    PRIMARY KEY(id_user, id_choice)
+);
+
 -- Test data
 
 insert into users (email, password, name, organization, is_admin, key) values ("admin@admin.fr", "d033e22ae348aeb5660fc2140aec35850c4da997", "Toto (admin) Tata", "World corp", 1, "test"); -- mdp = admin
-insert into roles (id, name, system) values (1, "Tous", 1);
-insert into roles (name) values ("CA");
-insert into roles (name) values ("Members");
+insert into groups (id, name, system) values (1, "Tous", 1);
+insert into groups (name) values ("CA");
+insert into groups (name) values ("Members");