| List: | Commits | « Previous MessageNext Message » | |
| From: | pharvey | Date: | October 9 2006 6:31pm |
| Subject: | Connector/ODBC 5 commit: r585 - trunk/SDK/MYSQLPlus/Library | ||
| View as plain text | |||
Modified: trunk/SDK/MYSQLPlus/Library/MResult.cpp trunk/SDK/MYSQLPlus/Library/MResult.h trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp trunk/SDK/MYSQLPlus/Library/MResultRes.cpp trunk/SDK/MYSQLPlus/Library/MStatement.cpp Log: ENH: improved logging Modified: trunk/SDK/MYSQLPlus/Library/MResult.cpp =================================================================== --- trunk/SDK/MYSQLPlus/Library/MResult.cpp 2006-10-09 15:40:33 UTC (rev 584) +++ trunk/SDK/MYSQLPlus/Library/MResult.cpp 2006-10-09 16:31:18 UTC (rev 585) @@ -115,10 +115,10 @@ bResultSetRowsKnown = false; nBuffered = BUFFERED_UNBUFFERED; // no ResultSet buffering - nConcurrency = CONCURRENCY_READ_ONLY; // ReadOnly ResultSet - nCursorScrollable = CURSOR_SCROLLABLE_NONSCROLLABLE; // doNext is only viable cursor operation - nCursorSensitivity = CURSOR_SENSITIVITY_UNSPECIFIED; // we do not share changes to ResultSet enthusiastically - nCursorType = CURSOR_TYPE_FORWARD_ONLY; // Cursor can only scroll forward + nConcurrency = SQL_CONCUR_READ_ONLY; // ReadOnly ResultSet + nCursorScrollable = SQL_NONSCROLLABLE; // doNext is only viable cursor operation + nCursorSensitivity = SQL_UNSPECIFIED; // we do not share changes to ResultSet enthusiastically + nCursorType = SQL_CURSOR_FORWARD_ONLY; // Cursor can only scroll forward nKeySetSize = 0; // cache keys for all rows nMaxLength = 0; // get all column data for large data types nMaxRows = 0; // get all rows for resultset @@ -129,7 +129,7 @@ nRowSetRows = 0; // no valid rows nRowSetSize = 1; // single row cursor nState = STATE_UNINITIALIZED; // our state - nSimulateCursor = SIMULATE_CURSOR_TRY_UNIQUE; // we try to ensure pos update/delete affects 1 row but in case of no unique row id - we may affect more than 1 row + nSimulateCursor = SQL_SC_TRY_UNIQUE; // we try to ensure pos update/delete affects 1 row but in case of no unique row id - we may affect more than 1 row /*! \internal @@ -178,10 +178,13 @@ setKeySetSize() setSimulateCursor() */ -SQLRETURN MResult::setConcurrency( CONCURRENCY nConcurrency ) +SQLRETURN MResult::setConcurrency( SQLUINTEGER nConcurrency ) { MYODBCDbgEnter(); +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg( MYODBCC::getConcurrencyString( nConcurrency ) ) ); +#endif if ( getState() >= STATE_PREPARED ) MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) ); @@ -213,10 +216,12 @@ setKeySetSize() setSimulateCursor() */ -SQLRETURN MResult::setCursorScrollable( CURSOR_SCROLLABLE nCursorScrollable ) +SQLRETURN MResult::setCursorScrollable( SQLUINTEGER nCursorScrollable ) { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg( MYODBCC::getCursorScrollableString( nCursorScrollable ) ) ); +#endif if ( getState() >= STATE_PREPARED ) MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) ); @@ -249,10 +254,12 @@ setKeySetSize() setSimulateCursor() */ -SQLRETURN MResult::setCursorSensitivity( CURSOR_SENSITIVITY nCursorSensitivity ) +SQLRETURN MResult::setCursorSensitivity( SQLUINTEGER nCursorSensitivity ) { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg( MYODBCC::getCursorSensitivityString( nCursorSensitivity ) ) ); +#endif if ( getState() >= STATE_PREPARED ) MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) ); @@ -286,10 +293,12 @@ setKeySetSize() setSimulateCursor() */ -SQLRETURN MResult::setCursorType( CURSOR_TYPE nCursorType ) +SQLRETURN MResult::setCursorType( SQLUINTEGER nCursorType ) { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg( MYODBCC::getCursorTypeString( nCursorType ) ) ); +#endif if ( getState() >= STATE_PREPARED ) MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) ); @@ -455,10 +464,13 @@ setCursorType() setKeySetSize() */ -SQLRETURN MResult::setSimulateCursor( SIMULATE_CURSOR nSimulateCursor ) +SQLRETURN MResult::setSimulateCursor( SQLUINTEGER nSimulateCursor ) { MYODBCDbgEnter(); +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg( MYODBCC::getSimulateCursorString( nSimulateCursor ) ) ); +#endif if ( getState() >= STATE_PREPARED ) MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) ); @@ -487,27 +499,39 @@ MYODBCDbgReturn3( "%d", getImpRowDesc()->getCount() ); } -MResult::CONCURRENCY MResult::getConcurrency() +SQLUINTEGER MResult::getConcurrency() { MYODBCDbgEnter(); +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg( MYODBCC::getConcurrencyString( nConcurrency ) ) ); +#endif MYODBCDbgReturn3( "%d", nConcurrency ); } -MResult::CURSOR_SCROLLABLE MResult::getCursorScrollable() +SQLUINTEGER MResult::getCursorScrollable() { MYODBCDbgEnter(); +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg( MYODBCC::getCursorScrollableString( nCursorScrollable ) ) ); +#endif MYODBCDbgReturn3( "%d", nCursorScrollable ); } -MResult::CURSOR_SENSITIVITY MResult::getCursorSensitivity() +SQLUINTEGER MResult::getCursorSensitivity() { MYODBCDbgEnter(); +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg( MYODBCC::getCursorSensitivityString( nCursorSensitivity ) ) ); +#endif MYODBCDbgReturn3( "%d", nCursorSensitivity ); } -MResult::CURSOR_TYPE MResult::getCursorType() +SQLUINTEGER MResult::getCursorType() { MYODBCDbgEnter(); +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg( MYODBCC::getCursorTypeString( nCursorType ) ) ); +#endif MYODBCDbgReturn3( "%d", nCursorType ); } @@ -619,9 +643,12 @@ MYODBCDbgReturn3( "%d", nRowSetSize ); } -MResult::SIMULATE_CURSOR MResult::getSimulateCursor() +SQLUINTEGER MResult::getSimulateCursor() { MYODBCDbgEnter(); +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg( MYODBCC::getSimulateCursorString( nSimulateCursor ) ) ); +#endif MYODBCDbgReturn3( "%d", nSimulateCursor ); } Modified: trunk/SDK/MYSQLPlus/Library/MResult.h =================================================================== --- trunk/SDK/MYSQLPlus/Library/MResult.h 2006-10-09 15:40:33 UTC (rev 584) +++ trunk/SDK/MYSQLPlus/Library/MResult.h 2006-10-09 16:31:18 UTC (rev 585) @@ -254,78 +254,42 @@ BUFFERED_UNBUFFERED // default }; - enum CONCURRENCY - { - CONCURRENCY_READ_ONLY, // default - CONCURRENCY_LOCK, - CONCURRENCY_ROWVER, - CONCURRENCY_VALUES - }; - - enum CURSOR_SCROLLABLE - { - CURSOR_SCROLLABLE_NONSCROLLABLE, // default - CURSOR_SCROLLABLE_SCROLLABLE - }; - - enum CURSOR_SENSITIVITY - { - CURSOR_SENSITIVITY_UNSPECIFIED, // default - CURSOR_SENSITIVITY_INSENSITIVE, - CURSOR_SENSITIVITY_SENSITIVE - }; - - enum CURSOR_TYPE - { - CURSOR_TYPE_FORWARD_ONLY, // default - CURSOR_TYPE_STATIC, - CURSOR_TYPE_KEYSET_DRIVEN, // may switch to/from DYNAMIC if KeySetSize size != 0 - this is called MIXED - CURSOR_TYPE_DYNAMIC - }; - - enum SIMULATE_CURSOR - { - SIMULATE_CURSOR_NON_UNIQUE, - SIMULATE_CURSOR_TRY_UNIQUE, // default - SIMULATE_CURSOR_UNIQUE - }; - MResult( MStatement *pStatement ); virtual ~MResult(); /* setters */ virtual SQLRETURN setCommand( MCommand *pCommand ) = 0; - virtual SQLRETURN setConcurrency( CONCURRENCY nConcurrency = CONCURRENCY_READ_ONLY ); - virtual SQLRETURN setCursorScrollable( CURSOR_SCROLLABLE nCursorScrollable = CURSOR_SCROLLABLE_NONSCROLLABLE ); - virtual SQLRETURN setCursorSensitivity( CURSOR_SENSITIVITY nCursorSensitivity = CURSOR_SENSITIVITY_UNSPECIFIED ); - virtual SQLRETURN setCursorType( CURSOR_TYPE nCursorType = CURSOR_TYPE_FORWARD_ONLY ); + virtual SQLRETURN setConcurrency( SQLUINTEGER nConcurrency = SQL_CONCUR_READ_ONLY ); + virtual SQLRETURN setCursorScrollable( SQLUINTEGER nCursorScrollable = SQL_NONSCROLLABLE ); + virtual SQLRETURN setCursorSensitivity( SQLUINTEGER nCursorSensitivity = SQL_UNSPECIFIED ); + virtual SQLRETURN setCursorType( SQLUINTEGER nCursorType = SQL_CURSOR_FORWARD_ONLY ); virtual SQLRETURN setData( SQLUSMALLINT nColumn, const QVariant &variantData ) = 0; /*!< Operates on RowSetRow. */ virtual SQLRETURN setKeySetSize( SQLUINTEGER nKeySetSize = 0 ); virtual SQLRETURN setMaxLength( SQLUINTEGER nMaxLength = 0 ); virtual SQLRETURN setMaxRows( SQLUINTEGER nMaxRows = 0 ); virtual SQLRETURN setRowSetRow( SQLUSMALLINT nRowSetRow = 1 ); virtual SQLRETURN setRowSetSize( SQLUINTEGER nRowSetSize = 1 ); - virtual SQLRETURN setSimulateCursor( SIMULATE_CURSOR nSimulateCursor = SIMULATE_CURSOR_TRY_UNIQUE ); + virtual SQLRETURN setSimulateCursor( SQLUINTEGER nSimulateCursor = SQL_SC_TRY_UNIQUE ); /* getters */ - virtual BUFFERED getBuffered(); - virtual SQLUSMALLINT getColumns(); - virtual CONCURRENCY getConcurrency(); - virtual CURSOR_SCROLLABLE getCursorScrollable(); - virtual CURSOR_SENSITIVITY getCursorSensitivity(); - virtual CURSOR_TYPE getCursorType(); - virtual SQLRETURN getData( SQLUSMALLINT nColumn, SQLSMALLINT nTargetType, SQLPOINTER pTargetValue, SQLINTEGER nBufferLength, SQLINTEGER *pnLength, SQLINTEGER *pnIndicator ); /*!< Operates on RowSetRow. */ - virtual SQLUINTEGER getKeySetSize(); - virtual SQLUINTEGER getMaxLength(); - virtual SQLUINTEGER getMaxRows(); - virtual qulonglong getResultSetRow(); - virtual qulonglong getResultSetRows(); - virtual qulonglong getRowsAffected(); - virtual SQLUSMALLINT getRowSetRow(); - virtual SQLUINTEGER getRowSetRows(); - virtual SQLUINTEGER getRowSetSize(); - virtual SIMULATE_CURSOR getSimulateCursor(); - STATE getState(); + virtual BUFFERED getBuffered(); + virtual SQLUSMALLINT getColumns(); + virtual SQLUINTEGER getConcurrency(); + virtual SQLUINTEGER getCursorScrollable(); + virtual SQLUINTEGER getCursorSensitivity(); + virtual SQLUINTEGER getCursorType(); + virtual SQLRETURN getData( SQLUSMALLINT nColumn, SQLSMALLINT nTargetType, SQLPOINTER pTargetValue, SQLINTEGER nBufferLength, SQLINTEGER *pnLength, SQLINTEGER *pnIndicator ); /*!< Operates on RowSetRow. */ + virtual SQLUINTEGER getKeySetSize(); + virtual SQLUINTEGER getMaxLength(); + virtual SQLUINTEGER getMaxRows(); + virtual qulonglong getResultSetRow(); + virtual qulonglong getResultSetRows(); + virtual qulonglong getRowsAffected(); + virtual SQLUSMALLINT getRowSetRow(); + virtual SQLUINTEGER getRowSetRows(); + virtual SQLUINTEGER getRowSetSize(); + virtual SQLUINTEGER getSimulateCursor(); + STATE getState(); /* doers */ virtual SQLRETURN doAppend() = 0; @@ -399,16 +363,16 @@ change in MStatement) */ /*@{*/ - CONCURRENCY nConcurrency; /*!< SQL_ATTR_CONCURRENCY */ - CURSOR_SCROLLABLE nCursorScrollable; /*!< SQL_ATTR_CURSOR_SCROLLABLE */ - CURSOR_SENSITIVITY nCursorSensitivity; /*!< SQL_ATTR_CURSOR_SENSITIVITY */ - CURSOR_TYPE nCursorType; /*!< SQL_ATTR_CURSOR_TYPE */ - SQLUINTEGER nKeySetSize; /*!< SQL_ATTR_KEYSET_SIZE */ - SQLUINTEGER nMaxLength; /*!< SQL_ATTR_MAX_LENGTH */ - SQLUINTEGER nMaxRows; /*!< SQL_ATTR_MAX_ROWS */ - qulonglong nResultSetRow; /*!< SQL_ATTR_ROW_NUMBER */ - SQLUINTEGER nRowSetSize; /*!< SQL_ATTR_ROW_ARRAY_SIZE */ - SIMULATE_CURSOR nSimulateCursor; /*!< SQL_ATTR_SIMULATE_CURSOR */ + SQLUINTEGER nConcurrency; /*!< SQL_ATTR_CONCURRENCY */ + SQLUINTEGER nCursorScrollable; /*!< SQL_ATTR_CURSOR_SCROLLABLE */ + SQLUINTEGER nCursorSensitivity; /*!< SQL_ATTR_CURSOR_SENSITIVITY */ + SQLUINTEGER nCursorType; /*!< SQL_ATTR_CURSOR_TYPE */ + SQLUINTEGER nKeySetSize; /*!< SQL_ATTR_KEYSET_SIZE */ + SQLUINTEGER nMaxLength; /*!< SQL_ATTR_MAX_LENGTH */ + SQLUINTEGER nMaxRows; /*!< SQL_ATTR_MAX_ROWS */ + qulonglong nResultSetRow; /*!< SQL_ATTR_ROW_NUMBER */ + SQLUINTEGER nRowSetSize; /*!< SQL_ATTR_ROW_ARRAY_SIZE */ + SQLUINTEGER nSimulateCursor; /*!< SQL_ATTR_SIMULATE_CURSOR */ /*@}*/ /* setters */ Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp =================================================================== --- trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2006-10-09 15:40:33 UTC (rev 584) +++ trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2006-10-09 16:31:18 UTC (rev 585) @@ -1061,16 +1061,16 @@ BOOLEAN b = false; - if ( getConcurrency() != CONCURRENCY_READ_ONLY ) + if ( getConcurrency() != SQL_CONCUR_READ_ONLY ) { b = true; - setConcurrency( CONCURRENCY_READ_ONLY ); + setConcurrency( SQL_CONCUR_READ_ONLY ); } - if ( getCursorType() != CURSOR_TYPE_STATIC ) + if ( getCursorType() != SQL_CURSOR_STATIC ) { b = true; - setCursorType( CURSOR_TYPE_STATIC ); + setCursorType( SQL_CURSOR_STATIC ); } // PAH Modified: trunk/SDK/MYSQLPlus/Library/MResultRes.cpp =================================================================== --- trunk/SDK/MYSQLPlus/Library/MResultRes.cpp 2006-10-09 15:40:33 UTC (rev 584) +++ trunk/SDK/MYSQLPlus/Library/MResultRes.cpp 2006-10-09 16:31:18 UTC (rev 585) @@ -774,16 +774,16 @@ We can only support; CONCURRENCY_READ_ONLY & CURSOR_TYPE_FORWARD_ONLY at this time. We need to expand on this. */ - if ( getConcurrency() != CONCURRENCY_READ_ONLY ) + if ( getConcurrency() != SQL_CONCUR_READ_ONLY ) { b = true; - setConcurrency( CONCURRENCY_READ_ONLY ); + setConcurrency( SQL_CONCUR_READ_ONLY ); } - if ( getCursorType() != CURSOR_TYPE_FORWARD_ONLY ) + if ( getCursorType() != SQL_CURSOR_FORWARD_ONLY ) { b = true; - setCursorType( CURSOR_TYPE_FORWARD_ONLY ); + setCursorType( SQL_CURSOR_FORWARD_ONLY ); } /*! @@ -797,9 +797,9 @@ | else | BUFFERED_MYSQL_PLUS | +---------------------------------------------------------------+-----------------------------------+ */ - if ( getCursorType() == CURSOR_TYPE_FORWARD_ONLY ) + if ( getCursorType() == SQL_CURSOR_FORWARD_ONLY ) setBuffered( BUFFERED_UNBUFFERED ); - else if ( getConcurrency() == CONCURRENCY_READ_ONLY ) + else if ( getConcurrency() == SQL_CONCUR_READ_ONLY ) setBuffered( BUFFERED_MYSQL_CLIENT ); else setBuffered( BUFFERED_MYSQL_PLUS ); Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp =================================================================== --- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2006-10-09 15:40:33 UTC (rev 584) +++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2006-10-09 16:31:18 UTC (rev 585) @@ -6289,28 +6289,36 @@ SQLUINTEGER MStatement::getConcurrency() { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg( MYODBCC::getConcurrencyString( nConcurrency ) ) ); +#endif MYODBCDbgReturn3( "%d", nConcurrency ); } SQLUINTEGER MStatement::getCursorScrollable() { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg( MYODBCC::getCursorScrollableString( nCursorScrollable ) ) ); +#endif MYODBCDbgReturn3( "%d", nCursorScrollable ); } SQLUINTEGER MStatement::getCursorSensitivity() { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg( MYODBCC::getCursorSensitivityString( nCursorSensitivity ) ) ); +#endif MYODBCDbgReturn3( "%d", nCursorSensitivity ); } SQLUINTEGER MStatement::getCursorType() { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg( MYODBCC::getCursorTypeString( nCursorType ) ) ); +#endif MYODBCDbgReturn3( "%d", nCursorType ); } @@ -6505,7 +6513,9 @@ SQLUINTEGER MStatement::getSimulateCursor() { MYODBCDbgEnter(); - +#if MYODBC_DBG > 1 + MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg( MYODBCC::getSimulateCursorString( nSimulateCursor ) ) ); +#endif MYODBCDbgReturn3( "%d", nSimulateCursor ); }
| Thread | ||
|---|---|---|
| • Connector/ODBC 5 commit: r585 - trunk/SDK/MYSQLPlus/Library | pharvey | 9 Oct |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.448 sec. using MySQL 5.1.14-beta-log