From 04c064ddc8b687bfd31ba2f1b0247ebf701aceb2 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 26 Mar 2015 16:22:16 +0800
Subject: [PATCH] nothing

---
 db/schema.rb | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index bad1cf2ae..b676abe7f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150305081132) do
+ActiveRecord::Schema.define(:version => 20150324021043) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -422,6 +422,13 @@ ActiveRecord::Schema.define(:version => 20150305081132) do
   add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
   add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -631,6 +638,16 @@ ActiveRecord::Schema.define(:version => 20150305081132) 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"
@@ -671,6 +688,17 @@ ActiveRecord::Schema.define(:version => 20150305081132) do
     t.integer  "is_comprehensive_evaluation"
   end
 
+  create_table "kindeditor_assets", :force => true do |t|
+    t.string   "asset"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.integer  "owner_id"
+    t.string   "asset_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.integer  "owner_type", :default => 0
+  end
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1041,12 +1069,12 @@ ActiveRecord::Schema.define(:version => 20150305081132) do
   end
 
   create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
+    t.string  "name",              :limit => 90
+    t.integer "position"
+    t.boolean "assignable"
+    t.integer "builtin"
     t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
+    t.string  "issues_visibility", :limit => 90
   end
 
   create_table "schools", :force => true do |t|