Fix an edge case where invalid JSON is written the database. Fixes bug #12303.

perlDreamer · perlDreamer · commit 200494b28d1b · 2011-11-20T22:24:14.000-08:00
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -5,6 +5,7 @@
  - fixed #12269: Login / Loginbox with encryptlogin
  - fixed #12271: Calendar List View does not always show labels
  - fixed Passive Analytics, UI, Progress Bar, server load.
+ - fixed #12303: Survey custom multiple choice question types
 
 7.10.23
  - fixed #12225: Stock asset, multiple instances on a page
diff --git a/docs/upgrades/upgrade_7.10.23-7.10.24.pl b/docs/upgrades/upgrade_7.10.23-7.10.24.pl
@@ -34,6 +34,7 @@ BEGIN
 addPALastLogTable($session);
 addForkRedirect($session);
 extendBucketName($session);
+fixSurveyQuestionTypes($session);
 
 finish($session); # this line required
 
@@ -81,6 +82,19 @@ sub extendBucketName {
     print "DONE!\n" unless $quiet;
 }
 
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub fixSurveyQuestionTypes {
+    my $session = shift;
+    print "\tFix bad custom Question Types in the Survey... " unless $quiet;
+    # and here's our code
+    $session->db->write(<<EOSQL);
+update Survey_questionTypes set answers="{}" where answers like 'HASH%';
+EOSQL
+    print "DONE!\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 # Describe what our function does
 #sub exampleFunction {
diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
@@ -169,7 +169,7 @@ sub addType {
     my $questionType = shift;
     my $address = shift;
     my $question = $self->question($address);
-    my $ansString = $question->{answers} ? to_json $question->{answers} : {};
+    my $ansString = $question->{answers} ? to_json $question->{answers} : '{}';
     $self->session->db->write("INSERT INTO Survey_questionTypes VALUES(?,?) ON DUPLICATE KEY UPDATE answers = ?",[$questionType,$ansString,$ansString]);
     $question->{questionType} = $questionType;
 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ sub addType {`
`169`	`169`	`my $questionType = shift;`
`170`	`170`	`my $address = shift;`
`171`	`171`	`my $question = $self->question($address);`
`172`		`- my $ansString = $question->{answers} ? to_json $question->{answers} : {};`
	`172`	`+ my $ansString = $question->{answers} ? to_json $question->{answers} : '{}';`
`173`	`173`	`$self->session->db->write("INSERT INTO Survey_questionTypes VALUES(?,?) ON DUPLICATE KEY UPDATE answers = ?",[$questionType,$ansString,$ansString]);`
`174`	`174`	`$question->{questionType} = $questionType;`
`175`	`175`	`}`