Modified:
MYSQLPlus/MYSQLPlusLib/MConnection.cpp
MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp
MYSQLPlus/MYSQLPlusLib/MStatement.cpp
Log:
Modified: MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-06 12:55:29 UTC (rev 192)
+++ MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-06 13:22:44 UTC (rev 193)
@@ -33,18 +33,18 @@
SQLGetConnectAttr will return SQL_NO_DATA."
*/
- nAccessMode = SQL_MODE_READ_WRITE;
+ nAccessMode = SQL_MODE_DEFAULT;
nAsyncEnable = SQL_ASYNC_ENABLE_OFF;
- nAutocommit = SQL_AUTOCOMMIT_ON;
+ nAutocommit = SQL_AUTOCOMMIT_DEFAULT;
nConnectionTimeout = 0;
stringCurrentCatalog = QString::null;
- nLoginTimeout = 0;
+ nLoginTimeout = SQL_LOGIN_TIMEOUT_DEFAULT;
nMetadataID = SQL_FALSE;
- nODBCCursors = SQL_CUR_USE_DRIVER;
+ nODBCCursors = SQL_CUR_DEFAULT;
nPacketSize = 16 * 1,024,000; /*! \internal \todo Client and
server have independent value. Default on client is 16M but try to be smarter by getting
real value. */
hQuietMode = 0;
- nTrace = SQL_OPT_TRACE_OFF;
- stringTracefile = QString::null;
+ nTrace = SQL_OPT_TRACE_DEFAULT;
+ stringTracefile = SQL_OPT_TRACE_FILE_DEFAULT;
stringTranslateLib = QString::null;
nTranslateOption = 0;
nTxnIsolation = 0;
Modified: MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp 2006-05-06 12:55:29 UTC (rev 192)
+++ MYSQLPlus/MYSQLPlusLib/MEnvironment.cpp 2006-05-06 13:22:44 UTC (rev 193)
@@ -6,8 +6,8 @@
pDiagnostic = new MDiagnostic();
- nConnectionPooling = SQL_CP_OFF;
- nCPMatch = SQL_CP_STRICT_MATCH;
+ nConnectionPooling = SQL_CP_DEFAULT;
+ nCPMatch = SQL_CP_MATCH_DEFAULT;
nODBCVersion = SQL_OV_ODBC3;
bOutputNTS = SQL_TRUE;
Modified: MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MStatement.cpp 2006-05-06 12:55:29 UTC (rev 192)
+++ MYSQLPlus/MYSQLPlusLib/MStatement.cpp 2006-05-06 13:22:44 UTC (rev 193)
@@ -13,25 +13,25 @@
pDiagnostic = new MDiagnostic();
pAppParamDesc = pAppParamDescOrig = new MDescriptorAPD( this );
pAppRowDesc = pAppRowDescOrig = new MDescriptorARD( this );
- nAsyncEnable = SQL_ASYNC_ENABLE_OFF;
- nConcurrency = SQL_CONCUR_READ_ONLY;
+ nAsyncEnable = SQL_ASYNC_ENABLE_DEFAULT;
+ nConcurrency = SQL_CONCUR_DEFAULT;
nCursorScrollable = SQL_NONSCROLLABLE;
nCursorSensitivity = SQL_UNSPECIFIED;
- nCursorType = SQL_CURSOR_FORWARD_ONLY;
+ nCursorType = SQL_CURSOR_TYPE_DEFAULT;
nEnableAutoIPD = SQL_FALSE;
pFetchBookmarkPtr = NULL;
pImpParamDesc = new MDescriptorIPD( this );
pImpRowDesc = new MDescriptorIRD( this );
- nKeysetSize = 0;
- nMaxLength = 0;
- nMaxRows = 0;
+ nKeysetSize = SQL_KEYSET_SIZE_DEFAULT;
+ nMaxLength = SQL_MAX_LENGTH_DEFAULT;
+ nMaxRows = SQL_MAX_ROWS_DEFAULT;
nMetadataID = pConnection->getMetadataID();
- nNoscan = SQL_NOSCAN_OFF;
- nQueryTimeout = 0;
- nRetrieveData = SQL_RD_ON;
+ nNoscan = SQL_NOSCAN_DEFAULT;
+ nQueryTimeout = SQL_QUERY_TIMEOUT_DEFAULT;
+ nRetrieveData = SQL_RD_DEFAULT;
nRowNumber = 0;
nSimulateCursor = SQL_SC_TRY_UNIQUE;
- nUseBookmarks = SQL_UB_OFF;
+ nUseBookmarks = SQL_UB_DEFAULT;
MYODBCDbgReturn2();
}
@@ -151,28 +151,26 @@
MYODBCDbgReturn( setNoscan( (SQLUINTEGER)pValue ) );
case SQL_ATTR_PARAM_BIND_OFFSET_PTR:
- MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_param_desc, -1,
SQL_DESC_BIND_OFFSET_PTR, pValue, nStringLength ) );
+ MYODBCDbgReturn( setParamBindOffsetPtr( (SQLUINTEGER*)pValue ) );
case SQL_ATTR_PARAM_BIND_TYPE:
- MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_param_desc, -1,
SQL_DESC_BIND_TYPE, pValue, nStringLength ) );
+ MYODBCDbgReturn( setParamBindType( (SQLUINTEGER)pValue ) );
case SQL_ATTR_PARAM_OPERATION_PTR:
- MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_param_desc, -1,
SQL_DESC_ARRAY_STATUS_PTR, pValue, nStringLength ) );
+ MYODBCDbgReturn( setParamOperationPtr( (SQLUSMALLINT*)pValue ) );
case SQL_ATTR_PARAM_STATUS_PTR:
- MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_imp_param_desc, -1,
SQL_DESC_ARRAY_STATUS_PTR, pValue, nStringLength ) );
+ MYODBCDbgReturn( setParamStatusPtr( (SQLUSMALLINT*)pValue ) );
case SQL_ATTR_PARAMS_PROCESSED_PTR:
- MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_imp_param_desc, -1,
SQL_DESC_ROWS_PROCESSED_PTR, pValue, nStringLength ) );
+ MYODBCDbgReturn( setParamsProcessedPtr( (SQLUINTEGER*)pValue ) );
case SQL_ATTR_PARAMSET_SIZE:
- MYODBCDbgReturn( MYODBCDrvSetDescField( pStm->attr_app_param_desc, -1,
SQL_DESC_ARRAY_SIZE, pValue, nStringLength ) );
+ MYODBCDbgReturn( setParamsetSize( (SQLUINTEGER)pValue ) );
case SQL_ATTR_QUERY_TIMEOUT:
- if ( pUnsignedInt != SQL_QUERY_TIMEOUT_DEFAULT )
- MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HYC00 ) );
- break;
-
+ MYODBCDbgReturn( setQueryTimeout( SQLUINTEGER)pValue ) );
++++++++++
case SQL_ATTR_RETRIEVE_DATA:
if ( pUnsignedInt != SQL_RD_DEFAULT )
MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HYC00 ) );
| Thread |
|---|
| • Connector/ODBC 5 commit: r193 - MYSQLPlus/MYSQLPlusLib | pharvey | 6 May |
