Bug 22729: (QA follow-up) Ensure no NULL values before setting NOT NULL

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/installer/data/mysql/atomicupdate/bug_21336_followup.perl b/installer/data/mysql/atomicupdate/bug_21336_followup.perl
index 880d832..ff26889 100644 (file)
--- a/installer/data/mysql/atomicupdate/bug_21336_followup.perl
+++ b/installer/data/mysql/atomicupdate/bug_21336_followup.perl
@@ -3,6 +3,9 @@ if( CheckVersion( $DBversion ) ) {
 
     if ( column_exists( 'borrowers', 'flgAnonymized' ) ) {
         $dbh->do(q{
+            UPDATE borrowers SET flgAnonymized = 0 WHERE flgAnonymized IS NULL
+        });
+        $dbh->do(q{
             ALTER TABLE borrowers
                 CHANGE `flgAnonymized` `anonymized` TINYINT(1) NOT NULL DEFAULT 0
         });
@@ -10,6 +13,9 @@ if( CheckVersion( $DBversion ) ) {
 
     if ( column_exists( 'deletedborrowers', 'flgAnonymized' ) ) {
         $dbh->do(q{
+            UPDATE deletedborrowers SET flgAnonymized = 0 WHERE flgAnonymized IS NULL
+        });
+        $dbh->do(q{
             ALTER TABLE deletedborrowers
                 CHANGE `flgAnonymized` `anonymized` TINYINT(1) NOT NULL DEFAULT 0
         });