Merge from jdong

[selectricity-live] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index 57e39ac71a9e5a32490b72134fe9992cb5668dc1..590425d670859ee07aab24761a30d00f5c780eb2 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -17,6 +17,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"


@@ -40,6 +42,16 @@ ActiveRecord::Schema.define() do
     t.column "rank",         :integer
   end
 
     t.column "rank",         :integer
   end
 

+  create_table "sitealizer", :force => true do |t|
+    t.column "path",       :string
+    t.column "ip",         :string
+    t.column "referer",    :string
+    t.column "language",   :string
+    t.column "user_agent", :string
+    t.column "created_at", :datetime
+    t.column "created_on", :date
+  end
+

   create_table "tokens", :force => true do |t|
     t.column "token",   :string,  :limit => 100, :default => "", :null => false
     t.column "vote_id", :integer,                                :null => false
   create_table "tokens", :force => true do |t|
     t.column "token",   :string,  :limit => 100, :default => "", :null => false
     t.column "vote_id", :integer,                                :null => false