From b1a7fe3510ba416e2d0dee486644bc149d96aaa7 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Sun, 27 Jun 2021 11:42:21 +0200
Subject: [PATCH] Update db exception handling in installer

DB object returns errors on warnings, so was failing.

Ignore the warnings and only die on exceptions (usually violations) as it is normal that there are warnings if we are changing VARCHAR to ENUM
---
 install.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install.php b/install.php
index 4668f02..137cbbb 100644
--- a/install.php
+++ b/install.php
@@ -465,9 +465,10 @@ function InstallDB_updateSchema($db_config)
         if (!empty($sql_create)) {
             outn("<li>" . _("Adding new FILTER_VALIDATE_INT") . "</li>");
             $sql_create = "ALTER TABLE {$tabl_name} " .substr($sql_create, 0, -2);
+            try {
             $check = $db->query($sql_create);
-            if (DB::IsError($check)) {
-                die_freepbx("Can not create {$tabl_name}. SQL:  {$sql_create} \n");
+            } catch (\Exception $e) {
+                die_freepbx("Can not modify {$tabl_name}. SQL:  {$sql_create} \n");
             }
         }
         if (!empty($sql_modify)) {
@@ -477,7 +478,6 @@ function InstallDB_updateSchema($db_config)
             try {
                 $check = $db->query($sql_modify);
             } catch (\Exception $e) {
-                  dbug('exception is', $e);
                   die_freepbx("Can not modify {$tabl_name}. SQL:  {$sql_create} \n");
             }
         }