parlement 0.2 → 0.3

data/db/schema.sql

@@ -19,16 +19,15 @@ CREATE DATABASE parlement_development
 \connect parlement_development manu
 
 
-CREATE SEQUENCE people_id_seq;
 CREATE TABLE people (
-    id text PRIMARY KEY default nextval('public.people_id_seq'),
+    id text PRIMARY KEY,
     created_on timestamp with time zone NOT NULL DEFAULT now(),
 		name TEXT UNIQUE,
 		email text
 );
 
 INSERT INTO people (id, name, email)
-VALUES ('echarp', 'echarp', 'manu@noos.fr');
+VALUES ('echarp', 'echarp', 'manu@localhost');
 
 --CREATE TABLE "users" (
 --		id SERIAL PRIMARY KEY,
@@ -69,9 +68,8 @@ CREATE TABLE "users" (
 --VALUES (0, 'echarp', 'manu@echarp.org', '5640f07556079f0f2259f9ad12c6758515dedf94');
 
 
-CREATE SEQUENCE elts_id_seq;
 CREATE TABLE elts (
-    id text PRIMARY KEY default nextval('public.elts_id_seq'),
+    id text PRIMARY KEY,
     parent_id text REFERENCES elts,
     position float,
     created_on timestamp with time zone NOT NULL DEFAULT now(),
@@ -82,44 +80,42 @@ CREATE TABLE elts (
 
 INSERT INTO elts (id, subject) VALUES ('ROOT', '');
 
-CREATE SEQUENCE mails_id_seq;
 CREATE TABLE mails (
-    id text PRIMARY KEY default nextval('public.mails_id_seq'),
+    id text PRIMARY KEY,
     elt_id text NOT NULL REFERENCES elts,
 		message text,
 		mail_parents text,
 		file text
 );
 
-CREATE SEQUENCE attachments_id_seq;
 CREATE TABLE attachments (
-    id text PRIMARY KEY default nextval('attachments_id_seq'),
+    id text PRIMARY KEY,
 		elt_id text NOT NULL REFERENCES elts,
     created_on timestamp with time zone NOT NULL DEFAULT now(),
 		content_type text,
 		file text
 );
 
-CREATE SEQUENCE subscribers_id_seq;
+-- The people_elts relationship
 CREATE TABLE subscribers (
-    id text PRIMARY KEY default nextval('public.subscribers_id_seq'),
     elt_id text NOT NULL REFERENCES elts,
-		email text,
-		confirmed boolean NOT NULL default false
+		person_id text NOT NULL REFERENCES people
 );
 
-INSERT INTO subscribers(elt_id, email, confirmed)
-VALUES ('ROOT', 'manu', true);
+INSERT INTO subscribers(elt_id, person_id)
+VALUES ('ROOT', 'echarp');
 
 CREATE TABLE choices (
     elt_id text NOT NULL REFERENCES elts,
 		person_id text NOT NULL REFERENCES people,
+    created_on timestamp with time zone NOT NULL DEFAULT now(),
 		PRIMARY KEY (elt_id, person_id)
 );
 
 CREATE TABLE delegations (
     elt_id text NOT NULL REFERENCES elts,
 		person_id text NOT NULL REFERENCES people,
+    created_on timestamp with time zone NOT NULL DEFAULT now(),
 		temporary boolean NOT NULL DEFAULT false,
 		delegate_to text NOT NULL REFERENCES people,
 		PRIMARY KEY (elt_id, person_id)

data/lib/data_import.rb

@@ -14,7 +14,7 @@ def inputDir(directory)
 	end
 
 	Dir.foreach(directory) do |d|
-		if (d != '.' and d != '..')
+		if (d != '.' and d != '..' and d != '.svn')
 		dir = directory+'/'+d
 			if (File.directory?(dir) or File.symlink?(dir))
 				#puts 'dir: '+dir
@@ -38,6 +38,8 @@ def inputFile(d, fileName)
 	end
 
 	if elt.created_on == nil or elt.created_on < file.mtime
+		elt.mail = nil
+
 		elt.parent_id = d
 		elt.created_on = file.mtime
 		puts elt.created_on.class