Modified:
trunk/
trunk/SDK/MYSQLPlus/Library/MCommand.cpp
trunk/SDK/MYSQLPlus/Library/MCommand.h
trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h
trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
trunk/SDK/MYSQLPlus/Library/MResult_props.cpp
trunk/SDK/MYSQLPlus/Library/MStatement.cpp
trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
trunk/SDK/MYSQLPlus/include/MStatement.h
Log:
small cleanups
move IRD back to MStatement (at least for now) to avoid DM crash
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 23770081-651f-0410-8754-a6a0be119b88:/work/c-odbc:880
ba6c4e7b-c7fc-804d-ac3d-40e5d3c52c2f:/local/odbc5_fix_regressions:772
+ 23770081-651f-0410-8754-a6a0be119b88:/work/c-odbc:880
ba6c4e7b-c7fc-804d-ac3d-40e5d3c52c2f:/local/odbc5_fix_regressions:775
Modified: trunk/SDK/MYSQLPlus/Library/MCommand.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MCommand.cpp 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MCommand.cpp 2007-01-23 22:52:47 UTC (rev 769)
@@ -23,7 +23,6 @@
stringText.clear();
nParameterOffset = 0;
pResult = NULL;
- pImpRowDesc = new MDescriptorIRD( this );
nType = COMMAND_TYPE_NULL;
nState = STATE_INITIALIZED;
@@ -485,7 +484,7 @@
/* clear any existing processing */
doClear();
-
+
/* for each char in stringText */
for ( int nChar = 0; nChar < stringText.length(); nChar++ )
{
@@ -652,13 +651,6 @@
MYODBCDbgReturn3( "%p", getCommands()->getDiagnostic() );
}
-MDescriptor *MCommand::getImpRowDesc()
-{
- MYODBCDbgEnter();
-
- MYODBCDbgReturn3( "%p", pImpRowDesc );
-}
-
MStatement *MCommand::getStatement()
{
MYODBCDbgEnter();
@@ -761,9 +753,9 @@
of making other calls.
\param nState Desired state.
-
+
\return SQLRETURN
-
+
\sa getState
*/
SQLRETURN MCommand::doStateRollBack( STATE nState )
@@ -780,7 +772,6 @@
break;
case STATE_INITIALIZED:
- delete getImpRowDesc();
setState( STATE_UNINITIALIZED );
break;
@@ -795,7 +786,6 @@
break;
case STATE_WITH_RESULT:
- getImpRowDesc()->doClear();
delete pResult;
pResult = NULL;
setState( STATE_PARSED );
Modified: trunk/SDK/MYSQLPlus/Library/MCommand.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MCommand.h 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MCommand.h 2007-01-23 22:52:47 UTC (rev 769)
@@ -78,7 +78,7 @@
STATE getState();
QString getText(); /*!< Return the unprocessed text.
*/
COMMAND_TYPE getType(); /*!< general type of the command as
indicated by first keyword */
-
+
/* doers */
SQLRETURN doClear(); /*!< Rolls back state to
STATE_INITIALIZED. */
@@ -103,7 +103,6 @@
MCommands * getCommands();
MConnection * getConnection();
MDiagnostic * getDiagnostic();
- MDescriptor* getImpRowDesc(); /*!< SQL_ATTR_IMP_ROW_DESC */
MStatement * getStatement();
/* doers */
@@ -111,7 +110,6 @@
SQLRETURN doStateRollBack( STATE nState );
private:
- MDescriptor * pImpRowDesc; /*!< IRD (metadata about ResultSet (if
any)) */
QString stringNativeText; /*!< native (prepared) command (may have
server specifics but no ODBC specifics) */
uint nParameterOffset; /*!< The index of our first parameter
relative to all commands (0-based). */
QList<uint> listParameterMarkers; /*!< list of index pos into native
command string where we can find param marker */
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.cpp 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.cpp 2007-01-23 22:52:47 UTC (rev 769)
@@ -1,7 +1,7 @@
#include "MDescriptorIRD.h"
-MDescriptorIRD::MDescriptorIRD( MCommand *pCommand )
- : MDescriptor( pCommand )
+MDescriptorIRD::MDescriptorIRD( MStatement *pStatement )
+ : MDescriptor( pStatement )
{
doAppendBookmark();
}
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h 2007-01-23 22:52:47 UTC (rev 769)
@@ -15,7 +15,7 @@
{
friend class MDescriptorRecordIRD;
public:
- MDescriptorIRD( MCommand *pCommand );
+ MDescriptorIRD( MStatement *pStatement );
/* setters */
SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );
Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-01-23 22:52:47 UTC (rev 769)
@@ -1566,7 +1566,7 @@
if ( !nFields )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY000, 0,
tr("mysql_num_fields() failed to return number of fields") ) );
- MDescriptorIRD descriptor( getCommand() );
+ MDescriptorIRD descriptor( getStatement() );
descriptor.setCount( nFields, true );
/*!
@@ -1735,7 +1735,7 @@
if ( !nFields )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY000, 0,
tr("mysql_num_fields() failed to return number of fields") ) );
- MDescriptorIRD descriptor( getCommand() );
+ MDescriptorIRD descriptor( getStatement() );
descriptor.setCount( nFields, true );
for ( nField = 0; nField < nFields; nField++ )
Modified: trunk/SDK/MYSQLPlus/Library/MResult_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_props.cpp 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MResult_props.cpp 2007-01-23 22:52:47 UTC (rev 769)
@@ -697,7 +697,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%p", getCommand()->getImpRowDesc() );
+ MYODBCDbgReturn3( "%p", getStatement()->getImpRowDesc() );
}
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-01-23 22:52:47 UTC (rev 769)
@@ -49,6 +49,7 @@
pAppParamDesc = pAppParamDescOrig = new MDescriptorAPD( this );
pAppRowDesc = pAppRowDescOrig = new MDescriptorARD( this );
pImpParamDesc = new MDescriptorIPD( this );
+ pImpRowDesc = new MDescriptorIRD( this );
/* attributes */
bImplicitPrepare = false;
@@ -76,7 +77,6 @@
/* attributes: adopt from MConnection to support ODBC v2 and ODBC v3 */
nAsyncEnable = pConnection->getAsyncEnable();
-
/*!
\internal ODBC RULE
Modified: trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp 2007-01-23 22:52:47 UTC (rev 769)
@@ -1559,11 +1559,7 @@
{
MYODBCDbgEnter();
- MCommand *pCommand = getCommand();
- if ( !pCommand )
- MYODBCDbgReturn3( "%p", NULL );
-
- MYODBCDbgReturn3( "%p", pCommand->getImpRowDesc() );
+ MYODBCDbgReturn3( "%p", pImpRowDesc );
}
SQLUINTEGER MStatement::getKeysetSize()
Modified: trunk/SDK/MYSQLPlus/include/MStatement.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MStatement.h 2007-01-23 22:50:40 UTC (rev 768)
+++ trunk/SDK/MYSQLPlus/include/MStatement.h 2007-01-23 22:52:47 UTC (rev 769)
@@ -200,28 +200,28 @@
BOOL bImplicitPrepare; /*!< true if prepare done implicitly ie
doExecDirect or doTables etc*/
STATE nState; /*!< our current state
*/
- MDescriptor * pAppParamDesc; /*!< SQL_ATTR_APP_PARAM_DESC
*/
- MDescriptor * pAppRowDesc; /*!< SQL_ATTR_APP_ROW_DESC
*/
- SQLUINTEGER nAsyncEnable; /*!< SQL_ATTR_ASYNC_ENABLE
*/
- SQLUINTEGER nConcurrency; /*!< SQL_ATTR_CONCURRENCY
*/
- SQLUINTEGER nCursorScrollable; /*!< SQL_ATTR_CURSOR_SCROLLABLE
*/
- SQLUINTEGER nCursorSensitivity; /*!< SQL_ATTR_CURSOR_SENSITIVITY
*/
- SQLUINTEGER nCursorType; /*!< SQL_ATTR_CURSOR_TYPE
*/
- SQLUINTEGER nEnableAutoIPD; /*!< SQL_ATTR_ENABLE_AUTO_IPD
*/
- SQLPOINTER pFetchBookmarkPtr; /*!< SQL_ATTR_FETCH_BOOKMARK_PTR
*/
- MDescriptor * pImpParamDesc; /*!< SQL_ATTR_IMP_PARAM_DESC
*/
- SQLUINTEGER nKeysetSize; /*!< SQL_ATTR_KEYSET_SIZE
*/
- SQLUINTEGER nMaxLength; /*!< SQL_ATTR_MAX_LENGTH
*/
- SQLUINTEGER nMaxRows; /*!< SQL_ATTR_MAX_ROWS
*/
- SQLUINTEGER nMetadataID; /*!< SQL_ATTR_METADATA_ID
*/
- SQLUINTEGER nNoscan; /*!< SQL_ATTR_NOSCAN
*/
- SQLUINTEGER nQueryTimeout; /*!< SQL_ATTR_QUERY_TIMEOUT
*/
- SQLUINTEGER nRetrieveData; /*!< SQL_ATTR_RETRIEVE_DATA
*/
-/* SQLUINTEGER nRowNumber; */ /*!< SQL_ATTR_ROW_NUMBER
*/
- SQLUINTEGER nSimulateCursor; /*!< SQL_ATTR_SIMULATE_CURSOR
*/
- SQLUINTEGER nUseBookmarks; /*!< SQL_ATTR_USE_BOOKMARKS
*/
+ MDescriptor * pAppParamDesc; /*!< SQL_ATTR_APP_PARAM_DESC */
+ MDescriptor * pAppRowDesc; /*!< SQL_ATTR_APP_ROW_DESC */
+ SQLUINTEGER nAsyncEnable; /*!< SQL_ATTR_ASYNC_ENABLE */
+ SQLUINTEGER nConcurrency; /*!< SQL_ATTR_CONCURRENCY */
+ SQLUINTEGER nCursorScrollable; /*!< SQL_ATTR_CURSOR_SCROLLABLE */
+ SQLUINTEGER nCursorSensitivity; /*!< SQL_ATTR_CURSOR_SENSITIVITY */
+ SQLUINTEGER nCursorType; /*!< SQL_ATTR_CURSOR_TYPE */
+ SQLUINTEGER nEnableAutoIPD; /*!< SQL_ATTR_ENABLE_AUTO_IPD */
+ SQLPOINTER pFetchBookmarkPtr; /*!< SQL_ATTR_FETCH_BOOKMARK_PTR */
+ MDescriptor * pImpParamDesc; /*!< SQL_ATTR_IMP_PARAM_DESC */
+ MDescriptor * pImpRowDesc; /*!< SQL_ATTR_IMP_ROW_DESC */
+ SQLUINTEGER nKeysetSize; /*!< SQL_ATTR_KEYSET_SIZE */
+ SQLUINTEGER nMaxLength; /*!< SQL_ATTR_MAX_LENGTH */
+ SQLUINTEGER nMaxRows; /*!< SQL_ATTR_MAX_ROWS */
+ SQLUINTEGER nMetadataID; /*!< SQL_ATTR_METADATA_ID */
+ SQLUINTEGER nNoscan; /*!< SQL_ATTR_NOSCAN */
+ SQLUINTEGER nQueryTimeout; /*!< SQL_ATTR_QUERY_TIMEOUT */
+ SQLUINTEGER nRetrieveData; /*!< SQL_ATTR_RETRIEVE_DATA */
+/* SQLUINTEGER nRowNumber; */ /*!< SQL_ATTR_ROW_NUMBER */
+ SQLUINTEGER nSimulateCursor; /*!< SQL_ATTR_SIMULATE_CURSOR */
+ SQLUINTEGER nUseBookmarks; /*!< SQL_ATTR_USE_BOOKMARKS */
};
#endif
-
| Thread |
|---|
| • Connector/ODBC 5 commit: r769 - in trunk: . SDK/MYSQLPlus/Library SDK/MYSQLPlus/include | jbalint | 23 Jan |
