[REFACTORING] DatabasePdo

migration/18.04/migratePriorities.php

@@ -46,7 +46,6 @@ foreach ($customs as $custom) {
             }
         }
 
-        \SrcCore\models\DatabasePDO::reset();
         $db = new \SrcCore\models\DatabasePDO(['customId' => $custom]);
         foreach ($priorities as $key => $priority) {
             if ($priority['default_priority'] == 'true') {

migration/18.10/migrateConvertedPdf.php

@@ -14,7 +14,6 @@ foreach ($customs as $custom) {
     if ($custom == 'custom.xml' || $custom == '.' || $custom == '..') {
         continue;
     }
-    \SrcCore\models\DatabasePDO::reset();
     $db = new \SrcCore\models\DatabasePDO(['customId' => $custom]);
 
     $query = "SELECT r2.res_id as convert_res_id from res_view_attachments r LEFT JOIN res_view_attachments r2 ON REGEXP_REPLACE(r.filename, '\.(.)*$', '') = REGEXP_REPLACE(r2.filename, '\.(.)*$', '') LEFT JOIN docservers d ON d.docserver_id = r2.docserver_id WHERE r.status in ('DEL', 'OBS', 'TMP') AND r.attachment_type <> 'converted_pdf' AND r2.attachment_type = 'converted_pdf' AND r.res_id <> 0";

modules/visa/batch/process_mailsFromSignatoryBook.php

@@ -202,7 +202,6 @@ try {
     exit();
 }
 
-\SrcCore\models\DatabasePDO::reset();
 $GLOBALS['db'] = new \SrcCore\models\DatabasePDO(['customId' => $GLOBALS['CustomId']]);
 
 $GLOBALS['errorLckFile'] = $GLOBALS['batchDirectory'] . DIRECTORY_SEPARATOR . $GLOBALS['batchName'] .'_error.lck';

src/core/models/DatabasePDO.php

@@ -124,8 +124,8 @@ class DatabasePDO
             $queryString = str_ireplace('CURRENT_TIMESTAMP', 'SYSDATE', $queryString);
         }
 
+        $originalData = $data;
         if (!empty($data)) {
-            $originalData = $data;
             $tmpData = [];
             foreach ($data as $key => $value) {
                 if (is_array($value)) {
@@ -151,16 +151,9 @@ class DatabasePDO
 
             $query->execute($data);
         } catch (\PDOException $PDOException) {
-            if (
-                strpos($PDOException->getMessage(), 'Admin shutdown: 7') !== false ||
-                strpos($PDOException->getMessage(), 'General error: 7') !== false
-            ) {
+            if (strpos($PDOException->getMessage(), 'Admin shutdown: 7') !== false || strpos($PDOException->getMessage(), 'General error: 7') !== false) {
                 $db = new DatabasePDO();
-                if ($originalData) {
-                    $db->query($originalQuery, $originalData);
-                } else {
-                    $db->query($originalQuery);
-                }
+                $query = $db->query($originalQuery, $originalData);
             } else {
                 $param = implode(', ', $data);
                 $file = fopen('queries_error.log', 'a');
@@ -196,12 +189,6 @@ class DatabasePDO
         return ['where' => $where, 'limit' => $limit];
     }
 
-    public static function reset()
-    {
-        $this->pdo = null;
-        self::$preparedQueries = [];
-    }
-
     public function getType()
     {
         return self::$type;