Merge into jdong

[selectricity] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index 4ea61b7973e5dc269191f16b03c1c4cdfbcba66a..590425d670859ee07aab24761a30d00f5c780eb2 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -5,12 +5,9 @@
 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 "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|
   end
 
   create_table "elections", :force => true do |t|


@@ -30,12 +27,31 @@ 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
     t.column "rank",         :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 "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