From 6b2663dd4cbfdee0a2cfd92afc83f4a6ea3e88ef Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 17 May 2023 00:56:30 -0700
Subject: [PATCH] Extract instant_messenger_service OG

---
 sql/civicrm_option_groups.php                   |  5 -----
 .../instant_messenger_service.sqldata.php       | 17 +++++++++++++++++
 xml/templates/civicrm_data.tpl                  |  8 --------
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 sql/civicrm_option_groups/instant_messenger_service.sqldata.php

diff --git a/sql/civicrm_option_groups.php b/sql/civicrm_option_groups.php
index 250ec4de32..0637c2350c 100644
--- a/sql/civicrm_option_groups.php
+++ b/sql/civicrm_option_groups.php
@@ -19,11 +19,6 @@ $readOptionGroups = function (): array {
 };
 
 return $readOptionGroups() + [
-  'instant_messenger_service' => CRM_Core_CodeGen_OptionGroup::create('instant_messenger_service')
-    ->addMetadata([
-      'title' => ts('Instant Messenger (IM) screen-names'),
-      'description' => ts('Commonly-used messaging apps are listed here. Administrators may define as many additional providers as needed.'),
-    ]),
   'mobile_provider' => CRM_Core_CodeGen_OptionGroup::create('mobile_provider')
     ->addMetadata([
       'title' => ts('Mobile Phone Providers'),
diff --git a/sql/civicrm_option_groups/instant_messenger_service.sqldata.php b/sql/civicrm_option_groups/instant_messenger_service.sqldata.php
new file mode 100644
index 0000000000..ded0d7b0b8
--- /dev/null
+++ b/sql/civicrm_option_groups/instant_messenger_service.sqldata.php
@@ -0,0 +1,17 @@
+<?php
+return CRM_Core_CodeGen_OptionGroup::create('instant_messenger_service', 'a/0004')
+  ->addMetadata([
+    'title' => ts('Instant Messenger (IM) screen-names'),
+    'description' => ts('Commonly-used messaging apps are listed here. Administrators may define as many additional providers as needed.'),
+  ])
+  ->addValues(['label', 'name', 'value'], [
+    ['Yahoo', 'Yahoo', 1],
+    ['MSN', 'Msn', 2],
+    ['AIM', 'Aim', 3],
+    ['GTalk', 'Gtalk', 4],
+    ['Jabber', 'Jabber', 5],
+    ['Skype', 'Skype', 6],
+  ])
+  ->addDefaults([
+    'is_default' => NULL,
+  ]);
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 687762339d..bdf8f33ccc 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -132,7 +132,6 @@ VALUES
   }
 {/php}
 
-SELECT @option_group_id_IMProvider     := max(id) from civicrm_option_group where name = 'instant_messenger_service';
 SELECT @option_group_id_mobileProvider := max(id) from civicrm_option_group where name = 'mobile_provider';
 SELECT @option_group_id_prefix         := max(id) from civicrm_option_group where name = 'individual_prefix';
 SELECT @option_group_id_suffix         := max(id) from civicrm_option_group where name = 'individual_suffix';
@@ -225,13 +224,6 @@ INSERT INTO
    `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`)
 VALUES
 
-   (@option_group_id_IMProvider, 'Yahoo', 1, 'Yahoo', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_IMProvider, 'MSN',   2, 'Msn',   NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_IMProvider, 'AIM',   3, 'Aim',   NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_IMProvider, 'GTalk', 4, 'Gtalk', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_IMProvider, 'Jabber',5, 'Jabber',NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_IMProvider, 'Skype', 6, 'Skype', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
-
    (@option_group_id_mobileProvider, 'Sprint'  , 1, 'Sprint'  , NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
    (@option_group_id_mobileProvider, 'Verizon' , 2, 'Verizon' , NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
    (@option_group_id_mobileProvider, 'Cingular', 3, 'Cingular', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-- 
2.25.1