From 11957b46736904da967ceed5e3336f619bd4c3b1 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 8 Feb 2023 18:00:38 +1300 Subject: [PATCH] Use DATABASE function rather than lossa code --- CRM/Core/BAO/SchemaHandler.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php index 0ee0b27c4c..a58dd8c482 100644 --- a/CRM/Core/BAO/SchemaHandler.php +++ b/CRM/Core/BAO/SchemaHandler.php @@ -547,23 +547,23 @@ MODIFY {$columnName} varchar( $length ) /** * Check if a foreign key Exists + * * @param string $table_name * @param string $constraint_name + * * @return bool TRUE if FK is found */ - public static function checkFKExists($table_name, $constraint_name) { - $dao = new CRM_Core_DAO(); + public static function checkFKExists(string $table_name, string $constraint_name): bool { $query = " SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS - WHERE TABLE_SCHEMA = %1 - AND TABLE_NAME = %2 - AND CONSTRAINT_NAME = %3 + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = %1 + AND CONSTRAINT_NAME = %2 AND CONSTRAINT_TYPE = 'FOREIGN KEY' "; $params = [ - 1 => [$dao->_database, 'String'], - 2 => [$table_name, 'String'], - 3 => [$constraint_name, 'String'], + 1 => [$table_name, 'String'], + 2 => [$constraint_name, 'String'], ]; $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, NULL, FALSE, FALSE); -- 2.25.1