Merge head

[selectricity] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index cc61ca37c0b9abdbf9a6e19760d4749bd2ea6f66..4ea61b7973e5dc269191f16b03c1c4cdfbcba66a 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -20,7 +20,10 @@ 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 "user_id",         :integer

+    t.column "quickuser",       :string

     t.column "election_method", :string,   :limit => 100, :default => "ssd"
     t.column "type",            :string,   :limit => 100, :default => "",    :null => false
   end
     t.column "election_method", :string,   :limit => 100, :default => "ssd"
     t.column "type",            :string,   :limit => 100, :default => "",    :null => false
   end