database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Modification of the DBX class to have more information

Browse Source 
in case of error while processing ODBC type tables.

Modified:
odbconn.h
odbconn.cpp
This commit is contained in:
Olivier Bertrand
2013-02-17 11:34:40 +01:00
parent df1dfcff6c
commit 618ce65aff
2 changed files with 74 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
storage/connect/odbconn.cpp
View File

@@ -741,9 +741,10 @@ PQRYRES ODBCStatistics(PGLOBAL g, ODBConn *op, char *dsn, char *pat,
/***********************************************************************/ /***********************************************************************/
/* Implementation of DBX class. */ /* Implementation of DBX class. */
/***********************************************************************/ /***********************************************************************/
DBX::DBX(RETCODE rc) DBX::DBX(RETCODE rc, PSZ msg)
{ {
m_RC = rc; m_RC = rc;
m_Msg = msg;
for (int i = 0; i < MAX_NUM_OF_MSG; i++) for (int i = 0; i < MAX_NUM_OF_MSG; i++)
m_ErrMsg[i] = NULL; m_ErrMsg[i] = NULL;
@@ -766,7 +767,7 @@ void DBX::BuildErrorMessage(ODBConn* pdb, HSTMT hstmt)
rc = SQLError(pdb->m_henv, pdb->m_hdbc, hstmt, state, rc = SQLError(pdb->m_henv, pdb->m_hdbc, hstmt, state,
&native, msg, SQL_MAX_MESSAGE_LENGTH - 1, &len); &native, msg, SQL_MAX_MESSAGE_LENGTH - 1, &len);
if (rc != SQL_INVALID_HANDLE) if (rc != SQL_INVALID_HANDLE) {
// Skip non-errors // Skip non-errors
for (int i = 0; i < MAX_NUM_OF_MSG for (int i = 0; i < MAX_NUM_OF_MSG
&& (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO) && (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO)
@@ -775,18 +776,32 @@ void DBX::BuildErrorMessage(ODBConn* pdb, HSTMT hstmt)
strcpy(m_ErrMsg[i], (char*)msg); strcpy(m_ErrMsg[i], (char*)msg);
if (trace) if (trace)
htrc("%s, Native=%d\n", msg, native); htrc("%s: %s, Native=%d\n", state, msg, native);
rc = SQLError(pdb->m_henv, pdb->m_hdbc, hstmt, state, rc = SQLError(pdb->m_henv, pdb->m_hdbc, hstmt, state,
&native, msg, SQL_MAX_MESSAGE_LENGTH - 1, &len); &native, msg, SQL_MAX_MESSAGE_LENGTH - 1, &len);
} // endfor i } // endfor i
else return;
m_ErrMsg[0] = MSG(BAD_HANDLE_VAL); } else {
snprintf((char*)msg, SQL_MAX_MESSAGE_LENGTH + 1, "%s: %s", m_Msg,
MSG(BAD_HANDLE_VAL));
m_ErrMsg[0] = (PSZ)PlugSubAlloc(g, NULL, strlen((char*)msg) + 1);
strcpy(m_ErrMsg[0], (char*)msg);
if (trace)
htrc("%s: rc=%hd\n", SVP(m_ErrMsg[0]), m_RC);
return;
} // endif rc
} else } else
m_ErrMsg[0] = "No connexion address provided"; m_ErrMsg[0] = "No connexion address provided";
if (trace)
htrc("%s: rc=%hd (%s)\n", SVP(m_Msg), m_RC, SVP(m_ErrMsg[0]));
} // end of BuildErrorMessage } // end of BuildErrorMessage
/***********************************************************************/ /***********************************************************************/
@@ -825,13 +840,13 @@ bool ODBConn::Check(RETCODE rc)
{ {
switch (rc) { switch (rc) {
case SQL_SUCCESS_WITH_INFO: case SQL_SUCCESS_WITH_INFO:
if (m_G->Trace) { if (trace > 1) {
DBX x(rc); DBX x(rc);
x.BuildErrorMessage(this, m_hstmt); x.BuildErrorMessage(this, m_hstmt);
htrc("ODBC Success With Info, hstmt=%p %s\n", htrc("ODBC Success With Info, hstmt=%p %s\n",
m_hstmt, x.GetErrorMessage(0)); m_hstmt, x.GetErrorMessage(0));
} // endif Trace } // endif trace
// Fall through // Fall through
case SQL_SUCCESS: case SQL_SUCCESS:
@@ -845,9 +860,9 @@ bool ODBConn::Check(RETCODE rc)
/***********************************************************************/ /***********************************************************************/
/* DB exception throw routines. */ /* DB exception throw routines. */
/***********************************************************************/ /***********************************************************************/
void ODBConn::ThrowDBX(RETCODE rc, HSTMT hstmt) void ODBConn::ThrowDBX(RETCODE rc, PSZ msg, HSTMT hstmt)
{ {
DBX* xp = new(m_G) DBX(rc); DBX* xp = new(m_G) DBX(rc, msg);
xp->BuildErrorMessage(this, hstmt); xp->BuildErrorMessage(this, hstmt);
throw xp; throw xp;
@@ -855,7 +870,7 @@ void ODBConn::ThrowDBX(RETCODE rc, HSTMT hstmt)
void ODBConn::ThrowDBX(PSZ msg) void ODBConn::ThrowDBX(PSZ msg)
{ {
DBX* xp = new(m_G) DBX(0); DBX* xp = new(m_G) DBX(0, msg);
xp->m_ErrMsg[0] = msg; xp->m_ErrMsg[0] = msg;
throw xp; throw xp;
@@ -873,9 +888,10 @@ PSZ ODBConn::GetStringInfo(ushort infotype)
rc = SQLGetInfo(m_hdbc, infotype, buffer, sizeof(buffer), &result); rc = SQLGetInfo(m_hdbc, infotype, buffer, sizeof(buffer), &result);
if (!Check(rc)) if (!Check(rc)) {
ThrowDBX(rc); // Temporary ThrowDBX(rc, "SQLGetInfo"); // Temporary
// *buffer = '\0'; // *buffer = '\0';
} // endif rc
p = (char *)PlugSubAlloc(m_G, NULL, strlen(buffer) + 1); p = (char *)PlugSubAlloc(m_G, NULL, strlen(buffer) + 1);
strcpy(p, buffer); strcpy(p, buffer);
@@ -988,8 +1004,8 @@ void ODBConn::AllocConnect(DWORD Options)
if (!Check(rc)) { if (!Check(rc)) {
// AfxUnlockGlobals(CRIT_ODBC); // AfxUnlockGlobals(CRIT_ODBC);
ThrowDBX(rc); // Fatal ThrowDBX(rc, "SQLAllocEnv"); // Fatal
} // endif } // endif rc
} // endif m_henv } // endif m_henv
@@ -998,8 +1014,8 @@ void ODBConn::AllocConnect(DWORD Options)
if (!Check(rc)) { if (!Check(rc)) {
// AfxUnlockGlobals(CRIT_ODBC); // AfxUnlockGlobals(CRIT_ODBC);
ThrowDBX(rc); // Fatal ThrowDBX(rc, "SQLAllocConnect"); // Fatal
} // endif } // endif rc
m_nAlloc++; // allocated at last m_nAlloc++; // allocated at last
//AfxUnlockGlobals(CRIT_ODBC); //AfxUnlockGlobals(CRIT_ODBC);
@@ -1072,12 +1088,8 @@ bool ODBConn::Connect(DWORD Options)
return true; return true;
} // endif rc } // endif rc
if (!Check(rc)) { if (!Check(rc))
if (trace && !hWnd == NULL) ThrowDBX(rc, "SQLDriverConnect");
htrc("Error: No default window for SQLDriverConnect\n");
ThrowDBX(rc);
} // endif Check
// Save connect string returned from ODBC // Save connect string returned from ODBC
m_Connect = (PSZ)ConnOut; m_Connect = (PSZ)ConnOut;
@@ -1099,7 +1111,7 @@ void ODBConn::VerifyConnect()
&conformance, sizeof(conformance), &result); &conformance, sizeof(conformance), &result);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc); ThrowDBX(rc, "SQLGetInfo");
if (conformance < SQL_OAC_LEVEL1) if (conformance < SQL_OAC_LEVEL1)
ThrowDBX(MSG(API_CONF_ERROR)); ThrowDBX(MSG(API_CONF_ERROR));
@@ -1108,7 +1120,7 @@ void ODBConn::VerifyConnect()
&conformance, sizeof(conformance), &result); &conformance, sizeof(conformance), &result);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc); ThrowDBX(rc, "SQLGetInfo");
if (conformance < SQL_OSC_MINIMUM) if (conformance < SQL_OSC_MINIMUM)
ThrowDBX(MSG(SQL_CONF_ERROR)); ThrowDBX(MSG(SQL_CONF_ERROR));
@@ -1220,24 +1232,22 @@ int ODBConn::ExecDirectSQL(char *sql, ODBCCOL *tocols)
rc = SQLAllocStmt(m_hdbc, &hstmt); rc = SQLAllocStmt(m_hdbc, &hstmt);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(SQL_INVALID_HANDLE); ThrowDBX(SQL_INVALID_HANDLE, "SQLAllocStmt");
} // endif hstmt } // endif hstmt
OnSetOptions(hstmt); OnSetOptions(hstmt);
b = true; b = true;
if (g->Trace) { if (trace)
htrc("ExecDirect hstmt=%p %.64s\n", hstmt, sql); htrc("ExecDirect hstmt=%p %.64s\n", hstmt, sql);
fflush(debug);
} // endif Trace
do { do {
rc = SQLExecDirect(hstmt, (PUCHAR)sql, SQL_NTS); rc = SQLExecDirect(hstmt, (PUCHAR)sql, SQL_NTS);
} while (rc == SQL_STILL_EXECUTING); } while (rc == SQL_STILL_EXECUTING);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, hstmt); ThrowDBX(rc, "SQLExecDirect", hstmt);
do { do {
rc = SQLNumResultCols(hstmt, &ncol); rc = SQLNumResultCols(hstmt, &ncol);
@@ -1248,7 +1258,7 @@ int ODBConn::ExecDirectSQL(char *sql, ODBCCOL *tocols)
rc = SQLRowCount(hstmt, &afrw); rc = SQLRowCount(hstmt, &afrw);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, hstmt); ThrowDBX(rc, "SQLRowCount", hstmt);
return afrw; return afrw;
} // endif ncol } // endif ncol
@@ -1274,16 +1284,14 @@ int ODBConn::ExecDirectSQL(char *sql, ODBCCOL *tocols)
ThrowDBX(m_G->Message); ThrowDBX(m_G->Message);
} // endif tp } // endif tp
if (g->Trace) { if (trace)
htrc("Binding col=%u type=%d buf=%p len=%d slen=%p\n", htrc("Binding col=%u type=%d buf=%p len=%d slen=%p\n",
n, tp, buffer, len, colp->GetStrLen()); n, tp, buffer, len, colp->GetStrLen());
fflush(debug);
} // endif Trace
rc = SQLBindCol(hstmt, n, tp, buffer, len, colp->GetStrLen()); rc = SQLBindCol(hstmt, n, tp, buffer, len, colp->GetStrLen());
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, hstmt); ThrowDBX(rc, "SQLBindCol", hstmt);
n++; n++;
} // endif pcol } // endif pcol
@@ -1325,7 +1333,7 @@ int ODBConn::GetResultSize(char *sql, ODBCCOL *colp)
} while (rc == SQL_STILL_EXECUTING); } while (rc == SQL_STILL_EXECUTING);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, m_hstmt); ThrowDBX(rc, "SQLFetch", m_hstmt);
if (rc == SQL_NO_DATA_FOUND) if (rc == SQL_NO_DATA_FOUND)
break; break;
@@ -1375,16 +1383,16 @@ int ODBConn::Fetch()
} // endif m_RowsetSize } // endif m_RowsetSize
// } while (rc == SQL_STILL_EXECUTING); // } while (rc == SQL_STILL_EXECUTING);
if (g->Trace) if (trace > 1)
htrc("Fetch: hstmt=%p RowseSize=%d rc=%d\n", htrc("Fetch: hstmt=%p RowseSize=%d rc=%d\n",
m_hstmt, m_RowsetSize, rc); m_hstmt, m_RowsetSize, rc);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, m_hstmt); ThrowDBX(rc, "Fetch", m_hstmt);
irc = (rc == SQL_NO_DATA_FOUND) ? 0 : (int)crow; irc = (rc == SQL_NO_DATA_FOUND) ? 0 : (int)crow;
} catch(DBX *x) { } catch(DBX *x) {
if (g->Trace) if (trace)
for (int i = 0; i < MAX_NUM_OF_MSG && x->m_ErrMsg[i]; i++) for (int i = 0; i < MAX_NUM_OF_MSG && x->m_ErrMsg[i]; i++)
htrc(x->m_ErrMsg[i]); htrc(x->m_ErrMsg[i]);
@@ -1419,24 +1427,22 @@ int ODBConn::PrepareSQL(char *sql)
rc = SQLAllocStmt(m_hdbc, &hstmt); rc = SQLAllocStmt(m_hdbc, &hstmt);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(SQL_INVALID_HANDLE); ThrowDBX(SQL_INVALID_HANDLE, "SQLAllocStmt");
} // endif hstmt } // endif hstmt
OnSetOptions(hstmt); OnSetOptions(hstmt);
b = true; b = true;
if (g->Trace) { if (trace)
htrc("Prepare hstmt=%p %.64s\n", hstmt, sql); htrc("Prepare hstmt=%p %.64s\n", hstmt, sql);
fflush(debug);
} // endif Trace
do { do {
rc = SQLPrepare(hstmt, (PUCHAR)sql, SQL_NTS); rc = SQLPrepare(hstmt, (PUCHAR)sql, SQL_NTS);
} while (rc == SQL_STILL_EXECUTING); } while (rc == SQL_STILL_EXECUTING);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, hstmt); ThrowDBX(rc, "SQLPrepare", hstmt);
do { do {
rc = SQLNumParams(hstmt, &nparm); rc = SQLNumParams(hstmt, &nparm);
@@ -1472,7 +1478,7 @@ bool ODBConn::ExecuteSQL(void)
rc = SQLExecute(m_hstmt); rc = SQLExecute(m_hstmt);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, m_hstmt); ThrowDBX(rc, "SQLExecute", m_hstmt);
} catch(DBX *x) { } catch(DBX *x) {
strcpy(m_G->Message, x->GetErrorMessage(0)); strcpy(m_G->Message, x->GetErrorMessage(0));
@@ -1522,7 +1528,7 @@ bool ODBConn::BindParam(ODBCCOL *colp)
len, 0, buf, 0, strlen); len, 0, buf, 0, strlen);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, m_hstmt); ThrowDBX(rc, "SQLBindParameter", m_hstmt);
} catch(DBX *x) { } catch(DBX *x) {
strcpy(m_G->Message, x->GetErrorMessage(0)); strcpy(m_G->Message, x->GetErrorMessage(0));
@@ -1554,7 +1560,7 @@ bool ODBConn::GetDataSources(PQRYRES qrp)
rc = SQLAllocEnv(&m_henv); rc = SQLAllocEnv(&m_henv);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc); // Fatal ThrowDBX(rc, "SQLAllocEnv"); // Fatal
for (int i = 0; i < qrp->Maxres; i++) { for (int i = 0; i < qrp->Maxres; i++) {
dsn = (UCHAR*)crp1->Kdata->GetValPtr(i); dsn = (UCHAR*)crp1->Kdata->GetValPtr(i);
@@ -1564,7 +1570,7 @@ bool ODBConn::GetDataSources(PQRYRES qrp)
if (rc == SQL_NO_DATA_FOUND) if (rc == SQL_NO_DATA_FOUND)
break; break;
else if (!Check(rc)) else if (!Check(rc))
ThrowDBX(rc); // Fatal ThrowDBX(rc, "SQLDataSources");
qrp->Nblin++; qrp->Nblin++;
dir = SQL_FETCH_NEXT; dir = SQL_FETCH_NEXT;
@@ -1600,7 +1606,7 @@ bool ODBConn::GetDrivers(PQRYRES qrp)
rc = SQLAllocEnv(&m_henv); rc = SQLAllocEnv(&m_henv);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc); // Fatal ThrowDBX(rc, "SQLAllocEnv"); // Fatal
for (n = 0; n < qrp->Maxres; n++) { for (n = 0; n < qrp->Maxres; n++) {
des = (UCHAR*)crp1->Kdata->GetValPtr(n); des = (UCHAR*)crp1->Kdata->GetValPtr(n);
@@ -1610,7 +1616,8 @@ bool ODBConn::GetDrivers(PQRYRES qrp)
if (rc == SQL_NO_DATA_FOUND) if (rc == SQL_NO_DATA_FOUND)
break; break;
else if (!Check(rc)) else if (!Check(rc))
ThrowDBX(rc); // Fatal ThrowDBX(rc, "SQLDrivers");
// The attributes being separated by '\0', set them to ';' // The attributes being separated by '\0', set them to ';'
for (i = 0; i < p2; i++) for (i = 0; i < p2; i++)
@@ -1642,6 +1649,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
void *buffer; void *buffer;
int i, irc; int i, irc;
bool b; bool b;
PSZ fnc = "Unknown";
UWORD n; UWORD n;
SWORD ncol, len, tp; SWORD ncol, len, tp;
SQLULEN crow; SQLULEN crow;
@@ -1658,7 +1666,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
rc = SQLAllocStmt(m_hdbc, &hstmt); rc = SQLAllocStmt(m_hdbc, &hstmt);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(SQL_INVALID_HANDLE); ThrowDBX(SQL_INVALID_HANDLE, "SQLAllocStmt");
} else } else
ThrowDBX(MSG(SEQUENCE_ERROR)); ThrowDBX(MSG(SEQUENCE_ERROR));
@@ -1695,19 +1703,23 @@ int ODBConn::GetCatInfo(CATPARM *cap)
case CAT_TAB: case CAT_TAB:
// rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID, // rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID,
// (SQLPOINTER)false, 0); // (SQLPOINTER)false, 0);
fnc = "SQLTables";
rc = SQLTables(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS, rc = SQLTables(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS,
cap->Pat, SQL_NTS); cap->Pat, SQL_NTS);
break; break;
case CAT_COL: case CAT_COL:
// rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID, // rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID,
// (SQLPOINTER)true, 0); // (SQLPOINTER)true, 0);
fnc = "SQLColumns";
rc = SQLColumns(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS, rc = SQLColumns(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS,
cap->Pat, SQL_NTS); cap->Pat, SQL_NTS);
break; break;
case CAT_KEY: case CAT_KEY:
fnc = "SQLPrimaryKeys";
rc = SQLPrimaryKeys(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS); rc = SQLPrimaryKeys(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS);
break; break;
case CAT_STAT: case CAT_STAT:
fnc = "SQLStatistics";
rc = SQLStatistics(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS, rc = SQLStatistics(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS,
cap->Unique, cap->Accuracy); cap->Unique, cap->Accuracy);
break; break;
@@ -1716,7 +1728,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
} // endswitch infotype } // endswitch infotype
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, hstmt); ThrowDBX(rc, fnc, hstmt);
rc = SQLNumResultCols(hstmt, &ncol); rc = SQLNumResultCols(hstmt, &ncol);
@@ -1753,14 +1765,17 @@ int ODBConn::GetCatInfo(CATPARM *cap)
rc = SQLBindCol(hstmt, n + 1, tp, buffer, len, vl); rc = SQLBindCol(hstmt, n + 1, tp, buffer, len, vl);
if (!Check(rc)) if (!Check(rc))
ThrowDBX(rc, hstmt); ThrowDBX(rc, "SQLBindCol", hstmt);
n++; n++;
} // endfor crp } // endfor crp
fnc = "SQLFetch";
// Now fetch the result // Now fetch the result
if (m_Catver != 3) { if (m_Catver != 3) {
if (m_RowsetSize > 1) { if (m_RowsetSize > 1) {
fnc = "SQLExtendedFetch";
rc = SQLExtendedFetch(hstmt, SQL_FETCH_NEXT, 1, &crow, cap->Status); rc = SQLExtendedFetch(hstmt, SQL_FETCH_NEXT, 1, &crow, cap->Status);
} else if (pval) { } else if (pval) {
for (n = 0; n < cap->Qrp->Maxres; n++) { for (n = 0; n < cap->Qrp->Maxres; n++) {
@@ -1794,7 +1809,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
ThrowDBX(m_G->Message); ThrowDBX(m_G->Message);
} else if (rc != SQL_SUCCESS) } else if (rc != SQL_SUCCESS)
ThrowDBX(rc, hstmt); ThrowDBX(rc, fnc, hstmt);
irc = (int)crow; irc = (int)crow;
} catch(DBX *x) { } catch(DBX *x) {

9
storage/connect/odbconn.h
View File

@@ -83,20 +83,23 @@ class DBX : public BLOCK {
friend class ODBConn; friend class ODBConn;
// Construction (by ThrowDBX only) -- destruction // Construction (by ThrowDBX only) -- destruction
protected: protected:
DBX(RETCODE rc); DBX(RETCODE rc, PSZ msg = NULL);
public: public:
//virtual ~DBX() {} //virtual ~DBX() {}
//void operator delete(void*, PGLOBAL, void*) {}; //void operator delete(void*, PGLOBAL, void*) {};
// Implementation (use ThrowDBX to create) // Implementation (use ThrowDBX to create)
RETCODE GetRC(void) {return m_RC;} RETCODE GetRC(void) {return m_RC;}
PSZ GetMsg(void) {return m_Msg;}
const char *GetErrorMessage(int i) const char *GetErrorMessage(int i)
{ return (i >=0 && i < MAX_NUM_OF_MSG) ? m_ErrMsg[i] : "No ODBC error"; } {return (i >=0 && i < MAX_NUM_OF_MSG) ? m_ErrMsg[i] : "No ODBC error";}
protected: protected:
void BuildErrorMessage(ODBConn* pdb, HSTMT hstmt = SQL_NULL_HSTMT); void BuildErrorMessage(ODBConn* pdb, HSTMT hstmt = SQL_NULL_HSTMT);
// Attributes // Attributes
RETCODE m_RC; RETCODE m_RC;
PSZ m_Msg;
PSZ m_ErrMsg[MAX_NUM_OF_MSG]; PSZ m_ErrMsg[MAX_NUM_OF_MSG];
}; // end of DBX class definition }; // end of DBX class definition
@@ -156,7 +159,7 @@ class ODBConn : public BLOCK {
// ODBC operations // ODBC operations
protected: protected:
bool Check(RETCODE rc); bool Check(RETCODE rc);
void ThrowDBX(RETCODE rc, HSTMT hstmt = SQL_NULL_HSTMT); void ThrowDBX(RETCODE rc, PSZ msg, HSTMT hstmt = SQL_NULL_HSTMT);
void ThrowDBX(PSZ msg); void ThrowDBX(PSZ msg);
void AllocConnect(DWORD dwOptions); void AllocConnect(DWORD dwOptions);
bool Connect(DWORD Options); bool Connect(DWORD Options);