Merge from jdong

[selectricity] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index 6c038deadbd2983e1fb2073265ec989248421809..590425d670859ee07aab24761a30d00f5c780eb2 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -74,11 +74,10 @@ ActiveRecord::Schema.define() do
   create_table "voters", :force => true do |t|
     t.column "email",       :string,  :limit => 100
     t.column "password",    :string,  :limit => 100
   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 "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"
   end
 
   add_index "voters", ["election_id"], :name => "fk_election_voter"