From 546ffde4983333f1c4a1f8086cfef3f90bfcd329 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Mon, 20 Jul 2015 09:09:04 +0800
Subject: [PATCH] commit

---
 db/schema.rb | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 78dfb5eee..70a3fb2c1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,12 +11,14 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150702073308) do
+ActiveRecord::Schema.define(:version => 20150715162300) do
 
   create_table "activities", :force => true do |t|
-    t.integer "act_id",   :null => false
-    t.string  "act_type", :null => false
-    t.integer "user_id",  :null => false
+    t.integer "act_id",                                  :null => false
+    t.string  "act_type",                                :null => false
+    t.integer "user_id",                                 :null => false
+    t.integer "activity_container_id"
+    t.string  "activity_container_type", :default => ""
   end
 
   add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
@@ -721,16 +723,6 @@ ActiveRecord::Schema.define(:version => 20150702073308) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
@@ -1340,7 +1332,7 @@ ActiveRecord::Schema.define(:version => 20150702073308) do
   end
 
   create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",            :null => false
+    t.integer  "user_id",                            :null => false
     t.date     "birthday"
     t.string   "brief_introduction"
     t.integer  "gender"
@@ -1348,8 +1340,8 @@ ActiveRecord::Schema.define(:version => 20150702073308) do
     t.string   "occupation"
     t.integer  "work_experience"
     t.integer  "zip_code"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
     t.string   "technical_title"
     t.integer  "identity"
     t.string   "student_id"
@@ -1357,6 +1349,7 @@ ActiveRecord::Schema.define(:version => 20150702073308) do
     t.string   "student_realname"
     t.string   "location_city"
     t.integer  "school_id"
+    t.string   "description",        :default => ""
   end
 
   create_table "user_grades", :force => true do |t|
@@ -1462,6 +1455,17 @@ ActiveRecord::Schema.define(:version => 20150702073308) do
   add_index "versions", ["project_id"], :name => "versions_project_id"
   add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
 
+  create_table "visitors", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "master_id"
+    t.datetime "updated_on"
+    t.datetime "created_on"
+  end
+
+  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
+  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
+  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
+
   create_table "watchers", :force => true do |t|
     t.string  "watchable_type", :default => "", :null => false
     t.integer "watchable_id",   :default => 0,  :null => false