diff --git a/db/migrate/20150715070534_create_test_result.rb b/db/migrate/20150715070534_create_test_result.rb index f78953129..4816fbcb8 100644 --- a/db/migrate/20150715070534_create_test_result.rb +++ b/db/migrate/20150715070534_create_test_result.rb @@ -1,6 +1,6 @@ class CreateTestResult < ActiveRecord::Migration def up - create_table :student_work_test do |t| + create_table :student_work_tests do |t| t.integer :student_work_id t.integer :homework_test_id t.integer :result @@ -9,5 +9,6 @@ class CreateTestResult < ActiveRecord::Migration end def down + drop_table :student_work_tests end end diff --git a/db/schema.rb b/db/schema.rb index a37d2f9d8..383545cf6 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 => 20150709071731) do +ActiveRecord::Schema.define(:version => 20150715070534) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -723,16 +723,6 @@ ActiveRecord::Schema.define(:version => 20150709071731) 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" @@ -1231,6 +1221,14 @@ ActiveRecord::Schema.define(:version => 20150709071731) do t.integer "project_id" end + create_table "student_work_tests", :force => true do |t| + t.integer "student_work_id" + t.integer "homework_test_id" + t.integer "result" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "student_works", :force => true do |t| t.string "name" t.text "description", :limit => 2147483647