From 1dde4f4f58f6931a8b9c7b512b3013992b419254 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 19 Jul 2024 08:42:00 -0400
Subject: [PATCH] Bug 35539: (QA follow-up) Fix atomic update to look for first
 non-null values

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 installer/data/mysql/atomicupdate/bug_35539.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/bug_35539.pl b/installer/data/mysql/atomicupdate/bug_35539.pl
index 3a3dac2830..3be0e21f2c 100755
--- a/installer/data/mysql/atomicupdate/bug_35539.pl
+++ b/installer/data/mysql/atomicupdate/bug_35539.pl
@@ -11,7 +11,7 @@ return {
         if ( column_exists( 'categories', 'bulk' ) ) {
             my ($bulkdata) = $dbh->selectrow_array(
                 q|
-                SELECT bulk FROM categories;
+                SELECT bulk FROM categories WHERE bulk IS NOT NULL;
             |
             );
             if ($bulkdata) {
@@ -28,7 +28,7 @@ return {
         if ( column_exists( 'categories', 'finetype' ) ) {
             my ($bulkdata) = $dbh->selectrow_array(
                 q|
-                SELECT finetype FROM categories;
+                SELECT finetype FROM categories WHERE finetype IS NOT NULL;
             |
             );
             if ($bulkdata) {
@@ -46,7 +46,7 @@ return {
         if ( column_exists( 'categories', 'issuelimit' ) ) {
             my ($bulkdata) = $dbh->selectrow_array(
                 q|
-                SELECT issuelimit FROM categories;
+                SELECT issuelimit FROM categories WHERE issuelimit IS NOT NULL;
             |
             );
             if ($bulkdata) {
-- 
2.39.5