From d9928096236dc56ca14ff6814fef3989769026c6 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 27 Nov 2015 17:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 603ca6857..87342bf9c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -605,7 +605,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do end create_table "exercise_questions", :force => true do |t| - t.string "question_title" + t.text "question_title" t.integer "question_type" t.integer "question_number" t.integer "exercise_id" @@ -634,7 +634,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do end create_table "exercises", :force => true do |t| - t.string "exercise_name" + t.text "exercise_name" t.text "exercise_description" t.integer "course_id" t.integer "exercise_status" @@ -1151,10 +1151,6 @@ ActiveRecord::Schema.define(:version => 20151127011351) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" -<<<<<<< HEAD - t.string "role" -======= ->>>>>>> 1ae514ca4857d7e2ad53b338731c1e01f899fb4d t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end