Reset error before using in SQL query

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 8463885a15a8317be3a32e634cfebc3dd7326321..9f9c481e4b1e36cb8c2f2d5d3f00c0005e1a1f46 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -43,6 +43,7 @@ if (isset($_GET["mssql"])) {
 
                        function query($query, $unbuffered = false) {
                                $result = sqlsrv_query($this->_link, $query); //! , array(), ($unbuffered ? array() : array("Scrollable" => "keyset"))
+                               $this->error = "";
                                if (!$result) {
                                        $this->_get_error();
                                        return false;
@@ -52,6 +53,7 @@ if (isset($_GET["mssql"])) {
 
                        function multi_query($query) {
                                $this->_result = sqlsrv_query($this->_link, $query);
+                               $this->error = "";
                                if (!$this->_result) {
                                        $this->_get_error();
                                        return false;
@@ -159,6 +161,7 @@ if (isset($_GET["mssql"])) {
 
                        function query($query, $unbuffered = false) {
                                $result = mssql_query($query, $this->_link); //! $unbuffered
+                               $this->error = "";
                                if (!$result) {
                                        $this->error = mssql_get_last_message();
                                        return false;

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index d7ed85db9eac92353bb5242f3d732e24f69ac7e9..72b65221e015e6896463f4d4cdbda4ef31cdc835 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -108,6 +108,7 @@ if (!defined("DRIVER")) {
                        */
                        function query($query, $unbuffered = false) {
                                $result = @($unbuffered ? mysql_unbuffered_query($query, $this->_link) : mysql_query($query, $this->_link)); // @ - mute mysql.trace_mode
+                               $this->error = "";
                                if (!$result) {
                                        $this->error = mysql_error($this->_link);
                                        return false;

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index 48163b16d8082b8d09064faa35519e1a91fc611d..65662bfe94bb2714f13434f737ffb44d5cabbf59 100644 (file)
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -37,6 +37,7 @@ if (isset($_GET["oracle"])) {
 
                        function query($query, $unbuffered = false) {
                                $result = oci_parse($this->_link, $query);
+                               $this->error = "";
                                if (!$result) {
                                        $error = oci_error($this->_link);
                                        $this->error = $error["message"];

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 8f98460f6d621e2b3df2b8b0629766b31ba4b63b..49db9a36cc75cec3fbf05972669a4d7705cc083b 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -58,6 +58,7 @@ if (isset($_GET["pgsql"])) {
                        
                        function query($query, $unbuffered = false) {
                                $result = @pg_query($this->_link, $query);
+                               $this->error = "";
                                if (!$result) {
                                        $this->error = pg_last_error($this->_link);
                                        return false;

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 3ad2fc730194a2a94726da148e792c6f6c445364..3233613a0527fee6c9d821cb82efa5e926d1fffe 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -19,6 +19,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
                                
                                function query($query) {
                                        $result = @$this->_link->query($query);
+                                       $this->error = "";
                                        if (!$result) {
                                                $this->error = $this->_link->lastErrorMsg();
                                                return false;
@@ -93,6 +94,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
                                function query($query, $unbuffered = false) {
                                        $method = ($unbuffered ? "unbufferedQuery" : "query");
                                        $result = @$this->_link->$method($query, SQLITE_BOTH, $error);
+                                       $this->error = "";
                                        if (!$result) {
                                                $this->error = $error;
                                                return false;

diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index a77265a648ff710b5c28acd93ff13082870709d7..b72d68f99cc63d1c1e6c70ad9cc626a2dd231d11 100644 (file)
--- a/adminer/include/pdo.inc.php
+++ b/adminer/include/pdo.inc.php
@@ -24,6 +24,7 @@ if (extension_loaded('pdo')) {
                
                function query($query, $unbuffered = false) {
                        $result = parent::query($query);
+                       $this->error = "";
                        if (!$result) {
                                $errorInfo = $this->errorInfo();
                                $this->error = $errorInfo[2];