X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/c1a2748a2d981e8c91f4fc69c6e67a31880d4c0d..adfcf4dd7d989d0560e2a8f6a590dd10c5a49a08:/db/schema.rb?ds=sidebyside

diff --git a/db/schema.rb b/db/schema.rb
index 590425d..aa46f6f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define() do
+ActiveRecord::Schema.define(:version => 2) do
 
   create_table "candidates", :force => true do |t|
     t.column "election_id", :integer,                                :null => false
@@ -23,25 +23,39 @@ ActiveRecord::Schema.define() do
     t.column "quickuser",       :string
     t.column "election_method", :string,   :limit => 100, :default => "ssd"
     t.column "type",            :string,   :limit => 100, :default => "",    :null => false
+    t.column "embeddable",      :boolean,                 :default => false, :null => false
+    t.column "authenticated",   :boolean,                 :default => true,  :null => false
+    t.column "early_results",   :boolean,                 :default => false, :null => false
   end
 
   add_index "elections", ["user_id"], :name => "fk_user_election"
 
   create_table "pictures", :force => true do |t|
-    t.column "filename",     :string,  :limit => 200
-    t.column "data",         :binary
-    t.column "filetype",     :string,  :limit => 100
+    t.column "filename",     :string
+    t.column "content_type", :string
+    t.column "size",         :integer
+    t.column "width",        :integer
+    t.column "height",       :integer
+    t.column "parent_id",    :integer
+    t.column "thumbnail",    :string
+    t.column "created_at",   :datetime
     t.column "candidate_id", :integer
   end
 
-  add_index "pictures", ["candidate_id"], :name => "fk_candidate_picture"
-
   create_table "rankings", :force => true do |t|
     t.column "vote_id",      :integer
     t.column "candidate_id", :integer
     t.column "rank",         :integer
   end
 
+  create_table "sessions", :force => true do |t|
+    t.column "sessid",     :string
+    t.column "data",       :text
+    t.column "updated_at", :datetime
+  end
+
+  add_index "sessions", ["sessid"], :name => "session_index"
+
   create_table "sitealizer", :force => true do |t|
     t.column "path",       :string
     t.column "ip",         :string
@@ -74,10 +88,11 @@ ActiveRecord::Schema.define() do
   create_table "voters", :force => true do |t|
     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 "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
+    t.column "type",        :string,  :limit => 100, :default => "", :null => false
   end
 
   add_index "voters", ["election_id"], :name => "fk_election_voter"