Merge mako

[selectricity] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index b86be118134b706e923f7971fe30264943053679..45d7b416a2eb0a25c752c23b3ddfe74920236c8f 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,65 +2,70 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 0) do
+ActiveRecord::Schema.define() do
 
   create_table "candidates", :force => true do |t|
-    t.column "election_id", :integer, :default => 0, :null => false
-    t.column "name", :string, :limit => 100, :default => "", :null => false
-    t.column "picture", :binary, :default => "", :null => false
+    t.column "election_id",      :integer,                                :null => false
+    t.column "name",             :string,  :limit => 100, :default => "", :null => false
+    t.column "description",      :text
+    t.column "picture_filename", :string,  :limit => 200
+    t.column "picture_data",     :binary
+    t.column "picture_type",     :string,  :limit => 100
   end
 
   create_table "elections", :force => true do |t|
-    t.column "name", :string, :limit => 100, :default => "", :null => false
-    t.column "description", :text, :default => "", :null => false
-    t.column "anonymous", :integer, :limit => 4, :default => 0, :null => false
-    t.column "startdate", :datetime, :null => false
-    t.column "enddate", :datetime
+    t.column "name",        :string,   :limit => 100, :default => "", :null => false
+    t.column "description", :text,                    :default => "", :null => false
+    t.column "anonymous",   :integer,  :limit => 4,   :default => 1,  :null => false
+    t.column "startdate",   :datetime
+    t.column "enddate",     :datetime,                                :null => false
+    t.column "active",      :integer,  :limit => 4,   :default => 0,  :null => false
+    t.column "user_id",     :integer
+    t.column "type",        :string,   :limit => 100, :default => "", :null => false
   end
 
+  add_index "elections", ["user_id"], :name => "fk_user_election"
+
   create_table "rankings", :force => true do |t|
-    t.column "vote_id", :integer
+    t.column "vote_id",      :integer
     t.column "candidate_id", :integer
-    t.column "rank", :integer
+    t.column "rank",         :integer
   end
 
   create_table "tokens", :force => true do |t|
-    t.column "token", :string, :limit => 100, :default => "", :null => false
-    t.column "vote_id", :integer, :default => 0, :null => false
+    t.column "token",   :string,  :limit => 100, :default => "", :null => false
+    t.column "vote_id", :integer,                                :null => false
   end
 
   add_index "tokens", ["vote_id"], :name => "fk_vote_token"
 
   create_table "users", :force => true do |t|
-    t.column "login", :string, :limit => 80, :default => "", :null => false
-    t.column "salted_password", :string, :limit => 40, :default => "", :null => false
-    t.column "email", :string, :limit => 60, :default => "", :null => false
-    t.column "firstname", :string, :limit => 40
-    t.column "lastname", :string, :limit => 40
-    t.column "salt", :string, :limit => 40, :default => "", :null => false
-    t.column "verified", :integer, :default => 0
-    t.column "role", :string, :limit => 40
-    t.column "security_token", :string, :limit => 40
-    t.column "token_expiry", :datetime
-    t.column "created_at", :datetime
-    t.column "updated_at", :datetime
-    t.column "logged_in_at", :datetime
-    t.column "deleted", :integer, :default => 0
-    t.column "delete_after", :datetime
+    t.column "login",                     :text
+    t.column "ip",                        :text,                   :default => "", :null => false
+    t.column "email",                     :text
+    t.column "crypted_password",          :string,   :limit => 40
+    t.column "salt",                      :string,   :limit => 40
+    t.column "created_at",                :datetime
+    t.column "updated_at",                :datetime
+    t.column "remember_token",            :text
+    t.column "remember_token_expires_at", :datetime
   end
 
   create_table "voters", :force => true do |t|
-    t.column "email", :string, :limit => 100, :default => "", :null => false
-    t.column "password", :string, :limit => 100, :default => "", :null => false
-    t.column "contacted", :integer, :limit => 4, :default => 0, :null => false
-    t.column "election_id", :integer, :default => 0, :null => false
+    t.column "email",       :string,  :limit => 100
+    t.column "password",    :string,  :limit => 100
+    t.column "contacted",   :integer, :limit => 4,   :default => 0, :null => false
+    t.column "election_id", :integer,                               :null => false
+    t.column "session_id",  :string,  :limit => 32
+    t.column "ipaddress",   :string,  :limit => 32
   end
 
   add_index "voters", ["election_id"], :name => "fk_election_voter"
 
   create_table "votes", :force => true do |t|
-    t.column "voter_id", :integer
-    t.column "confirmed", :integer, :limit => 4, :default => 0, :null => false
+    t.column "voter_id",  :integer
+    t.column "confirmed", :integer,  :limit => 4, :default => 0, :null => false
+    t.column "time",      :datetime
   end
 
   add_index "votes", ["voter_id"], :name => "fk_vote_voter"