[[ Bug 11149 ]] Make sure most recent error string is available to revDatabaseConnectResult

Ali Lloyd · Ali Lloyd · commit a2ff7fe827a2 · 2013-11-08T15:42:06.000Z
diff --git a/docs/notes/bugfix-11149.md b/docs/notes/bugfix-11149.md
@@ -0,0 +1 @@
+# revDatabaseConnectResult always returns empty
diff --git a/revdb/src/dbdriver.h b/revdb/src/dbdriver.h
@@ -170,7 +170,7 @@ class DBConnection: public DBObject
 	virtual void transBegin() = 0;
 	virtual void transCommit() = 0;
 	virtual void transRollback() = 0;
-	virtual char *getErrorMessage() = 0;
+	virtual char *getErrorMessage(Bool last = False) = 0;
 
 	virtual DBList *getCursorList() = 0; 
 	virtual void deleteCursor(int fid) = 0;
diff --git a/revdb/src/dbmysql.h b/revdb/src/dbmysql.h
@@ -61,7 +61,7 @@ class DBConnection_MYSQL: public CDBConnection
 	void transBegin();
 	void transCommit();
 	void transRollback();
-	char *getErrorMessage();
+	char *getErrorMessage(Bool p_last);
 	Bool IsError();
 	void getTables(char *buffer, int *bufsize);
 	int getConnectionType(void) { return -1; }
diff --git a/revdb/src/dbodbc.h b/revdb/src/dbodbc.h
@@ -91,7 +91,7 @@ class DBConnection_ODBC: public CDBConnection
 	void transCommit();
 	const char *getconnectionstring();
 	void transRollback();
-	char *getErrorMessage();
+	char *getErrorMessage(Bool p_last);
 	Bool IsError();
 	cursor_type_t getCursorType(void) { return m_cursor_type; }
 	int getVersion(void) { return 2; }
diff --git a/revdb/src/dboracle.h b/revdb/src/dboracle.h
@@ -134,7 +134,7 @@ class DBConnection_ORACLE: public CDBConnection
 	void transBegin();
 	void transCommit();
 	void transRollback();
-	char *getErrorMessage();
+	char *getErrorMessage(Bool p_last);
 	Bool IsError();
 	void getTables(char *buffer, int *bufsize);
 	int getVersion(void) { return 2; }
diff --git a/revdb/src/dbpostgresql.h b/revdb/src/dbpostgresql.h
@@ -132,7 +132,7 @@ class DBConnection_POSTGRESQL: public CDBConnection
 	void transBegin();
 	void transCommit();
 	void transRollback();
-	char *getErrorMessage();
+	char *getErrorMessage(Bool p_last);
 	Bool IsError();
 	int getConnectionType(void) { return -1; }
 	int getVersion(void) { return 2; }
diff --git a/revdb/src/dbsqlite.h b/revdb/src/dbsqlite.h
@@ -85,7 +85,7 @@ class DBConnection_SQLITE : public CDBConnection
 		void transBegin();
 		void transCommit();
 		void transRollback();
-		char *getErrorMessage();
+		char *getErrorMessage(Bool p_last);
 
 		int basicExec(const char *q, unsigned int *rows = 0);
 
diff --git a/revdb/src/mysql_connection.cpp b/revdb/src/mysql_connection.cpp
@@ -351,9 +351,10 @@ Bool DBConnection_MYSQL::IsError()
 }
 
 /*getErrorMessage- return error string*/
-char *DBConnection_MYSQL::getErrorMessage()
+char *DBConnection_MYSQL::getErrorMessage(Bool p_last)
 {
-	if (IsError() == True)
+    // AL-2013-11-08 [[ Bug 11149 ]] Make sure most recent error string is available to revDatabaseConnectResult
+	if (p_last || IsError() == True)
 	{
 		if (m_error != NULL)
 			return m_error;
diff --git a/revdb/src/odbc_connection.cpp b/revdb/src/odbc_connection.cpp
@@ -510,7 +510,7 @@ void DBConnection_ODBC::SetError(SQLHSTMT p_statement)
 }
 
 /*getErrorMessage- return error string*/
-char *DBConnection_ODBC::getErrorMessage()
+char *DBConnection_ODBC::getErrorMessage(Bool p_last)
 {
 	if (IsError() == True) return errmsg;
 	else return (char *)DBNullValue;
diff --git a/revdb/src/oracle_connection.cpp b/revdb/src/oracle_connection.cpp
@@ -250,13 +250,17 @@ Bool DBConnection_ORACLE::IsError()
 }
 
 /*getErrorMessage- return error string*/
-char *DBConnection_ORACLE::getErrorMessage()
+char *DBConnection_ORACLE::getErrorMessage(Bool p_last)
 {
-	// OK-2007-09-10 : Bug 5360
-	if (m_error != NULL)
-		return m_error;
-	else
-		return (char *)DBNullValue;	
+    // AL-2013-11-08 [[ Bug 11149 ]] Make sure most recent error string is available to revDatabaseConnectResult
+    if (p_last || IsError())
+    {
+        // OK-2007-09-10 : Bug 5360
+        if (m_error != NULL)
+            return m_error;
+    }
+		
+    return (char *)DBNullValue;
 }
 
 /*BindVariables-parses querystring and binds variables*/
diff --git a/revdb/src/postgresql_connection.cpp b/revdb/src/postgresql_connection.cpp
@@ -314,13 +314,17 @@ Bool DBConnection_POSTGRESQL::IsError()
 }
 
 /*getErrorMessage- return error string*/
