From 4ba9e9397c3a82d352d8eb7f2cec73ee9cace19f Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sun, 16 Dec 2018 16:24:01 +0100
Subject: [PATCH] One more update of DBMS error messages

---
 lib/core/settings.py |  2 +-
 txt/checksum.md5     |  4 ++--
 xml/errors.xml       | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index ee8c4f325..0e5108940 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.2.12.19"
+VERSION = "1.2.12.20"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index f3c919777..3f4a25c92 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -49,7 +49,7 @@ c8c386d644d57c659d74542f5f57f632  lib/core/patch.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-9afc3256156efa516bab3cdaa515d70b  lib/core/settings.py
+7983dceb638a5ba80b33209140bb8531  lib/core/settings.py
 a971ce157d04de96ba6e710d3d38a9a8  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 1581be48127a3a7a9fd703359b6e7567  lib/core/target.py
@@ -478,7 +478,7 @@ d989813ee377252bca2103cea524c06b  xml/banner/sharepoint.xml
 350605448f049cd982554123a75f11e1  xml/banner/x-aspnet-version.xml
 ccb5e02a692f75d11b7fd00f1db48bf5  xml/banner/x-powered-by.xml
 385570003bf7d84f2502191eae8268c6  xml/boundaries.xml
-054874dd9797c22b1de142bf4cbf7f54  xml/errors.xml
+4df7176815d874cf99649201caf10642  xml/errors.xml
 a279656ea3fcb85c727249b02f828383  xml/livetests.xml
 11547289b99eaced5b55185a3230529a  xml/payloads/boolean_blind.xml
 0656ba4132cd02477be90e65a7ddf6ce  xml/payloads/error_based.xml
diff --git a/xml/errors.xml b/xml/errors.xml
index 68f4937fe..b8c8165dc 100644
--- a/xml/errors.xml
+++ b/xml/errors.xml
@@ -5,7 +5,6 @@
     <dbms value="MySQL">
         <error regexp="SQL syntax.*?MySQL"/>
         <error regexp="Warning.*?\Wmysqli?_"/>
-        <error regexp="MySqlException \(0x"/>
         <error regexp="MySQLSyntaxErrorException"/>
         <error regexp="valid MySQL result"/>
         <error regexp="check the manual that corresponds to your (MySQL|MariaDB) server version"/>
@@ -14,6 +13,7 @@
         <error regexp="com\.mysql\.jdbc"/>
         <error regexp="Zend_Db_(Adapter|Statement)_Mysqli_Exception"/>
         <error regexp="Pdo[./_\\]Mysql"/>
+        <error regexp="MySqlException"/>
     </dbms>
 
     <!-- PostgreSQL -->
@@ -29,6 +29,7 @@
         <error regexp="PostgreSQL query failed"/>
         <error regexp="org\.postgresql\.jdbc"/>
         <error regexp="Pdo[./_\\]Pgsql"/>
+        <error regexp="PSQLException"/>
     </dbms>
 
     <!-- Microsoft SQL Server -->
@@ -46,11 +47,11 @@
         <error regexp="ODBC Driver \d+ for SQL Server"/>
         <error regexp="SQLServer JDBC Driver"/>
         <error regexp="com\.jnetdirect\.jsql"/>
-        <error regexp="SQLSrvException"/>
         <error regexp="macromedia\.jdbc\.sqlserver"/>
         <error regexp="Zend_Db_(Adapter|Statement)_Sqlsrv_Exception"/>
         <error regexp="com\.microsoft\.sqlserver\.jdbc"/>
         <error regexp="Pdo[./_\\](Mssql|SqlSrv)"/>
+        <error regexp="SQL(Srv|Server)Exception"/>
     </dbms>
 
     <!-- Microsoft Access -->
@@ -74,6 +75,7 @@
         <error regexp="oracle\.jdbc"/>
         <error regexp="Zend_Db_(Adapter|Statement)_Oracle_Exception"/>
         <error regexp="Pdo[./_\\](Oracle|OCI)"/>
+        <error regexp="OracleException"/>
     </dbms>
 
     <!-- IBM DB2 -->
@@ -85,6 +87,7 @@
         <error regexp="com\.ibm\.db2\.jcc"/>
         <error regexp="Zend_Db_(Adapter|Statement)_Db2_Exception"/>
         <error regexp="Pdo[./_\\]Ibm"/>
+        <error regexp="DB2Exception"/>
     </dbms>
 
     <!-- Informix -->
@@ -96,6 +99,7 @@
         <error regexp="com\.informix\.jdbc"/>
         <error regexp="weblogic\.jdbc\.informix"/>
         <error regexp="Pdo[./_\\]Informix"/>
+        <error regexp="IfxException"/>
     </dbms>
 
     <!-- Interbase/Firebird -->
@@ -118,6 +122,7 @@
         <error regexp="SQLite3::SQLException"/>
         <error regexp="org\.sqlite\.JDBC"/>
         <error regexp="Pdo[./_\\]Sqlite"/>
+        <error regexp="SQLiteException"/>
     </dbms>
 
     <!-- SAP MaxDB -->
@@ -134,6 +139,7 @@
         <error regexp="Sybase message"/>
         <error regexp="Sybase.*?Server message"/>
         <error regexp="SybSQLException"/>
+        <error regexp="Sybase\.Data\.AseClient"/>
         <error regexp="com\.sybase\.jdbc"/>
     </dbms>