Second pass. Questions. Some more default comments are out. MDL-11385

diff --git a/question/type/calculated/db/install.xml b/question/type/calculated/db/install.xml
index 28c0e3cef30d48f1c1844ee1700939a7d8ce4253..9f7ac7e1bf3b1ca8ec2c248cf4decb0cbc4691c0 100644 (file)
--- a/question/type/calculated/db/install.xml
+++ b/question/type/calculated/db/install.xml
@@ -12,7 +12,7 @@
         <FIELD NAME="correctanswerformat" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="2" SEQUENCE="false" ENUM="false" PREVIOUS="correctanswerlength"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_calculated" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
       <INDEXES>
@@ -20,4 +20,4 @@
       </INDEXES>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/question/type/match/db/install.xml b/question/type/match/db/install.xml
index edc97c1495fc4164cbef510bde41524af117818a..f02bbec0756ee4e1162ee27d3268a643579729ac 100644 (file)
--- a/question/type/match/db/install.xml
+++ b/question/type/match/db/install.xml
@@ -9,7 +9,7 @@
         <FIELD NAME="shuffleanswers" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="false" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="subquestions"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_match" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
@@ -22,9 +22,9 @@
         <FIELD NAME="answertext" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="questiontext"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_match_sub" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/question/type/multianswer/db/install.xml b/question/type/multianswer/db/install.xml
index cc87b2941fce50f176b865eeef7d17cf3878e92c..90f056f9949ea2f915340b2ab47ad0cb4c617653 100644 (file)
--- a/question/type/multianswer/db/install.xml
+++ b/question/type/multianswer/db/install.xml
@@ -8,9 +8,9 @@
         <FIELD NAME="sequence" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="question"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_multianswer" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/question/type/multichoice/db/install.xml b/question/type/multichoice/db/install.xml
index 7c504cc65fb2d8c2d7f0177633da148f1d7f9178..8c32728467231dafe8faf20584b756343f8cb5cd 100644 (file)
--- a/question/type/multichoice/db/install.xml
+++ b/question/type/multichoice/db/install.xml
@@ -18,9 +18,9 @@
         <FIELD NAME="answernumbering" TYPE="char" LENGTH="10" NOTNULL="true" DEFAULT="abc" SEQUENCE="false" ENUM="false" COMMENT="Indicates how and whether the choices should be numbered." PREVIOUS="incorrectfeedback"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_multichoice" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/question/type/numerical/db/install.xml b/question/type/numerical/db/install.xml
index 1530ee150f23b62439e3cb253378df304d629022..c06857c956caeaa2e47daf713214779d2d882733 100644 (file)
--- a/question/type/numerical/db/install.xml
+++ b/question/type/numerical/db/install.xml
@@ -9,7 +9,7 @@
         <FIELD NAME="tolerance" TYPE="char" LENGTH="255" NOTNULL="true" DEFAULT="0.0" SEQUENCE="false" ENUM="false" PREVIOUS="answer"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_numerical" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
       <INDEXES>
@@ -17,4 +17,4 @@
       </INDEXES>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/question/type/randomsamatch/db/install.xml b/question/type/randomsamatch/db/install.xml
index 1b9fbfddbb336c2d55de4fcb453c1552c6b91e41..b1f93e815b806bd612f426338288dfbe45287879 100644 (file)
--- a/question/type/randomsamatch/db/install.xml
+++ b/question/type/randomsamatch/db/install.xml
@@ -8,9 +8,9 @@
         <FIELD NAME="choose" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="4" SEQUENCE="false" ENUM="false" PREVIOUS="question"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_randomsamatch" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/question/type/shortanswer/db/install.xml b/question/type/shortanswer/db/install.xml
index 83529208103f1fe20eb6072524ce0794ffb2e264..086e6f9244041c10968cabe65162826c1e689d37 100644 (file)
--- a/question/type/shortanswer/db/install.xml
+++ b/question/type/shortanswer/db/install.xml
@@ -9,9 +9,9 @@
         <FIELD NAME="usecase" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="answers"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_shortanswer" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/question/type/truefalse/db/install.xml b/question/type/truefalse/db/install.xml
index 33af41e4f98edb32b3ba6b9d3cb24bebce810531..b31563e9625c789f7b4849f0d520ef56a6a91c64 100644 (file)
--- a/question/type/truefalse/db/install.xml
+++ b/question/type/truefalse/db/install.xml
@@ -9,9 +9,9 @@
         <FIELD NAME="falseanswer" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="trueanswer"/>
       </FIELDS>
       <KEYS>
-        <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for question_truefalse" NEXT="question"/>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
         <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>