From d85e1802e9b5491fc4aaffed5a22dc284cb31bc2 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 27 Sep 2021 18:41:32 +1300 Subject: [PATCH] dev/core#2870 Fix upgrade error with rpow installed --- CRM/Core/BAO/SchemaHandler.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php index 2f41ae364c..1686e79889 100644 --- a/CRM/Core/BAO/SchemaHandler.php +++ b/CRM/Core/BAO/SchemaHandler.php @@ -552,9 +552,7 @@ MODIFY {$columnName} varchar( $length ) * @return bool TRUE if FK is found */ public static function checkFKExists($table_name, $constraint_name) { - $config = CRM_Core_Config::singleton(); - $dsn = CRM_Utils_SQL::autoSwitchDSN($config->dsn); - $dbUf = DB::parseDSN($dsn); + $dao = new CRM_Core_DAO(); $query = " SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE TABLE_SCHEMA = %1 @@ -563,7 +561,7 @@ MODIFY {$columnName} varchar( $length ) AND CONSTRAINT_TYPE = 'FOREIGN KEY' "; $params = [ - 1 => [$dbUf['database'], 'String'], + 1 => [$dao->_database, 'String'], 2 => [$table_name, 'String'], 3 => [$constraint_name, 'String'], ]; -- 2.25.1