Merge pull request #857 from compucorp/WHF-329-sql-syntax

WHF-329: Remove the use of sql keyword 'grouping' causing syntax error
compucorp · Jul 8, 2022 · d4bffe6 · d4bffe6
2 parents f815d98 + 151853f
commit d4bffe6
Show file tree

Hide file tree

Showing 3 changed files with 192 additions and 150 deletions.
diff --git a/CRM/Civicase/Helper/CaseCategory.php b/CRM/Civicase/Helper/CaseCategory.php
@@ -341,7 +341,7 @@ public static function getInstanceObject($caseCategoryValue) {
       return new CaseManagementUtils();
     }
 
-    $instanceClasses = CRM_Core_OptionGroup::values('case_category_instance_type', FALSE, FALSE, TRUE, NULL, 'grouping');
+    $instanceClasses = CRM_Core_OptionGroup::values('case_category_instance_type', TRUE, TRUE, TRUE, NULL);
     $instanceClass = $instanceClasses[$instanceValue];
 
     return new $instanceClass($caseCategoryInstance->id);

diff --git a/CRM/Civicase/Upgrader.php b/CRM/Civicase/Upgrader.php
@@ -64,9 +64,9 @@ public function install() {
         'return' => 'id',
         'option_group_id' => 'activity_type',
         'name' => ['IN' => $activityTypes],
-        'api.OptionValue.setvalue' => [
-          'field' => 'grouping',
-          'value' => $grouping,
+        'api.OptionValue.create' => [
+          'option_group_id' => 'activity_type',
+          'grouping' => $grouping,
         ],
       ]);
     }
@@ -105,9 +105,9 @@ public function install() {
         'option_group_id' => 'activity_status',
         'name' => $status,
         'return' => 'id',
-        'api.OptionValue.setvalue' => [
-          'field' => 'grouping',
-          'value' => $grouping,
+        'api.OptionValue.create' => [
+          'option_group_id' => 'activity_status',
+          'grouping' => $grouping,
         ],
       ]);
     }