From 2243e890774b2a7bf26f0aba24e13f08ad02069a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 22 Jun 2019 13:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20190328134047_sync_shixuninfo.rb              | 8 --------
 db/migrate/20190328152957_remove_column_for_shixun.rb     | 5 -----
 ...060799_modify_script_and_description_for_shixuninfo.rb | 1 +
 3 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 db/migrate/20190328134047_sync_shixuninfo.rb
 delete mode 100644 db/migrate/20190328152957_remove_column_for_shixun.rb

diff --git a/db/migrate/20190328134047_sync_shixuninfo.rb b/db/migrate/20190328134047_sync_shixuninfo.rb
deleted file mode 100644
index bb374dc29..000000000
--- a/db/migrate/20190328134047_sync_shixuninfo.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class SyncShixuninfo < ActiveRecord::Migration[5.2]
-  def change
-    Shixun.find_each do |shixun|
-      ShixunInfo.create!(propaedeutics: shixun.propaedeutics, description: shixun.description,
-                         evaluate_script: shixun.evaluate_script, shixun_id: shixun.id)
-    end
-  end
-end
diff --git a/db/migrate/20190328152957_remove_column_for_shixun.rb b/db/migrate/20190328152957_remove_column_for_shixun.rb
deleted file mode 100644
index 70131a4b2..000000000
--- a/db/migrate/20190328152957_remove_column_for_shixun.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveColumnForShixun < ActiveRecord::Migration[5.2]
-  def change
-    remove_columns :shixuns, :description, :propaedeutics, :evaluate_script
-  end
-end
diff --git a/db/migrate/20190605060799_modify_script_and_description_for_shixuninfo.rb b/db/migrate/20190605060799_modify_script_and_description_for_shixuninfo.rb
index 4b3318d56..151d3c03e 100644
--- a/db/migrate/20190605060799_modify_script_and_description_for_shixuninfo.rb
+++ b/db/migrate/20190605060799_modify_script_and_description_for_shixuninfo.rb
@@ -11,5 +11,6 @@ class ModifyScriptAndDescriptionForShixuninfo < ActiveRecord::Migration[5.2]
                            evaluate_script: shixun[:evaluate_script], shixun_id: shixun.id)
       end
     end
+    remove_columns :shixuns, :description, :propaedeutics, :evaluate_script
   end
 end