merged back from production

[selectricity-live] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index 6c038deadbd2983e1fb2073265ec989248421809..1195e09286dcff910140f93f171c3186b5e58ac7 100644 (file)
--- 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 => 1) do
 
   create_table "candidates", :force => true do |t|
     t.column "election_id", :integer,                                :null => false
@@ -28,20 +28,31 @@ ActiveRecord::Schema.define() do
   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