diff --git a/migration/18.04/migratePriorities.php b/migration/18.04/migratePriorities.php index 483dd5959db5f1e8292ad2147fd8bda750100ca7..24c4e455e0619c383311f1a2bc96cdc3e8593f21 100644 --- a/migration/18.04/migratePriorities.php +++ b/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') { diff --git a/migration/18.10/migrateConvertedPdf.php b/migration/18.10/migrateConvertedPdf.php index d50d826e08fb3c7c7e77d8600b44c6f6a0b7e0d1..4cdfc5d123be8a62222b9cc02f6b41300b983021 100644 --- a/migration/18.10/migrateConvertedPdf.php +++ b/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"; diff --git a/modules/visa/batch/process_mailsFromSignatoryBook.php b/modules/visa/batch/process_mailsFromSignatoryBook.php index 5d5f1d249bffefc42eadd6fba18f853859925694..da0d53c5e7a70238c0b09bd5ced7613ff049cfdf 100755 --- a/modules/visa/batch/process_mailsFromSignatoryBook.php +++ b/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'; diff --git a/src/core/models/DatabasePDO.php b/src/core/models/DatabasePDO.php index 2ffc34f936391d2bdf3abbc5f257d0c9c18d13ed..0ccd4b43f477e59a308509796a82fd992b114629 100755 --- a/src/core/models/DatabasePDO.php +++ b/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;