Streamlined and made more consistent the code that checks for custom skin uploads...

[selectricity-live] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index 4ea61b7973e5dc269191f16b03c1c4cdfbcba66a..e3f8d16363eb0ecaacb2889a0cb90022b606c2d9 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,40 +2,81 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define() do
+ActiveRecord::Schema.define(:version => 3) 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 "picture_filename", :string,  :limit => 200
-    t.column "picture_data",     :binary
-    t.column "picture_type",     :string,  :limit => 100
+    t.column "election_id", :integer,                                :null => false
+    t.column "name",        :string,  :limit => 100, :default => "", :null => false
+    t.column "description", :text
   end
 
   create_table "elections", :force => true do |t|
-    t.column "name",            :string,   :limit => 100, :default => "",    :null => false
-    t.column "description",     :text,                    :default => "",    :null => false
-    t.column "anonymous",       :integer,  :limit => 4,   :default => 1,     :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 "type",            :string,   :limit => 100, :default => "",    :null => false
+    t.column "name",                :string,   :limit => 100, :default => "",    :null => false
+    t.column "description",         :text,                    :default => "",    :null => false
+    t.column "anonymous",           :integer,  :limit => 4,   :default => 1,     :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 "type",                :string,   :limit => 100, :default => "",    :null => false
+    t.column "embeddable",          :boolean,                 :default => false, :null => false
+    t.column "authenticated",       :boolean,                 :default => true,  :null => false
+    t.column "early_results",       :boolean,                 :default => false, :null => false
+    t.column "embed_custom_string", :string
   end
 
   add_index "elections", ["user_id"], :name => "fk_user_election"
 
+  create_table "pictures", :force => true do |t|
+    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
+
   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
+    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 "skin_pictures", :force => true do |t|
+    t.column "filename",     :string
+    t.column "content_type", :string
+    t.column "size",         :integer
+    t.column "width",        :integer
+    t.column "height",       :integer
+    t.column "created_at",   :datetime
+    t.column "user_id",      :integer
+  end
+
   create_table "tokens", :force => true do |t|
     t.column "token",   :string,  :limit => 100, :default => "", :null => false
     t.column "vote_id", :integer,                                :null => false
@@ -58,10 +99,11 @@ ActiveRecord::Schema.define() do
   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 "type",        :string,  :limit => 100, :default => "", :null => false
   end
 
   add_index "voters", ["election_id"], :name => "fk_election_voter"