Fixed issue: SQL error on import if quota member code is too long

LimeSurvey · Jun 19, 2023 · 5db6743 · 5db6743
1 parent 7f2e691
commit 5db6743
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -2022,8 +2022,8 @@ function XMLImportSurvey($sFullFilePath, $sXMLdata = null, $sNewSurveyName = nul
             if (
                 $insertdata['attribute'] == 'alphasort'
                 || (
-                    $insertdata['attribute'] == 'random_order'
-                    && in_array($importedQuestions[$insertdata['qid']]->type, ['!', 'L', 'O', 'R'])
+                $insertdata['attribute'] == 'random_order'
+                && in_array($importedQuestions[$insertdata['qid']]->type, ['!', 'L', 'O', 'R'])
                 )
             ) {
                 $answerOrderAttributes[$insertdata['qid']][$insertdata['attribute']] = $insertdata['value'];
@@ -2055,19 +2055,19 @@ function XMLImportSurvey($sFullFilePath, $sXMLdata = null, $sNewSurveyName = nul
         foreach ($answerOrderAttributes as $importedQid => $questionAttributes) {
             if (!empty($questionAttributes['random_order'])) {
                 $insertdata = [
-                    'qid' => $importedQid,
-                    'attribute' => 'answer_order',
-                    'value' => 'random',
+                'qid' => $importedQid,
+                'attribute' => 'answer_order',
+                'value' => 'random',
                 ];
                 App()->db->createCommand()->insert('{{question_attributes}}', $insertdata);
                 $results['question_attributes']++;
                 continue;
             }
             if (!empty($questionAttributes['alphasort'])) {
                 $insertdata = [
-                    'qid' => $importedQid,
-                    'attribute' => 'answer_order',
-                    'value' => 'alphabetical',
+                'qid' => $importedQid,
+                'attribute' => 'answer_order',
+                'value' => 'alphabetical',
                 ];
                 App()->db->createCommand()->insert('{{question_attributes}}', $insertdata);
                 $results['question_attributes']++;
@@ -2228,8 +2228,19 @@ function XMLImportSurvey($sFullFilePath, $sXMLdata = null, $sNewSurveyName = nul
             unset($insertdata['id']);
             // now translate any links
             $quotaMember->setAttributes($insertdata, false);
+
+            if (!$quotaMember->validate()) {
+                // Display validation errors
+                foreach ($quotaMember->errors as $attribute => $errors) {
+                    $errorText = '';
+                    foreach ($errors as $error) {
+                        $errorText .= 'Field "' . $attribute . '": ' . $error . " Value: '{$quotaMember->$attribute}'\n";
+                    }
+                    throw new Exception(gT("Error:") . " Failed to insert quota member" . "\n" . $errorText);
+                }
+            }
             if (!$quotaMember->save()) {
-                throw new Exception(gT("Error") . ": Failed to insert data[13]<br />");
+                throw new Exception(gT("Error:") . " Failed to insert quota member database entry\n");
             }
             $results['quotamembers']++;
         }

diff --git a/application/models/QuotaMember.php b/application/models/QuotaMember.php
@@ -45,7 +45,9 @@ public static function model($className = __CLASS__)
     public function rules()
     {
         return array(
-            array('code', 'required', 'on' => array('create'))
+            array('code', 'required', 'on' => array('create')),
+            array('code', 'length', 'max' => 11)
+
         );
     }
     /**