Merge pull request #21042 from eileenmcnaughton/uf

[REF] Use OO when determining what to suggest for settings.php prefixes for drupal/backdrop views, instead of scattered "if cms =="
civicrm · Sep 14, 2021 · a20a1f6 · a20a1f6
2 parents 3a50b67 + 6440c50
commit a20a1f6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/CRM/Admin/Form/Setting/UF.php b/CRM/Admin/Form/Setting/UF.php
@@ -67,8 +67,8 @@ public function buildQuickForm() {
         $config->dsn != $config->userFrameworkDSN || !empty($drupal_prefix)
       )
     ) {
-      $dsn = CRM_Utils_SQL::autoSwitchDSN($config->dsn);
-      $dsnArray = DB::parseDSN($dsn);
+
+      $dsnArray = DB::parseDSN(CRM_Utils_SQL::autoSwitchDSN($config->dsn));
       $tableNames = CRM_Core_DAO::getTableNames();
       asort($tableNames);
       $tablePrefixes = '$databases[\'default\'][\'default\'][\'prefix\']= [';
@@ -77,13 +77,7 @@ public function buildQuickForm() {
       }
       // add default prefix: the drupal database prefix
       $tablePrefixes .= "\n  'default' => '$drupal_prefix',";
-      $prefix = "";
-      if ($config->dsn != $config->userFrameworkDSN) {
-        $prefix = "`{$dsnArray['database']}`.";
-        if ($config->userFramework === 'Backdrop') {
-          $prefix = "{$dsnArray['database']}.";
-        }
-      }
+      $prefix = $config->userSystem->getCRMDatabasePrefix();
       foreach ($tableNames as $tableName) {
         $tablePrefixes .= "\n  '" . str_pad($tableName . "'", 41) . " => '{$prefix}',";
       }

diff --git a/CRM/Utils/System/Backdrop.php b/CRM/Utils/System/Backdrop.php
@@ -1056,4 +1056,16 @@ public function getCMSPermissionsUrlParams() {
     return ['ufAccessURL' => url('admin/config/people/permissions')];
   }
 
+  /**
+   * Get the CRM database as a 'prefix'.
+   *
+   * This returns a string that can be prepended to a query to include a CRM table.
+   *
+   * However, this string should contain backticks, or not, in accordance with the
+   * CMS's drupal views expectations, if any.
+   */
+  public function getCRMDatabasePrefix(): string {
+    return str_replace(parent::getCRMDatabasePrefix(), '`', '');
+  }
+
 }
diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
@@ -1051,6 +1051,23 @@ public function getCMSPermissionsUrlParams() {
     return [];
   }
 
+  /**
+   * Get the CRM database as a 'prefix'.
+   *
+   * This returns a string that can be prepended to a query to include a CRM table.
+   *
+   * However, this string should contain backticks, or not, in accordance with the
+   * CMS's drupal views expectations, if any.
+   */
+  public function getCRMDatabasePrefix(): string {
+    $crmDatabase = DB::parseDSN(CRM_Core_Config::singleton()->dsn)['database'];
+    $cmsDatabase = DB::parseDSN(CRM_Core_Config::singleton()->userFrameworkDSN)['database'];
+    if ($crmDatabase === $cmsDatabase) {
+      return '';
+    }
+    return "`$crmDatabase`.";
+  }
+
   /**
    * Invalidates the cache of dynamic routes and forces a rebuild.
    */