Merge pull request #6720 from ChurchCRM/fix-pledge-comparison

add missing fiscal years for pledge comparison
ChurchCRM · Nov 26, 2023 · 0f6faa2 · 0f6faa2
2 parents 83c68ed + 3123827
commit 0f6faa2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/mysql/install/Install.sql b/src/mysql/install/Install.sql
@@ -773,6 +773,13 @@ INSERT INTO `queryparameteroptions_qpo` (`qpo_qrp_ID`, `qpo_Display`, `qpo_Value
   (27, '2013/2014', '18'),
   (27, '2014/2015', '19'),
   (27, '2015/2016', '20'),
+  (27, '2016/2017', '21'),
+  (27, '2017/2018', '22'),
+  (27, '2018/2019', '23'),
+  (27, '2019/2020', '24'),
+  (27, '2020/2021', '25'),
+  (27, '2021/2022', '26'),
+  (27, '2022/2023', '27'),
   (28, '2012/2013', '17'),
   (28, '2013/2014', '18'),
   (28, '2014/2015', '19'),
@@ -805,7 +812,7 @@ INSERT INTO `queryparameteroptions_qpo` (`qpo_qrp_ID`, `qpo_Display`, `qpo_Value
   (31, '2019/2020', '24'),
   (31, '2020/2021', '25'),
   (31, '2021/2022', '26'),
-  (31, '2022/2023', '27'), 
+  (31, '2022/2023', '27'),
   (15, 'Email', 'per_Email'),
   (15, 'WorkEmail', 'per_WorkEmail'),
   (32, '2012/2013', '17'),

diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json
@@ -338,11 +338,13 @@
             "5.2.1",
             "5.2.2",
             "5.2.3",
-            "5.3.0"
+            "5.3.0",
+            "5.3.1"
         ],
         "scripts": [
-            "/mysql/upgrade/5.3.0.sql"
+            "/mysql/upgrade/5.3.0.sql",
+            "/mysql/upgrade/5.3.1.sql"
         ],
         "dbVersion": "5.3.1"
     }
-}
+}
diff --git a/src/mysql/upgrade/5.3.1.sql b/src/mysql/upgrade/5.3.1.sql
@@ -0,0 +1,8 @@
+INSERT IGNORE INTO `queryparameteroptions_qpo` (`qpo_qrp_ID`, `qpo_Display`, `qpo_Value`) VALUES
+        (27, '2016/2017', '21'),
+        (27, '2017/2018', '22'),
+        (27, '2018/2019', '23'),
+        (27, '2019/2020', '24'),
+        (27, '2020/2021', '25'),
+        (27, '2021/2022', '26'),
+        (27, '2022/2023', '27');