From 341ee214c1d0ab87eb7ae736e15a9b816f6c458e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 9 Oct 2014 09:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=BD=9C=E4=B8=9A=E8=BF=9B=E5=85=A5=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20141009010934_update_bids_proportion.rb  | 12 +++++++++
 db/schema.rb                                  | 25 ++++++++++---------
 2 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 db/migrate/20141009010934_update_bids_proportion.rb

diff --git a/db/migrate/20141009010934_update_bids_proportion.rb b/db/migrate/20141009010934_update_bids_proportion.rb
new file mode 100644
index 000000000..b589a6c32
--- /dev/null
+++ b/db/migrate/20141009010934_update_bids_proportion.rb
@@ -0,0 +1,12 @@
+class UpdateBidsProportion < ActiveRecord::Migration
+  def up
+    Bid.where("proportion is null").each do |bid|
+      bid.proportion = 60
+      bid.save
+    end
+  end
+
+  def down
+
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e13ff4942..172a11ec5 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 => 20140916005319) do
+ActiveRecord::Schema.define(:version => 20141009010934) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -350,6 +350,7 @@ ActiveRecord::Schema.define(:version => 20140916005319) do
     t.integer  "rgt"
     t.integer  "is_public",       :limit => 1, :default => 1
     t.integer  "inherit_members", :limit => 1, :default => 1
+    t.integer  "open_student",                 :default => 0
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -437,9 +438,9 @@ ActiveRecord::Schema.define(:version => 20140916005319) do
     t.string   "web_title"
     t.string   "title"
     t.text     "description"
+    t.string   "page_type"
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
-    t.string   "page_type"
     t.integer  "sort_type"
     t.integer  "image_width",  :default => 107
     t.integer  "image_height", :default => 63
@@ -878,18 +879,18 @@ ActiveRecord::Schema.define(:version => 20140916005319) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
-    t.text     "content",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
-    t.boolean  "sticky",             :default => false
-    t.boolean  "is_quote",           :default => false
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "viewed_count_crawl", :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"