From 5e484022b384a668b04f9de9a0e314713c918626 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 20 Jul 2019 14:41:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20190720062632_migrate_course_group_position.rb   | 11 -----------
 .../20190720063520_migrate_course_groups_position.rb  | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 db/migrate/20190720062632_migrate_course_group_position.rb
 create mode 100644 db/migrate/20190720063520_migrate_course_groups_position.rb

diff --git a/db/migrate/20190720062632_migrate_course_group_position.rb b/db/migrate/20190720062632_migrate_course_group_position.rb
deleted file mode 100644
index 9b78c2e29..000000000
--- a/db/migrate/20190720062632_migrate_course_group_position.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class MigrateCourseGroupPosition < ActiveRecord::Migration[5.2]
-  def change
-    Course.find_each do |course|
-      position = 1
-      course.course_groups.reorder("CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").find_each do |group|
-        group.update_attribute(:position, position)
-        position += 1
-      end
-    end
-  end
-end
diff --git a/db/migrate/20190720063520_migrate_course_groups_position.rb b/db/migrate/20190720063520_migrate_course_groups_position.rb
new file mode 100644
index 000000000..dbc38a9b5
--- /dev/null
+++ b/db/migrate/20190720063520_migrate_course_groups_position.rb
@@ -0,0 +1,11 @@
+class MigrateCourseGroupsPosition < ActiveRecord::Migration[5.2]
+  def change
+    Course.find_each do |course|
+      position = 1
+      course.course_groups.unscoped.reorder("CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").each do |group|
+        group.update_attribute(:position, position)
+        position += 1
+      end
+    end
+  end
+end

From aaf492e34af7d55affed7f290c46c5406fa4b3fd Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 20 Jul 2019 15:18:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20190309085449_migrate_course_members.rb   |  2 +-
 .../20190720063520_migrate_course_groups_position.rb  | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 db/migrate/20190720063520_migrate_course_groups_position.rb

diff --git a/db/migrate/20190309085449_migrate_course_members.rb b/db/migrate/20190309085449_migrate_course_members.rb
index 1e4e8c819..a6d049dd7 100644
--- a/db/migrate/20190309085449_migrate_course_members.rb
+++ b/db/migrate/20190309085449_migrate_course_members.rb
@@ -4,7 +4,7 @@ class MigrateCourseMembers < ActiveRecord::Migration[5.2]
 
     Course.find_each do |course|
       position = 1
-      course.course_groups.reorder("CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").find_each do |group|
+      course.course_groups.reorder("CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").each do |group|
         group.update_attribute(:position, position)
         position += 1
       end
diff --git a/db/migrate/20190720063520_migrate_course_groups_position.rb b/db/migrate/20190720063520_migrate_course_groups_position.rb
deleted file mode 100644
index dbc38a9b5..000000000
--- a/db/migrate/20190720063520_migrate_course_groups_position.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class MigrateCourseGroupsPosition < ActiveRecord::Migration[5.2]
-  def change
-    Course.find_each do |course|
-      position = 1
-      course.course_groups.unscoped.reorder("CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").each do |group|
-        group.update_attribute(:position, position)
-        position += 1
-      end
-    end
-  end
-end