Permalink
Browse files

Merge branch 'MDL-31829_22' of git://github.com/timhunt/moodle into M…

…OODLE_22_STABLE
  • Loading branch information...
2 parents fc7776f + 2db787e commit a9b03dc66185ee727d800865e3519fb9d2632a80 @stronk7 stronk7 committed Mar 6, 2012
Showing with 2 additions and 25 deletions.
  1. +2 −25 question/engine/datalib.php
@@ -770,22 +770,6 @@ protected function delete_usage_records_for_mysql(qubaid_condition $qubaids) {
}
/**
- * This function is a work-around for poor MySQL performance with
- * DELETE FROM x WHERE id IN (SELECT ...). We have to use a non-standard
- * syntax to get good performance. See MDL-29520.
- * @param string $test sql fragment.
- * @param array $params used by $test.
- */
- protected function delete_attempt_steps_for_mysql($test, $params) {
- // TODO once MDL-29589 is fixed, eliminate this method, and instead use the new $DB API.
- $this->db->execute('
- DELETE qas, qasd
- FROM {question_attempt_steps} qas
- LEFT JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id
- WHERE qas.questionattemptid ' . $test, $params);
- }
-
- /**
* Delete all the steps for a question attempt.
* @param int $qaids question_attempt id.
* @param context $context the context that the $quba belongs to.
@@ -796,19 +780,12 @@ public function delete_steps($stepids, $context) {
}
list($test, $params) = $this->db->get_in_or_equal($stepids, SQL_PARAMS_NAMED);
- if ($deletefiles) {
- $this->delete_response_files($context->id, $test, $params);
- }
-
- if ($this->db->get_dbfamily() == 'mysql') {
- $this->delete_attempt_steps_for_mysql($test, $params);
- return;
- }
+ $this->delete_response_files($context->id, $test, $params);
$this->db->delete_records_select('question_attempt_step_data',
"attemptstepid $test", $params);
$this->db->delete_records_select('question_attempt_steps',
- "attemptstepid $test", $params);
+ "id $test", $params);
}
/**

0 comments on commit a9b03dc

Please sign in to comment.