From 72f2e13d041ab0f56d0dad07c3d240a5ec0aeebe Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Fri, 15 Jun 2012 13:53:02 +0100
Subject: [PATCH] MDL-33778 quiz statistics: part and class ids can be strings,
 not just ints.

---
 mod/quiz/report/statistics/db/install.xml |  4 ++--
 mod/quiz/report/statistics/db/upgrade.php | 26 +++++++++++++++++++++++
 mod/quiz/report/statistics/version.php    |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/mod/quiz/report/statistics/db/install.xml b/mod/quiz/report/statistics/db/install.xml
index 7184605d7f3..9a2186ea48a 100644
--- a/mod/quiz/report/statistics/db/install.xml
+++ b/mod/quiz/report/statistics/db/install.xml
@@ -55,8 +55,8 @@
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true" NEXT="quizstatisticsid"/>
         <FIELD NAME="quizstatisticsid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" PREVIOUS="id" NEXT="questionid"/>
         <FIELD NAME="questionid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" PREVIOUS="quizstatisticsid" NEXT="subqid"/>
-        <FIELD NAME="subqid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" PREVIOUS="questionid" NEXT="aid"/>
-        <FIELD NAME="aid" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false" PREVIOUS="subqid" NEXT="response"/>
+        <FIELD NAME="subqid" TYPE="char" LENGTH="100" NOTNULL="true" SEQUENCE="false" PREVIOUS="questionid" NEXT="aid"/>
+        <FIELD NAME="aid" TYPE="char" LENGTH="100" NOTNULL="false" SEQUENCE="false" PREVIOUS="subqid" NEXT="response"/>
         <FIELD NAME="response" TYPE="text" LENGTH="big" NOTNULL="false" SEQUENCE="false" PREVIOUS="aid" NEXT="rcount"/>
         <FIELD NAME="rcount" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false" PREVIOUS="response" NEXT="credit"/>
         <FIELD NAME="credit" TYPE="number" LENGTH="15" NOTNULL="true" SEQUENCE="false" DECIMALS="5" PREVIOUS="rcount"/>
diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php
index 00f93502db1..f3a78718cd2 100644
--- a/mod/quiz/report/statistics/db/upgrade.php
+++ b/mod/quiz/report/statistics/db/upgrade.php
@@ -37,6 +37,32 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
     // Moodle v2.2.0 release upgrade line.
     // Put any upgrade step following this.
 
+    if ($oldversion < 2012061800) {
+
+        // Changing type of field subqid on table quiz_question_response_stats to char.
+        $table = new xmldb_table('quiz_question_response_stats');
+        $field = new xmldb_field('subqid', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, null, 'questionid');
+
+        // Launch change of type for field subqid.
+        $dbman->change_field_type($table, $field);
+
+        // Statistics savepoint reached.
+        upgrade_plugin_savepoint(true, 2012061800, 'quiz', 'statistics');
+    }
+
+    if ($oldversion < 2012061801) {
+
+        // Changing type of field aid on table quiz_question_response_stats to char.
+        $table = new xmldb_table('quiz_question_response_stats');
+        $field = new xmldb_field('aid', XMLDB_TYPE_CHAR, '100', null, null, null, null, 'subqid');
+
+        // Launch change of type for field aid.
+        $dbman->change_field_type($table, $field);
+
+        // Statistics savepoint reached.
+        upgrade_plugin_savepoint(true, 2012061801, 'quiz', 'statistics');
+    }
+
     return true;
 }
 
diff --git a/mod/quiz/report/statistics/version.php b/mod/quiz/report/statistics/version.php
index 1db495a6fcf..b9d77cce797 100644
--- a/mod/quiz/report/statistics/version.php
+++ b/mod/quiz/report/statistics/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012061700;
+$plugin->version   = 2012061801;
 $plugin->requires  = 2012061700;
 $plugin->cron      = 18000;
 $plugin->component = 'quiz_statistics';