Merge pull request #25713 from totten/worldregion

Worldregion - For API-entity-naming, prefer "WorldRegion"
civicrm · Mar 2, 2023 · 29800f8 · 29800f8
2 parents fcc37bd + 283469a
commit 29800f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
@@ -53,7 +53,7 @@
     'table' => 'civicrm_translation',
   ],
   'CRM_Core_DAO_Worldregion' => [
-    'name' => 'Worldregion',
+    'name' => 'WorldRegion',
     'class' => 'CRM_Core_DAO_Worldregion',
     'table' => 'civicrm_worldregion',
   ],

diff --git a/CRM/Core/DAO/Worldregion.php b/CRM/Core/DAO/Worldregion.php
@@ -6,11 +6,11 @@
  *
  * Generated from xml/schema/CRM/Core/Worldregion.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9f82f7db4b9ea76b609244a81635d1f1)
+ * (GenCodeChecksum:2604f3d61e573a996ee6f5d7bf4d04dc)
  */
 
 /**
- * Database access object for the Worldregion entity.
+ * Database access object for the WorldRegion entity.
  */
 class CRM_Core_DAO_Worldregion extends CRM_Core_DAO {
   const EXT = 'civicrm';
@@ -82,7 +82,7 @@ public static function &fields() {
           'required' => TRUE,
           'where' => 'civicrm_worldregion.id',
           'table_name' => 'civicrm_worldregion',
-          'entity' => 'Worldregion',
+          'entity' => 'WorldRegion',
           'bao' => 'CRM_Core_DAO_Worldregion',
           'localizable' => 0,
           'html' => [
@@ -101,7 +101,7 @@ public static function &fields() {
           'where' => 'civicrm_worldregion.name',
           'export' => TRUE,
           'table_name' => 'civicrm_worldregion',
-          'entity' => 'Worldregion',
+          'entity' => 'WorldRegion',
           'bao' => 'CRM_Core_DAO_Worldregion',
           'localizable' => 0,
           'add' => '1.8',

diff --git a/xml/schema/Core/Worldregion.xml b/xml/schema/Core/Worldregion.xml
@@ -4,6 +4,7 @@
   <base>CRM/Core</base>
   <class>Worldregion</class>
   <name>civicrm_worldregion</name>
+  <entity>WorldRegion</entity>
   <add>1.8</add>
   <field>
     <name>id</name>