-char *DBConnection_POSTGRESQL::getErrorMessage()
+char *DBConnection_POSTGRESQL::getErrorMessage(Bool p_last)
 {
-	// OK-2007-09-10 : Bug 5360, modified to return m_error instead
-	if (m_error != NULL)
-		return m_error;
-	else
-		return (char *)DBNullValue;
+    // AL-2013-11-08 [[ Bug 11149 ]] Make sure most recent error string is available to revDatabaseConnectResult
+    if (p_last || IsError())
+    {
+        // OK-2007-09-10 : Bug 5360, modified to return m_error instead
+        if (m_error != NULL)
+            return m_error;
+    }
+    
+    return (char *)DBNullValue;
 }
 
 
diff --git a/revdb/src/revdb.cpp b/revdb/src/revdb.cpp
@@ -997,7 +997,8 @@ void REVDB_ConnectionErr(char *args[], int nargs, char **retstring, Bool *pass,
 		DBConnection *theconnection = (DBConnection *)connectionlist.find(connectionid);
 
 		if (theconnection)
-			result = istrdup(theconnection->getErrorMessage());
+            // AL-2013-11-08 [[ Bug 11149 ]] Make sure most recent error string is available to revDatabaseConnectResult
+			result = istrdup(theconnection->getErrorMessage(True));
 		else
 		{
 			result = istrdup(errors[REVDBERR_BADCONNECTION]);
diff --git a/revdb/src/sqlite_connection.cpp b/revdb/src/sqlite_connection.cpp
@@ -227,13 +227,19 @@ Bool DBConnection_SQLITE::IsError()
 }
 
 /*getErrorMessage- return error string*/
-char *DBConnection_SQLITE::getErrorMessage()
+char *DBConnection_SQLITE::getErrorMessage(Bool p_last)
 {
-	if(mIsError && mErrorStr != 0) {
-		mIsError = false;
-		return mErrorStr;
-	} else
-		return (char*)DBNullValue;
+    // AL-2013-11-08 [[ Bug 11149 ]] Make sure most recent error string is available to revDatabaseConnectResult
+	if(p_last || mIsError)
+    {
+        if (mErrorStr != 0)
+        {
+            mIsError = false;
+            return mErrorStr;
+        }
+    }
+    
+    return (char*)DBNullValue;
 }
 
 char *replaceString(char *p_string, char *p_find, char *p_replace)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# revDatabaseConnectResult always returns empty`
Original file line number	Diff line number	Diff line change
`@@ -351,9 +351,10 @@ Bool DBConnection_MYSQL::IsError()`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`/getErrorMessage- return error string/`
`354`		`-char *DBConnection_MYSQL::getErrorMessage()`
	`354`	`+char *DBConnection_MYSQL::getErrorMessage(Bool p_last)`
`355`	`355`	`{`
`356`		`- if (IsError() == True)`
	`356`	`+ // AL-2013-11-08 [[ Bug 11149 ]] Make sure most recent error string is available to revDatabaseConnectResult`
	`357`	`+ if (p_last \|\| IsError() == True)`
`357`	`358`	`{`
`358`	`359`	`if (m_error != NULL)`
`359`	`360`	`return m_error;`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ void DBConnection_ODBC::SetError(SQLHSTMT p_statement)`
`510`	`510`	`}`
`511`	`511`
`512`	`512`	`/getErrorMessage- return error string/`
`513`		`-char *DBConnection_ODBC::getErrorMessage()`
	`513`	`+char *DBConnection_ODBC::getErrorMessage(Bool p_last)`
`514`	`514`	`{`
`515`	`515`	`if (IsError() == True) return errmsg;`
`516`	`516`	`else return (char *)DBNullValue;`