Merge remote-tracking branch 'origin/develop' into develop

lib/tasks/statistic_subject_info.rake

@@ -23,7 +23,8 @@ namespace :subjects do
             "#{data.passed_count}, #{data.course_used_count}, #{data.school_used_count}, " +
             "'#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')")
         buffer_size += 1
-        if buffer_size == 1000 || subjects.count == (index+1)
+        puts "buffer_size: #{buffer_size}; subjects_count: #{s.count}; index:#{index+1}"
+        if buffer_size == 1000 || s.count == (index+1)
           sql = "REPLACE INTO subject_records(#{column_value}) VALUES #{str}"
           puts sql
           ActiveRecord::Base.connection.execute sql