From 283fec164ed63e5a7f7fe15dbd559d582cc70881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Fri, 21 Feb 2014 14:40:10 +0100 Subject: [PATCH] Implemented rollback according to interface for Microsoft SQL and PostgreSQL --- htdocs/core/db/mssql.class.php | 7 ++++--- htdocs/core/db/pgsql.class.php | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index c50a7ed8925..706bacef870 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -310,15 +310,16 @@ class DoliDBMssql extends DoliDB /** * Annulation d'une transaction et retour aux anciennes valeurs * - * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur + * @param string $log Add more log to default log line + * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur */ - function rollback() + function rollback($log='') { if ($this->transaction_opened<=1) { $ret=$this->query("ROLLBACK TRANSACTION"); $this->transaction_opened=0; - dol_syslog("ROLLBACK Transaction",LOG_DEBUG); + dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG); return $ret; } else diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 531427b9547..78cafae6c4a 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -541,16 +541,17 @@ class DoliDBPgsql extends DoliDB /** * Annulation d'une transaction et retour aux anciennes valeurs * - * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur + * @param string $log Add more log to default log line + * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur */ - function rollback() + function rollback($log='') { dol_syslog('',0,-1); if ($this->transaction_opened<=1) { $ret=$this->query("ROLLBACK;"); $this->transaction_opened=0; - dol_syslog("ROLLBACK Transaction",LOG_DEBUG); + dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG); return $ret; } else