Modified:
MYODBCDrv/MYODBCDrvLib/SQLBindCol.cpp
MYODBCDrv/MYODBCDrvLib/SQLBindParameter.cpp
MYODBCDrv/MYODBCDrvLib/SQLBrowseConnectW.cpp
MYODBCDrv/MYODBCDrvLib/SQLBulkOperations.cpp
MYODBCDrv/MYODBCDrvLib/SQLCancel.cpp
MYODBCDrv/MYODBCDrvLib/SQLCloseCursor.cpp
MYODBCDrv/MYODBCDrvLib/SQLColAttributeW.cpp
MYODBCDrv/MYODBCDrvLib/SQLColumnPrivilegesW.cpp
MYODBCDrv/MYODBCDrvLib/SQLColumnsW.cpp
MYODBCDrv/MYODBCDrvLib/SQLConnectW.cpp
MYODBCDrv/MYODBCDrvLib/SQLCopyDesc.cpp
MYODBCDrv/MYODBCDrvLib/SQLDescribeColW.cpp
MYODBCDrv/MYODBCDrvLib/SQLDescribeParam.cpp
MYODBCDrv/MYODBCDrvLib/SQLDisconnect.cpp
MYODBCDrv/MYODBCDrvLib/SQLDriverConnectW.cpp
MYODBCDrv/MYODBCDrvLib/SQLEndTran.cpp
MYODBCDrv/MYODBCDrvLib/SQLExecDirectW.cpp
MYODBCDrv/MYODBCDrvLib/SQLExecute.cpp
MYODBCDrv/MYODBCDrvLib/SQLExtendedFetch.cpp
MYODBCDrv/MYODBCDrvLib/SQLFetch.cpp
MYODBCDrv/MYODBCDrvLib/SQLFetchScroll.cpp
MYODBCDrv/MYODBCDrvLib/SQLForeignKeysW.cpp
MYODBCDrv/MYODBCDrvLib/SQLFreeHandle.cpp
MYODBCDrv/MYODBCDrvLib/SQLFreeStmt.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetConnectAttrW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetCursorNameW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetData.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetDescFieldW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetDescRecW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetDiagFieldW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetDiagRecW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetEnvAttr.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetFunctions.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetInfoW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetStmtAttrW.cpp
MYODBCDrv/MYODBCDrvLib/SQLGetTypeInfoW.cpp
MYODBCDrv/MYODBCDrvLib/SQLMoreResults.cpp
MYODBCDrv/MYODBCDrvLib/SQLNativeSqlW.cpp
MYODBCDrv/MYODBCDrvLib/SQLNumParams.cpp
MYODBCDrv/MYODBCDrvLib/SQLNumResultCols.cpp
MYODBCDrv/MYODBCDrvLib/SQLParamData.cpp
MYODBCDrv/MYODBCDrvLib/SQLPrepareW.cpp
MYODBCDrv/MYODBCDrvLib/SQLPrimaryKeysW.cpp
MYODBCDrv/MYODBCDrvLib/SQLProcedureColumnsW.cpp
MYODBCDrv/MYODBCDrvLib/SQLProceduresW.cpp
MYODBCDrv/MYODBCDrvLib/SQLPutData.cpp
MYODBCDrv/MYODBCDrvLib/SQLRowCount.cpp
MYODBCDrv/MYODBCDrvLib/SQLSetConnectAttrW.cpp
MYODBCDrv/MYODBCDrvLib/SQLSetCursorNameW.cpp
MYODBCDrv/MYODBCDrvLib/SQLSetDescFieldW.cpp
MYODBCDrv/MYODBCDrvLib/SQLSetDescRec.cpp
MYODBCDrv/MYODBCDrvLib/SQLSetEnvAttr.cpp
MYODBCDrv/MYODBCDrvLib/SQLSetPos.cpp
MYODBCDrv/MYODBCDrvLib/SQLSetStmtAttrW.cpp
MYODBCDrv/MYODBCDrvLib/SQLSpecialColumnsW.cpp
MYODBCDrv/MYODBCDrvLib/SQLStatisticsW.cpp
MYODBCDrv/MYODBCDrvLib/SQLTablePrivilegesW.cpp
MYODBCDrv/MYODBCDrvLib/SQLTablesW.cpp
MYSQLCC/MYSQLCCLib/MDescriptor.cpp
MYSQLCC/MYSQLCCLib/MDescriptorAPD.h
MYSQLCC/include/MDescriptor.h
MYSQLCC/include/MStatement.h
Log:
Modified: MYODBCDrv/MYODBCDrvLib/SQLBindCol.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLBindCol.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLBindCol.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -41,6 +41,8 @@
SQLINTEGER nBufferLength,
SQLINTEGER * pnStrLenOrInd )
{
+ MYODBCDbgEnter();
+
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLBindParameter.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLBindParameter.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLBindParameter.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -52,6 +52,7 @@
SQLINTEGER nBufferLen, /* C len - APD
*/
SQLINTEGER * pnStrLenOrIndPtr )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLBrowseConnectW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLBrowseConnectW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLBrowseConnectW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -15,6 +15,7 @@
SQLSMALLINT nBufferLength,
SQLSMALLINT * pnStringLength2Ptr )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLBulkOperations.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLBulkOperations.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLBulkOperations.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -35,6 +35,7 @@
SQLRETURN SQL_API SQLBulkOperations( SQLHSTMT hStm,
SQLSMALLINT nOperation )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLCancel.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLCancel.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLCancel.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -32,6 +32,7 @@
*/
SQLRETURN SQL_API SQLCancel( SQLHSTMT hStm )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLCloseCursor.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLCloseCursor.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLCloseCursor.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -26,6 +26,7 @@
*/
SQLRETURN SQL_API SQLCloseCursor( SQLHSTMT hStm )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLColAttributeW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLColAttributeW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLColAttributeW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -26,6 +26,7 @@
SQLPOINTER pnNumericAttributePtr )
#endif
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLColumnPrivilegesW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLColumnPrivilegesW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLColumnPrivilegesW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -18,6 +18,7 @@
SQLWCHAR * pszColumnName,
SQLSMALLINT nNameLength4 )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLColumnsW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLColumnsW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLColumnsW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -38,6 +38,7 @@
SQLWCHAR * pcColumnName,
SQLSMALLINT nNameLength4 )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLConnectW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLConnectW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLConnectW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -16,6 +16,7 @@
SQLWCHAR * pszAuthentication,
SQLSMALLINT nNameLength3 )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLCopyDesc.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLCopyDesc.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLCopyDesc.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -39,6 +39,7 @@
SQLRETURN SQL_API SQLCopyDesc( SQLHDESC hSourceDescHandle,
SQLHDESC hTargetDescHandle )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLDescribeColW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLDescribeColW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLDescribeColW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -18,6 +18,7 @@
SQLSMALLINT * pnDecimalDigitsPtr,
SQLSMALLINT * pnNullablePtr )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLDescribeParam.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLDescribeParam.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLDescribeParam.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -41,6 +41,7 @@
SQLSMALLINT * pnDecimalDigitsPtr, /* SQL - IPD */
SQLSMALLINT * pnNullablePtr )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLDisconnect.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLDisconnect.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLDisconnect.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -31,6 +31,7 @@
*/
SQLRETURN SQL_API SQLDisconnect( SQLHDBC hDbc )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLDriverConnectW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLDriverConnectW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLDriverConnectW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -17,6 +17,7 @@
SQLSMALLINT * pnStringLength2Ptr,
SQLUSMALLINT nDriverCompletion )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLEndTran.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLEndTran.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLEndTran.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -33,6 +33,7 @@
SQLHANDLE hHandle,
SQLSMALLINT nCompletionType )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLExecDirectW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLExecDirectW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLExecDirectW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -12,6 +12,7 @@
SQLWCHAR * pszStatementText,
SQLINTEGER nTextLength )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLExecute.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLExecute.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLExecute.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -29,6 +29,7 @@
*/
SQLRETURN SQL_API SQLExecute( SQLHSTMT hStm )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLExtendedFetch.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLExtendedFetch.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLExtendedFetch.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -44,6 +44,7 @@
SQLUINTEGER * pnRowCountPtr,
SQLUSMALLINT * pnRowStatusArray )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLFetch.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLFetch.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLFetch.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -25,6 +25,7 @@
*/
SQLRETURN SQL_API SQLFetch( SQLHSTMT hStm )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLFetchScroll.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLFetchScroll.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLFetchScroll.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -32,6 +32,7 @@
SQLSMALLINT nFetchOrientation,
SQLINTEGER nFetchOffset )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLForeignKeysW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLForeignKeysW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLForeignKeysW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -22,6 +22,7 @@
SQLWCHAR * pszFKTableName,
SQLSMALLINT nNameLength6 )
{
+ MYODBCDbgEnter();
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLFreeHandle.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLFreeHandle.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLFreeHandle.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -26,6 +26,19 @@
SQLRETURN SQL_API SQLFreeHandle( SQLSMALLINT nHandleType,
SQLHANDLE hHandle )
{
+ MYODBCDbgEnter();
+
+ if ( !)
+ {
+ }
+ switch ( nHandleType )
+ {
+ case SQL_HANDLE_ENV:
+ case SQL_HANDLE_DBC:
+ case SQL_HANDLE_STMT:
+ case SQL_HANDLE_DESC:
+ }
+
return SQL_ERROR;
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLFreeStmt.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLFreeStmt.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLFreeStmt.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -35,7 +35,17 @@
SQLRETURN SQL_API SQLFreeStmt( SQLHSTMT hStm,
SQLUSMALLINT nOption )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+
+ MStatement *pStatement = (MStatement*)hStm;
+
+ if ( nOption == SQL_DROP )
+ {
+ delete pStatement;
+ MYODBCDbgReturn( SQL_SUCCESS );
+ }
+
+ MYODBCDbgReturn( hStm->doFreeStmt( nOption ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetConnectAttrW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetConnectAttrW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetConnectAttrW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -10,10 +10,11 @@
SQLRETURN SQL_API SQLGetConnectAttrW( SQLHDBC hDbc,
SQLINTEGER nAttribute,
- SQLPOINTER pValuePtr,
+ SQLPOINTER pValue,
SQLINTEGER nBufferLength,
- SQLINTEGER * pnStringLengthPtr )
+ SQLINTEGER * pnStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MConnection*)hDbc)->getConnectAttr( nAttribute, pValue,
nBufferLength, pnStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetCursorNameW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetCursorNameW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetCursorNameW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -9,11 +9,12 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLGetCursorNameW( SQLHSTMT hStm,
- SQLWCHAR * pszCursorName,
+ SQLWCHAR * psCursorName,
SQLSMALLINT nBufferLength,
- SQLSMALLINT * pnNameLengthPtr )
+ SQLSMALLINT * pnNameLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->getCursorName( psCursorName, nBufferLength,
pnNameLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetData.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetData.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetData.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -68,11 +68,12 @@
SQLRETURN SQL_API SQLGetData( SQLHSTMT hStm,
SQLUSMALLINT nColumnNumber,
SQLSMALLINT nTargetType,
- SQLPOINTER pTargetValuePtr,
+ SQLPOINTER pTargetValue,
SQLINTEGER nBufferLength,
- SQLINTEGER * pnStrLenOrIndPtr )
+ SQLINTEGER * pnStrLenOrInd )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->getData( nColumnNumber, nTargetType,
pTargetValue, nBufferLength, pnStrLenOrInd ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetDescFieldW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetDescFieldW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetDescFieldW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -11,10 +11,11 @@
SQLRETURN SQL_API SQLGetDescFieldW( SQLHDESC hDes,
SQLSMALLINT nRecNumber,
SQLSMALLINT nFieldIdentifier,
- SQLPOINTER pValuePtr,
+ SQLPOINTER pValue,
SQLINTEGER nBufferLength,
- SQLINTEGER * pnStringLengthPtr )
+ SQLINTEGER * pnStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MDescriptor*)hDes)->getDescField( nRecNumber, nFieldIdentifier,
pValue, nBufferLength, pnStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetDescRecW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetDescRecW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetDescRecW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -12,14 +12,15 @@
SQLSMALLINT nRecNumber,
SQLWCHAR * pszName,
SQLSMALLINT nBufferLength,
- SQLSMALLINT * pnStringLengthPtr,
- SQLSMALLINT * pnTypePtr,
- SQLSMALLINT * pnSubTypePtr,
- SQLLEN * pnLengthPtr,
- SQLSMALLINT * pnPrecisionPtr,
- SQLSMALLINT * pnScalePtr,
- SQLSMALLINT * pnNullablePtr )
+ SQLSMALLINT * pnStringLength,
+ SQLSMALLINT * pnType,
+ SQLSMALLINT * pnSubType,
+ SQLLEN * pnLength,
+ SQLSMALLINT * pnPrecision,
+ SQLSMALLINT * pnScale,
+ SQLSMALLINT * pnNullable )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MDescriptor*)hDes)->getDescRec( nRecNumber, pszName,
nBufferLength, pnStringLength, pnType, pnSubType, pnLength, pnPrecision, pnScale,
pnNullable ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetDiagFieldW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetDiagFieldW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetDiagFieldW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -12,10 +12,27 @@
SQLHANDLE hHandle,
SQLSMALLINT nRecNumber,
SQLSMALLINT nDiagIdentifier,
- SQLPOINTER pDiagInfoPtr,
+ SQLPOINTER pDiagInfo,
SQLSMALLINT nBufferLength,
- SQLSMALLINT * pnStringLengthPtr )
+ SQLSMALLINT * pnStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+
+ if ( !hHandle )
+ MYODBCDbgReturn( SQL_INVALID_HANDLE );
+
+ switch ( nHandleType )
+ {
+ case SQL_HANDLE_ENV:
+ MYODBCDbgReturn( ((MEnvironment*)hHandle)->getDiagField( nRecNumber,
nDiagIdentifier, pDiagInfo, nBufferLength, pnStringLength ) );
+ case SQL_HANDLE_DBC:
+ MYODBCDbgReturn( ((MConnection*)hHandle)->getDiagField( nRecNumber,
nDiagIdentifier, pDiagInfo, nBufferLength, pnStringLength ) );
+ case SQL_HANDLE_STMT:
+ MYODBCDbgReturn( ((MStatement*)hHandle)->getDiagField( nRecNumber,
nDiagIdentifier, pDiagInfo, nBufferLength, pnStringLength ) );
+ case SQL_HANDLE_DESC:
+ MYODBCDbgReturn( ((MDescriptor*)hHandle)->getDiagField( nRecNumber,
nDiagIdentifier, pDiagInfo, nBufferLength, pnStringLength ) );
+ }
+
+ MYODBCDbgReturn( SQL_INVALID_HANDLE );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetDiagRecW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetDiagRecW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetDiagRecW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -11,12 +11,29 @@
SQLRETURN SQL_API SQLGetDiagRecW( SQLSMALLINT nHandleType,
SQLHANDLE hHandle,
SQLSMALLINT nRecNumber,
- SQLWCHAR * pszSQLState,
- SQLINTEGER * pnNativeErrorPtr,
- SQLWCHAR * pszMessageText,
+ SQLWCHAR * psSQLState,
+ SQLINTEGER * pnNativeError,
+ SQLWCHAR * psMessageText,
SQLSMALLINT nBufferLength,
- SQLSMALLINT * pnTextLengthPtr )
+ SQLSMALLINT * pnTextLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+
+ if ( !hHandle )
+ MYODBCDbgReturn( SQL_INVALID_HANDLE );
+
+ switch ( nHandleType )
+ {
+ case SQL_HANDLE_ENV:
+ MYODBCDbgReturn( ((MEnvironment*)hHandle)->getDiagRec( nRecNumber,
psSQLState, pnNativeError, psMessageText, nBufferLength, pnTextLength ) );
+ case SQL_HANDLE_DBC:
+ MYODBCDbgReturn( ((MConnection*)hHandle)->getDiagRec( nRecNumber,
psSQLState, pnNativeError, psMessageText, nBufferLength, pnTextLength ) );
+ case SQL_HANDLE_STMT:
+ MYODBCDbgReturn( ((MStatement*)hHandle)->getDiagRec( nRecNumber,
psSQLState, pnNativeError, psMessageText, nBufferLength, pnTextLength ) );
+ case SQL_HANDLE_DESC:
+ MYODBCDbgReturn( ((MDescriptor*)hHandle)->getDiagRec( nRecNumber,
psSQLState, pnNativeError, psMessageText, nBufferLength, pnTextLength ) );
+ }
+
+ MYODBCDbgReturn( SQL_INVALID_HANDLE );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetEnvAttr.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetEnvAttr.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetEnvAttr.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -35,11 +35,12 @@
*/
SQLRETURN SQL_API SQLGetEnvAttr( SQLHENV hEnv,
SQLINTEGER nAttribute,
- SQLPOINTER pValuePtr,
+ SQLPOINTER pValue,
SQLINTEGER nBufferLength,
- SQLINTEGER * pnStringLengthPtr )
+ SQLINTEGER * pnStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MEnvironment*)hEnv)->getEnvAttr( nAttribute, pValue,
nBufferLength, pnStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetFunctions.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetFunctions.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetFunctions.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -121,7 +121,8 @@
SQLUSMALLINT nFunctionID,
SQLUSMALLINT * pnSupportedPtr )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( SQL_ERROR );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetInfoW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetInfoW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetInfoW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -10,10 +10,11 @@
SQLRETURN SQL_API SQLGetInfoW( SQLHDBC hDbc,
SQLUSMALLINT nInfoType,
- SQLPOINTER pInfoValuePtr,
+ SQLPOINTER pInfoValue,
SQLSMALLINT nBufferLength,
- SQLSMALLINT * pnStringLengthPtr )
+ SQLSMALLINT * pnStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MConnection*)hDbc)->getInfo( nInfoType, pInfoValue,
nBufferLength, pnStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetStmtAttrW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetStmtAttrW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetStmtAttrW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -10,10 +10,11 @@
SQLRETURN SQL_API SQLGetStmtAttrW( SQLHSTMT hStm,
SQLINTEGER nAttribute,
- SQLPOINTER pValuePtr,
+ SQLPOINTER pValue,
SQLINTEGER nBufferLength,
- SQLINTEGER * pnStringLengthPtr )
+ SQLINTEGER * pnStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->getStmtAttr( nAttribute, pValue,
nBufferLength, pnStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLGetTypeInfoW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLGetTypeInfoW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLGetTypeInfoW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -11,6 +11,7 @@
SQLRETURN SQL_API SQLGetTypeInfoW( SQLHSTMT hStm,
SQLSMALLINT nDataType )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->getTypeInfo( nDataType ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLMoreResults.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLMoreResults.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLMoreResults.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -28,7 +28,8 @@
*/
SQLRETURN SQL_API SQLMoreResults( SQLHSTMT hStm )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doMoreResults() ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLNativeSqlW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLNativeSqlW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLNativeSqlW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -9,12 +9,13 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLNativeSqlW( SQLHDBC hDbc,
- SQLWCHAR * pszInStatementText,
+ SQLWCHAR * psInStatementText,
SQLINTEGER nTextLength1,
- SQLWCHAR * pszOutStatementText,
+ SQLWCHAR * psOutStatementText,
SQLINTEGER nBufferLength,
SQLINTEGER *pnTextLength2Ptr )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MConnection*)hDbc)->doNativeSQL( psInStatementText,
nTextLength1, psOutStatementText, nBufferLength, pnTextLength2Ptr ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLNumParams.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLNumParams.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLNumParams.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -26,9 +26,10 @@
\retval SQL_INVALID_HANDLE Invalid handle was provided.
*/
SQLRETURN SQL_API SQLNumParams( SQLHSTMT hStm,
- SQLSMALLINT * pnParameterCountPtr )
+ SQLSMALLINT * pnParameterCount )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doNumParams( pnParameterCount ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLNumResultCols.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLNumResultCols.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLNumResultCols.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -28,7 +28,8 @@
SQLRETURN SQL_API SQLNumResultCols( SQLHSTMT hStm,
SQLSMALLINT * pnColumnCountPtr )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doNumResultCols( pnColumnCountPtr ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLParamData.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLParamData.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLParamData.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -28,9 +28,10 @@
\retval SQL_INVALID_HANDLE Invalid handle was provided.
*/
SQLRETURN SQL_API SQLParamData( SQLHSTMT hStm,
- SQLPOINTER *ppValuePtrPtr )
+ SQLPOINTER *ppValue )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doParamData( ppValue ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLPrepareW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLPrepareW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLPrepareW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -9,9 +9,10 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLPrepareW( SQLHSTMT hStm,
- SQLWCHAR * pszStatementText,
+ SQLWCHAR * psStatementText,
SQLINTEGER nLength1 )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doPrepare( psStatementText, nLength1 ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLPrimaryKeysW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLPrimaryKeysW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLPrimaryKeysW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -29,13 +29,14 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLPrimaryKeysW( SQLHSTMT hStm,
- SQLWCHAR * pcCatalogName,
+ SQLWCHAR * psCatalogName,
SQLSMALLINT nNameLength1,
- SQLWCHAR * pcSchemaName,
+ SQLWCHAR * psSchemaName,
SQLSMALLINT nNameLength2,
- SQLWCHAR * pcTableName,
+ SQLWCHAR * psTableName,
SQLSMALLINT nNameLength3 )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doPrimaryKeys( psCatalogName, nNameLength1,
psSchemaName, nNameLength2, psTableName, nNameLength3 ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLProcedureColumnsW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLProcedureColumnsW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLProcedureColumnsW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -9,15 +9,16 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLProcedureColumnsW( SQLHSTMT hStm,
- SQLWCHAR * pszCatalogName,
+ SQLWCHAR * psCatalogName,
SQLSMALLINT nNameLength1,
- SQLWCHAR * pszSchemaName,
+ SQLWCHAR * psSchemaName,
SQLSMALLINT nNameLength2,
- SQLWCHAR * pszProcName,
+ SQLWCHAR * psProcName,
SQLSMALLINT nNameLength3,
- SQLWCHAR * pszColumnName,
+ SQLWCHAR * psColumnName,
SQLSMALLINT nNameLength4 )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doProcedureColumns( psCatalogName,
nNameLength1, psSchemaName, nNameLength2, psProcName, nNameLength3, psColumnName,
nNameLength4 ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLProceduresW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLProceduresW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLProceduresW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -9,13 +9,14 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLProceduresW( SQLHSTMT hStm,
- SQLWCHAR * pszCatalogName,
+ SQLWCHAR * psCatalogName,
SQLSMALLINT nNameLength1,
- SQLWCHAR * pszSchemaName,
+ SQLWCHAR * psSchemaName,
SQLSMALLINT nNameLength2,
- SQLWCHAR * pszProcName,
+ SQLWCHAR * psProcName,
SQLSMALLINT nNameLength3 )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doProcedures( psCatalogName, nNameLength1,
psSchemaName, nNameLength2, psProcName, nNameLength3 ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLPutData.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLPutData.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLPutData.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -27,10 +27,11 @@
\retval SQL_INVALID_HANDLE Invalid handle was provided.
*/
SQLRETURN SQL_API SQLPutData( SQLHSTMT hStm,
- SQLPOINTER rgbValue,
- SQLINTEGER cbValue )
+ SQLPOINTER pValue,
+ SQLINTEGER nStrLenOrInd )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doPutData( pValue, nStrLenOrInd ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLRowCount.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLRowCount.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLRowCount.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -27,7 +27,8 @@
SQLRETURN SQL_API SQLRowCount( SQLHSTMT hStm,
SQLINTEGER * pnRowCountPtr )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doRowCount( pnRowCountPtr ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSetConnectAttrW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSetConnectAttrW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSetConnectAttrW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -13,6 +13,7 @@
SQLPOINTER pValuePtr,
SQLINTEGER nStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MConnection*)hDbc)->setConnectAttr( nAttribute, pValuePtr,
nStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSetCursorNameW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSetCursorNameW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSetCursorNameW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -9,9 +9,10 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLSetCursorNameW( SQLHSTMT hStm,
- SQLWCHAR * pszCursorName,
+ SQLWCHAR * psCursorName,
SQLSMALLINT nNameLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->setCursorName( psCursorName, nNameLength )
);
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSetDescFieldW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSetDescFieldW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSetDescFieldW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -14,5 +14,6 @@
SQLPOINTER pValuePtr,
SQLINTEGER nBufferLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MDescriptor*)hDes)->setDescField( nRecNumber, nFieldIdentifier,
pValuePtr, nBufferLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSetDescRec.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSetDescRec.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSetDescRec.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -23,16 +23,17 @@
\retval SQL_INVALID_HANDLE Invalid handle was provided.
*/
SQLRETURN SQL_API SQLSetDescRec( SQLHDESC hDes,
- SQLSMALLINT nRecNum,
- SQLSMALLINT the_type,
- SQLSMALLINT datetime_interval_code,
- SQLINTEGER octet_length,
- SQLSMALLINT precision,
- SQLSMALLINT scale,
- SQLPOINTER data_ptr,
- SQLINTEGER * octet_length_ptr,
- SQLINTEGER * indicator_ptr )
+ SQLSMALLINT nRecNumber,
+ SQLSMALLINT nType,
+ SQLSMALLINT nSubType,
+ SQLLEN nLength,
+ SQLSMALLINT nPrecision,
+ SQLSMALLINT nScale,
+ SQLPOINTER pData,
+ SQLLEN * pnStringLength,
+ SQLLEN * pnIndicator )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MDescriptor*)hDes)->setDescRec( nRecNumber, nType, nSubType,
nLength, nPrecision, nScale, pData, pnStringLength, pnIndicator ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSetEnvAttr.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSetEnvAttr.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSetEnvAttr.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -25,7 +25,8 @@
SQLPOINTER pValue,
SQLINTEGER nStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MEnvironment*)hEnv)->setEnvAttr( nAttribute, pValue,
nStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSetPos.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSetPos.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSetPos.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -34,7 +34,8 @@
SQLUSMALLINT nOperation,
SQLUSMALLINT nLockType )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->setPos( nRowNumber, nOperation, nLockType )
);
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSetStmtAttrW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSetStmtAttrW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSetStmtAttrW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -13,6 +13,7 @@
SQLPOINTER pValue,
SQLINTEGER nStringLength )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->setStmtAttr( nAttribute, pValue,
nStringLength ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLSpecialColumnsW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLSpecialColumnsW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLSpecialColumnsW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -9,17 +9,18 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLSpecialColumnsW( SQLHSTMT hStm,
- SQLUSMALLINT fColType,
- SQLWCHAR * szTableQualifier,
- SQLSMALLINT cbTableQualifier,
- SQLWCHAR * szTableOwner,
- SQLSMALLINT cbTableOwner,
- SQLWCHAR * szTableName,
- SQLSMALLINT cbTableName,
- SQLUSMALLINT fScope,
- SQLUSMALLINT fNullable )
+ SQLSMALLINT nIdentifierType,
+ SQLWCHAR * psCatalogName,
+ SQLSMALLINT nNameLength1,
+ SQLWCHAR * psSchemaName,
+ SQLSMALLINT nNameLength2,
+ SQLWCHAR * psTableName,
+ SQLSMALLINT nNameLength3,
+ SQLSMALLINT nScope,
+ SQLSMALLINT nNullable )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doSpecialColumns( nIdentifierType,
psCatalogName, nNameLength1, psSchemaName, nNameLength2, psTableName, nNameLength3,
nScope, nNullable ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLStatisticsW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLStatisticsW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLStatisticsW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -29,15 +29,16 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLStatisticsW( SQLHSTMT hStm,
- SQLWCHAR * pcCatalogName,
+ SQLWCHAR * psCatalogName,
SQLSMALLINT nNameLength1,
- SQLWCHAR * pcSchemaName,
+ SQLWCHAR * psSchemaName,
SQLSMALLINT nNameLength2,
- SQLWCHAR * pcTableName,
+ SQLWCHAR * psTableName,
SQLSMALLINT nNameLength3,
SQLUSMALLINT nUnique,
SQLUSMALLINT nAccuracy )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doStatistics( psCatalogName, nNameLength1,
psSchemaName, nNameLength2, psTableName, nNameLength3 ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLTablePrivilegesW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLTablePrivilegesW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLTablePrivilegesW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -8,14 +8,15 @@
*/
#include "MYODBCDrvInternal.h"
-SQLRETURN SQL_API SQLTablePrivilegesW( SQLHSTMT hStm,
- SQLWCHAR * szTableQualifier,
- SQLSMALLINT cbTableQualifier,
- SQLWCHAR * szTableOwner,
- SQLSMALLINT cbTableOwner,
- SQLWCHAR * szTableName,
- SQLSMALLINT cbTableName )
+SQLRETURN SQL_API SQLTablePrivilegesW( SQLHSTMT hStm,
+ SQLWCHAR * psCatalogName,
+ SQLSMALLINT nCatalogName,
+ SQLWCHAR * psSchemaName,
+ SQLSMALLINT nSchemaName,
+ SQLWCHAR * psTableName,
+ SQLSMALLINT nTableName )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doTablePrivileges( psCatalogName,
nCatalogName, psSchemaName, nSchemaName, psTableName, nTableName ) );
}
Modified: MYODBCDrv/MYODBCDrvLib/SQLTablesW.cpp
===================================================================
--- MYODBCDrv/MYODBCDrvLib/SQLTablesW.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYODBCDrv/MYODBCDrvLib/SQLTablesW.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -30,15 +30,16 @@
#include "MYODBCDrvInternal.h"
SQLRETURN SQL_API SQLTablesW( SQLHSTMT hStm,
- SQLWCHAR * pszCatalogName,
+ SQLWCHAR * psCatalogName,
SQLSMALLINT nNameLength1,
- SQLWCHAR * pszSchemaName,
+ SQLWCHAR * psSchemaName,
SQLSMALLINT nNameLength2,
- SQLWCHAR * pszTableName,
+ SQLWCHAR * psTableName,
SQLSMALLINT nNameLength3,
- SQLWCHAR * pszTableType,
+ SQLWCHAR * psTableType,
SQLSMALLINT nNameLength4 )
{
- return SQL_ERROR;
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( ((MStatement*)hStm)->doTables( psCatalogName, nNameLength1,
psSchemaName, nNameLength2, psTableName, nNameLength3, psTableType, nNameLength4 ) );
}
Modified: MYSQLCC/MYSQLCCLib/MDescriptor.cpp
===================================================================
--- MYSQLCC/MYSQLCCLib/MDescriptor.cpp 2006-04-27 19:36:51 UTC (rev 135)
+++ MYSQLCC/MYSQLCCLib/MDescriptor.cpp 2006-04-28 17:54:43 UTC (rev 136)
@@ -1,36 +1,21 @@
#include "MInternal.h"
/*!
- \brief Allocates a new descriptor.
+ \brief Initializes a new MDescriptor using MConnection as parent.
- Allocates a new descriptor; initializing
- fields based upon the requested type.
+ Using a MConnection as parent implies that the type will
+ be SQL_DESC_ALLOC_USER and that we are going to be used as
+ either an APD or an ARD.
- Descriptors know nothing about the driver
- code itself - including its handles.
- Subsequently the caller will likely want to do
- some processing to complete this request. For
- example; add the descriptor to a list of
- descriptors in the owner handle.
+ \param MConnection This is the parent. This descriptor can be
+ associated with 0-n statements (where the
+ statement is also a child of the given connection)
+ using \sa SQLSetStmtAttr.
- \param hOwner The ODBC handle which will own the new
- descriptor. The type of handle which is
- viable depends upon the nDesType.
-
- The handle should correspond to a
- MYODBC_RTTI_TYPE.
-
- \param nDesType The descriptor type to create.
-
- \return MYODBC_DES_PTR
-
- \retval A pointer to a viable descriptor.
- \retval NULL if something went wrong.
-
- \sa MYODBCDesFree()
- SQLAllocHandle()
+ \sa SQLSetStmtAttr
+ MConnection
+ MStatement::setStmtAttr
*/
-
MDescriptor::MDescriptor( MConnection *pConnection )
{
MYODBCDbgEnter();
@@ -45,6 +30,22 @@
MYODBCDbgReturn2();
}
+/*!
+ \brief Initializes a new MDescriptor using MStatement as parent.
+
+ Using a MStatement as parent implies that the type will
+ be SQL_DESC_ALLOC_AUTO and that we are going to be used as
+ any one of the viable descriptor types (APD, ARD, IRD, IPD).
+
+ \note A descriptor created as a child of MStatement should be created
+ using a MDescriptor based class but not MDescriptor itself.
+
+ \param MStatement This is the parent.
+
+ \sa MStatement
+ MConnection
+
+*/
MDescriptor::MDescriptor( MStatement *pStatement )
{
MYODBCDbgEnter();
Modified: MYSQLCC/MYSQLCCLib/MDescriptorAPD.h
===================================================================
--- MYSQLCC/MYSQLCCLib/MDescriptorAPD.h 2006-04-27 19:36:51 UTC (rev 135)
+++ MYSQLCC/MYSQLCCLib/MDescriptorAPD.h 2006-04-28 17:54:43 UTC (rev 136)
@@ -22,7 +22,7 @@
friend class MDescriptorRecordAPD;
public:
MDescriptorAPD( MConnection *pConnection, SQLSMALLINT nAllocType );
- MDescriptorAPD( MStatement *pStatement, SQLSMALLINT nAllocType );
+ MDescriptorAPD( MStatement *pStatement );
/* setters */
SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );
Modified: MYSQLCC/include/MDescriptor.h
===================================================================
--- MYSQLCC/include/MDescriptor.h 2006-04-27 19:36:51 UTC (rev 135)
+++ MYSQLCC/include/MDescriptor.h 2006-04-28 17:54:43 UTC (rev 136)
@@ -40,7 +40,7 @@
public:
MDescriptor( MConnection *pConnection );
- MDescriptor( MStatement *pStatement );
+ MDescriptorAPD( MStatement *pStatement );
~MDescriptor();
/* setters */
Modified: MYSQLCC/include/MStatement.h
===================================================================
--- MYSQLCC/include/MStatement.h 2006-04-27 19:36:51 UTC (rev 135)
+++ MYSQLCC/include/MStatement.h 2006-04-28 17:54:43 UTC (rev 136)
@@ -31,7 +31,7 @@
SQLRETURN doCloseCursor();
SQLRETURN doColAttribute( SQLUSMALLINT nColumnNumber, SQLUSMALLINT nFieldIdentifier,
SQLPOINTER psCharacterAttributePtr, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnStringLengthPtr, SQLPOINTER pnNumericAttributePtr );
SQLRETURN doColumnPrivileges( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT
nNameLength3, SQLWCHAR *psColumnName, SQLSMALLINT nNameLength4 );
- SQLRETURN doColumns( SQLWCHAR *pcCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*pcSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *pcTableName, SQLSMALLINT nNameLength3,
SQLWCHAR *pcColumnName, SQLSMALLINT nNameLength4 );
+ SQLRETURN doColumns( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3,
SQLWCHAR *psColumnName, SQLSMALLINT nNameLength4 );
SQLRETURN doDescribeCol( SQLUSMALLINT nColumnNumber, SQLWCHAR *pszColumnName,
SQLSMALLINT nBufferLength, SQLSMALLINT *pnNameLengthPtr, SQLSMALLINT *pnDataTypePtr,
SQLULEN *pnColumnSizePtr, SQLSMALLINT *pnDecimalDigitsPtr, SQLSMALLINT *pnNullablePtr );
SQLRETURN doDescribeParam( SQLUSMALLINT nParameterNumber, SQLSMALLINT *pnDataTypePtr,
SQLUINTEGER *pnParameterSizePtr, SQLSMALLINT *pnDecimalDigitsPtr, SQLSMALLINT
*pnNullablePtr );
SQLRETURN doExecDirect( SQLWCHAR *psStatementText, SQLINTEGER nTextLength );
@@ -46,7 +46,7 @@
SQLRETURN doNumResultCols( SQLSMALLINT *pnColumnCountPtr );
SQLRETURN doParamData( SQLPOINTER *ppValuePtrPtr );
SQLRETURN doPrepare( SQLWCHAR *psStatementText, SQLINTEGER nLength1 );
- SQLRETURN doPrimaryKeys( SQLWCHAR *pcCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*pcSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *pcTableName, SQLSMALLINT nNameLength3
);
+ SQLRETURN doPrimaryKeys( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3
);
SQLRETURN doProcedureColumns( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psProcName, SQLSMALLINT
nNameLength3, SQLWCHAR *psColumnName, SQLSMALLINT nNameLength4 );
SQLRETURN doProcedures( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psProcName, SQLSMALLINT nNameLength3
);
SQLRETURN doPutData( SQLPOINTER pDataPtr, SQLINTEGER nStrLenOrInd );
| Thread |
|---|
| • Connector/ODBC 5 commit: r136 - MYODBCDrv/MYODBCDrvLib MYSQLCC/MYSQLCCLib MYSQLCC/include | pharvey | 28 Apr |
