Merge pull request #19455 from colemanw/afformMeta

[civicrm-core.git] / CRM / Utils / File.php

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index c196b3dd712697cfe368567e025b4f244a137be1..5c4ae3c5484e6d4df801e198f91a4d5a5e099a96 100644 (file)
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -326,15 +326,14 @@ class CRM_Utils_File {
     else {
       require_once 'DB.php';
       $dsn = CRM_Utils_SQL::autoSwitchDSN($dsn);
-      $db = DB::connect($dsn);
+      try {
+        $db = DB::connect($dsn);
+      }
+      catch (Exception $e) {
+        die("Cannot open $dsn: " . $e->getMessage());
+      }
     }
 
-    if (PEAR::isError($db)) {
-      die("Cannot open $dsn: " . $db->getMessage());
-    }
-    if (CRM_Utils_Constant::value('CIVICRM_MYSQL_STRICT', CRM_Utils_System::isDevelopment())) {
-      $db->query('SET SESSION sql_mode = STRICT_TRANS_TABLES');
-    }
     $db->query('SET NAMES utf8mb4');
     $transactionId = CRM_Utils_Type::escape(CRM_Utils_Request::id(), 'String');
     $db->query('SET @uniqueID = ' . "'$transactionId'");
@@ -348,13 +347,15 @@ class CRM_Utils_File {
       $query = trim($query);
       if (!empty($query)) {
         CRM_Core_Error::debug_query($query);
-        $res = &$db->query($query);
-        if (PEAR::isError($res)) {
+        try {
+          $res = &$db->query($query);
+        }
+        catch (Exception $e) {
           if ($dieOnErrors) {
-            die("Cannot execute $query: " . $res->getMessage());
+            die("Cannot execute $query: " . $e->getMessage());
           }
           else {
-            echo "Cannot execute $query: " . $res->getMessage() . "<p>";
+            echo "Cannot execute $query: " . $e->getMessage() . "<p>";
           }
         }
       }