From 3d85b76a93dc08bc552eb1f731a2c0ae0b383126 Mon Sep 17 00:00:00 2001
From: loviuz <loviuz@mailbox.org>
Date: Sun, 31 Mar 2024 01:35:10 +0100
Subject: [PATCH] Ripristinata la verifica query della vista

---
 modules/viste/actions.php |  5 +++--
 modules/viste/edit.php    | 11 +++++------
 src/Database.php          | 13 +++++--------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/modules/viste/actions.php b/modules/viste/actions.php
index 2594a4634..a983c517e 100755
--- a/modules/viste/actions.php
+++ b/modules/viste/actions.php
@@ -154,12 +154,13 @@ switch (filter('op')) {
         break;
 
     case 'test':
-        $module_query = Util\Query::getQuery(Module::find($id_record));
+        $module_query = Util\Query::getQuery(Module::find(get('id_record')));
 
         try{
             $dbo->fetchArray($module_query.' LIMIT 1');
+            echo 'ok';
         } catch (PDOException $e) {
-            flash()->error(tr('Impossibile eseguire la query!'));
+            echo $e->getMessage();
         }
 
         break;
diff --git a/modules/viste/edit.php b/modules/viste/edit.php
index bfe650d8c..9f87aeab8 100755
--- a/modules/viste/edit.php
+++ b/modules/viste/edit.php
@@ -143,12 +143,11 @@ function testQuery(){
         success: function(data) {
             $("#main_loading").fadeOut();
 
-            swal("'.tr('Query funzionante').'", "'.tr('La query attuale funziona correttamente!').'", "success");
-        },
-        error: function(data) {
-            $("#main_loading").fadeOut();
-
-            swal("'.tr('Errore').'", "'.tr('Errore durante il test della query!').'", "error");
+            if (data == "ok"){
+                swal("'.tr('Query funzionante').'", "'.tr('La query attuale funziona correttamente!').'", "success");
+            } else {
+                swal("'.tr('Errore').'", data, "error");
+            }
         }
     })
 }
diff --git a/src/Database.php b/src/Database.php
index bc4d7c14e..b750dbdcc 100755
--- a/src/Database.php
+++ b/src/Database.php
@@ -287,17 +287,14 @@ class Database extends Util\Singleton
      */
     public function fetchArray($query, $parameters = [], $numeric = false)
     {
-        try {
-            $mode = empty($numeric) ? PDO::FETCH_ASSOC : PDO::FETCH_NUM;
+        $mode = empty($numeric) ? PDO::FETCH_ASSOC : PDO::FETCH_NUM;
 
-            $statement = $this->getPDO()->prepare($query);
-            $statement->execute($parameters);
+        $statement = $this->getPDO()->prepare($query);
+        $statement->execute($parameters);
 
-            $result = $statement->fetchAll($mode);
+        $result = $statement->fetchAll($mode);
 
-            return $result;
-        } catch (PDOException $e) {
-        }
+        return $result;
     }
 
     /**