Merge head

[selectricity] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index 57e39ac71a9e5a32490b72134fe9992cb5668dc1..4ea61b7973e5dc269191f16b03c1c4cdfbcba66a 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -5,9 +5,12 @@
 ActiveRecord::Schema.define() do
 
   create_table "candidates", :force => true do |t|
 ActiveRecord::Schema.define() do
 
   create_table "candidates", :force => true do |t|

-    t.column "election_id", :integer,                                :null => false
-    t.column "name",        :string,  :limit => 100, :default => "", :null => false
-    t.column "description", :text
+    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|
   end
 
   create_table "elections", :force => true do |t|


@@ -17,6 +20,8 @@ ActiveRecord::Schema.define() do
     t.column "startdate",       :datetime
     t.column "enddate",         :datetime,                                   :null => false
     t.column "active",          :integer,  :limit => 4,   :default => 0,     :null => false
     t.column "startdate",       :datetime
     t.column "enddate",         :datetime,                                   :null => false
     t.column "active",          :integer,  :limit => 4,   :default => 0,     :null => false

+    t.column "viewable",        :integer,  :limit => 4,   :default => 1,     :null => false
+    t.column "notices",         :integer,  :limit => 4,   :default => 0,     :null => false

     t.column "user_id",         :integer
     t.column "quickuser",       :string
     t.column "election_method", :string,   :limit => 100, :default => "ssd"
     t.column "user_id",         :integer
     t.column "quickuser",       :string
     t.column "election_method", :string,   :limit => 100, :default => "ssd"


@@ -25,15 +30,6 @@ ActiveRecord::Schema.define() do
 
   add_index "elections", ["user_id"], :name => "fk_user_election"
 
 
   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 "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
   create_table "rankings", :force => true do |t|
     t.column "vote_id",      :integer
     t.column "candidate_id", :integer