summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/changelog.md6
-rw-r--r--drivers/adodb-mssqlnative.inc.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/changelog.md b/docs/changelog.md
index 9437979a..474cdf77 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -99,7 +99,11 @@ Older changelogs:
- xml: fix invalid xmlschema03.dtd and descr tag in session schema XML. #595
- loadbalancer (new feature): read/write splitting and load balancing across multiple connections, thanks to Mike Benoit. #111
-## 5.20.17 - Unreleased
+## 5.20.18 - 28-Jun-2020
+
+- mssql: Retrieve error messages early before connection closed. #614
+
+## 5.20.17 - 31-Mar-2020
- core: fix PHP notice in ADOdb_Exception constructor when using transactions. #601
- mssql: fix PHP notice due to uninitialized array with PHP 7.4. #608
diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php
index d1adc027..9b3ba1a4 100644
--- a/drivers/adodb-mssqlnative.inc.php
+++ b/drivers/adodb-mssqlnative.inc.php
@@ -1223,16 +1223,13 @@ class ADORecordset_mssqlnative extends ADORecordSet {
*/
function _close()
{
-
/*
* If we are closing down a failed query, collect any
* error messages. This is a hack fix to the "close too early"
* problem so this might go away later
*/
$this->connection->errorMsg();
-
- if(is_resource($this->_queryID))
- {
+ if(is_resource($this->_queryID)) {
$rez = sqlsrv_free_stmt($this->_queryID);
$this->_queryID = false;
return $rez;
@@ -1241,7 +1238,6 @@ class ADORecordset_mssqlnative extends ADORecordSet {
return true;
}
-
}