From 9649de151e9bb948dd360c856d66d77bac674f4c Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Tue, 10 Dec 2019 23:05:53 +0000
Subject: [PATCH] Bug 13958: DBRev 19.05.05.001

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../data/mysql/atomicupdate/bug_13958.perl    | 18 ------------------
 installer/data/mysql/updatedatabase.pl        | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_13958.perl

diff --git a/installer/data/mysql/atomicupdate/bug_13958.perl b/installer/data/mysql/atomicupdate/bug_13958.perl
deleted file mode 100644
index 3c3abec8cd..0000000000
--- a/installer/data/mysql/atomicupdate/bug_13958.perl
+++ /dev/null
@@ -1,18 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-        SELECT
-            'SuspensionsCalendar',
-            IF( value='noFinesWhenClosed', 'noSuspensionsWhenClosed', 'ignoreCalendar'),
-            'ignoreCalendar|noSuspensionsWhenClosed',
-            'Specify whether to use the Calendar in calculating suspensions',
-            'Choice'
-        FROM systempreferences
-        WHERE variable='finesCalendar';
-    });
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 13958 - Add a SuspensionsCalendar syspref)\n";
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3befe92203..46f55a42ee 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -18846,6 +18846,25 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (19.05.05 release)\n";
 }
 
+$DBversion = '19.05.05.001';
+if( CheckVersion( $DBversion ) ) {
+
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        SELECT
+            'SuspensionsCalendar',
+            IF( value='noFinesWhenClosed', 'noSuspensionsWhenClosed', 'ignoreCalendar'),
+            'ignoreCalendar|noSuspensionsWhenClosed',
+            'Specify whether to use the Calendar in calculating suspensions',
+            'Choice'
+        FROM systempreferences
+        WHERE variable='finesCalendar';
+    });
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 13958 - Add a SuspensionsCalendar syspref)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 
-- 
2.39.2