Modified:
MYSQLCC/MYSQLCCLib/MConnection.cpp
MYSQLCC/MYSQLCCLib/MDescriptor.cpp
MYSQLCC/MYSQLCCLib/MYSQLCCLib.pro
MYSQLCC/include/MConnection.h
MYSQLCC/include/MDescriptor.h
Log:
Modified: MYSQLCC/MYSQLCCLib/MConnection.cpp
===================================================================
--- MYSQLCC/MYSQLCCLib/MConnection.cpp 2006-04-26 22:05:26 UTC (rev 133)
+++ MYSQLCC/MYSQLCCLib/MConnection.cpp 2006-04-26 22:45:13 UTC (rev 134)
@@ -1,22 +1,97 @@
-#include "MYODBCClsInternal.h"
+#include "MInternal.h"
-MYODBCClsConnection::MYODBCClsConnection( MYODBCClsEnvironment *pEnv )
- : QObject( pEnv )
+MConnection::MConnection( MEnvironment *pEnvironment )
+ : QObject( pEnvironment )
{
+ MYODBCDbgEnter();
+
+ Q_ASSERT( !pEnvironment );
+
+ MYODBCDbgReturn2();
}
-MYODBCClsConnection::~MYODBCClsConnection()
+MConnection::~MConnection()
{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn2();
}
-MYODBCDia *MYODBCClsConnection::getDia()
+SQLRETURN MConnection::setConnectAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr,
SQLINTEGER nStringLength )
{
- return pDia;
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
}
-MYODBCAttConnection *MYODBCClsConnection::getAtt()
+SQLRETURN MConnection::getConnectAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr,
SQLINTEGER nBufferLength, SQLINTEGER *pnStringLengthPtr )
{
- return pAtt;
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
}
+SQLRETURN MConnection::getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr )
+{
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr )
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::getInfo( SQLUSMALLINT nInfoType, SQLPOINTER pInfoValuePtr,
SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr )
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::doBrowseConnect( SQLWCHAR *psInConnectionString, SQLSMALLINT
nStringLength1, SQLWCHAR *psOutConnectionString, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnStringLength2Ptr )
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::doConnect( SQLWCHAR *psServerName, SQLSMALLINT nNameLength1,
SQLWCHAR *psUserName, SQLSMALLINT nNameLength2, SQLWCHAR *psAuthentication, SQLSMALLINT
nNameLength3 )
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::doDisconnect()
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::doDriverConnect( SQLHWND hWnd, SQLWCHAR *pszInConnectionString,
SQLSMALLINT nStringLength1, SQLWCHAR *pszOutConnectionString, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnStringLength2Ptr, SQLUSMALLINT nDriverCompletion )
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::doEndTran( SQLSMALLINT nCompletionType )
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+SQLRETURN MConnection::doNativeSql( SQLWCHAR *psInStatementText, SQLINTEGER nTextLength1,
SQLWCHAR *psOutStatementText, SQLINTEGER nBufferLength, SQLINTEGER *pnTextLength2Ptr )
+{
+ MYODBCDbgEnter();
+
+ MYODBCDbgReturn( SQL_ERROR );
+}
+
+
Modified: MYSQLCC/MYSQLCCLib/MDescriptor.cpp
===================================================================
--- MYSQLCC/MYSQLCCLib/MDescriptor.cpp 2006-04-26 22:05:26 UTC (rev 133)
+++ MYSQLCC/MYSQLCCLib/MDescriptor.cpp 2006-04-26 22:45:13 UTC (rev 134)
@@ -1,4 +1,4 @@
-#include "MYODBCDesInternal.h"
+#include "MInternal.h"
/*!
\brief Allocates a new descriptor.
@@ -30,27 +30,32 @@
\sa MYODBCDesFree()
SQLAllocHandle()
*/
-MDescriptor::MDescriptor( SQLHANDLE hOwner, SQLSMALLINT nAllocType )
+
+MDescriptor::MDescriptor( MConnection *pConnection )
{
MYODBCDbgEnter();
- Q_ASSERT( nAllocType != SQL_DESC_ALLOC_AUTO && nAllocType !=
SQL_DESC_ALLOC_USER );
+ Q_ASSERT( !pConnection );
- this->nAllocType = nAllocType;
+ this->nAllocType = SQL_DESC_ALLOC_USER;
doInit();
/* derived classes must create bookmark as needed */
- /* we must have an owner (dbc or stm) */
- Q_ASSERT( !hOwner );
+ MYODBCDbgReturn2();
+}
- /* associate with our owner (caller needs to add us to hOwner's list of descriptors)
*/
- this->hOwner = hOwner;
+MDescriptor::MDescriptor( MStatement *pStatement )
+{
+ MYODBCDbgEnter();
- /* descriptors have their own diagnostics - and this is it */
- pdia = new MYODBCDia();
- Q_ASSERT( !pdia );
+ Q_ASSERT( !pStatement );
+ this->nAllocType = SQL_DESC_ALLOC_AUTO;
+ doInit();
+
+ /* derived classes must create bookmark as needed */
+
MYODBCDbgReturn2();
}
@@ -77,19 +82,14 @@
{
MYODBCDbgEnter();
- /* delete records */
- QMutableVectorIterator<MYODBCDesRec*> i( vectorRecords );
- while ( i.hasNext() )
- {
- MYODBCDesRec *pdesrec = i.next();
- delete pdesrec;
- i.remove();
- }
+ MYODBCDbgReturn2();
+}
- /* delete diagnostic */
- delete pdia;
+SQLRETURN MDescriptor::setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT
nFieldIdentifier, SQLPOINTER pValuePtr, SQLINTEGER nBufferLength )
+{
+ MYODBCDbgEnter();
- MYODBCDbgReturn2();
+ MYODBCDbgReturn( SQL_SUCCESS );
}
SQLRETURN MDescriptor::setDescRec( SQLSMALLINT nRecNumber, SQLSMALLINT nType, SQLSMALLINT
nSubType, SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER
pDataPtr, SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr )
@@ -102,7 +102,7 @@
This argument must be equal to or greater than 0.
*/
if ( nRecNumber < 0 )
- MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
+ MYODBCDbgReturn( diagnostic.doAppend( MDiagnostic::DIA_07009, 0, NULL ) );
/*
\internal ODBC Rule
@@ -125,9 +125,128 @@
}
/* push down to record for further processing */
- MYODBCDbgReturn( vectorRecords[nRecNumber]->setDescRec( nType, nSubType, nLength,
nPrecision, nScale, pDataPtr, pnStringLengthPtr, pnIndicatorPtr ) );
+ MYODBCDbgReturn( children()[nRecNumber]->setDescRec( nType, nSubType, nLength,
nPrecision, nScale, pDataPtr, pnStringLengthPtr, pnIndicatorPtr ) );
}
+SQLRETURN MDescriptor::getDescField( SQLSMALLINT nRecNumber, SQLSMALLINT
nFieldIdentifier, SQLPOINTER pValuePtr, SQLINTEGER nBufferLength, SQLINTEGER
*pnStringLengthPtr )
+{
+ MYODBCDbgEnter();
+
+ /*! \internal ODBC Rule
+
+ When an application calls SQLGetDescField to retrieve the value of a field that
is undefined for a particular descriptor
+ type, the function returns SQL_SUCCESS but the value returned for the field is
undefined. For example, calling
+ SQLGetDescField for the SQL_DESC_NAME or SQL_DESC_NULLABLE field of an APD or ARD
will return SQL_SUCCESS but an
+ undefined value for the field.
+ */
+
+ /*! \internal ODBC Rule
+
+ When an application calls SQLGetDescField to retrieve the value of a field that
is defined for a particular descriptor
+ type but that has no default value and has not been set yet, the function returns
SQL_SUCCESS but the value returned for
+ the field is undefined. For more information on the initialization of descriptor
fields and descriptions of the fields,
+ see "Initialization of Descriptor Fields" in SQLSetDescField. For more
information on descriptors, see Descriptors.
+ */
+
+ /* header field */
+ switch ( nFieldIdentifier )
+ {
+ case SQL_DESC_ALLOC_TYPE:
+ *((SQLSMALLINT *)pValuePtr) = getAllocType();
+ MYODBCDbgReturn( SQL_SUCCESS );
+
+ case SQL_DESC_ARRAY_SIZE:
+ *((SQLUINTEGER *)pValuePtr) = getArraySize();
+ MYODBCDbgReturn( SQL_SUCCESS );
+
+ case SQL_DESC_ARRAY_STATUS_PTR:
+ *((SQLUSMALLINT **)pValuePtr) = getArrayStatusPtr();
+ MYODBCDbgReturn( SQL_SUCCESS );
+
+ case SQL_DESC_BIND_OFFSET_PTR:
+ *((SQLINTEGER **)pValuePtr) = getBindOffsetPtr();
+ MYODBCDbgReturn( SQL_SUCCESS );
+
+ case SQL_DESC_BIND_TYPE:
+ *((SQLUINTEGER *)pValuePtr) = getBindType();
+ MYODBCDbgReturn( SQL_SUCCESS );
+
+ case SQL_DESC_COUNT:
+ *((SQLSMALLINT *)pValuePtr) = getCount();
+ MYODBCDbgReturn( SQL_SUCCESS );
+
+ case SQL_DESC_ROWS_PROCESSED_PTR:
+ *((SQLUINTEGER **)pValuePtr) = getRowsProcessedPtr();
+ MYODBCDbgReturn( SQL_SUCCESS );
+ }
+
+ /*! \internal ODBC Rule
+
+ The RecNumber argument was less than 0.
+ */
+ if ( nRecNumber < 0 )
+ MYODBCDbgReturn( diagnostic.doAppend( MDiagnostic::DIA_07009, 0, NULL ) );
+
+ /*! \internal ODBC Rule
+
+ SQL_NO_DATA is returned if RecNumber is greater than the current number of
descriptor records.
+ */
+ if ( nRecNumber >= getCount() )
+ MYODBCDbgReturn( SQL_NO_DATA );
+
+ /* push down to record for further processing */
+ MYODBCDbgReturn( children()[nRecNumber]->getDescField( nFieldIdentifier,
pValuePtr, nBufferLength, pnStringLengthPtr ) );
+}
+
+SQLRETURN MDescriptor::getDescRec( SQLSMALLINT nRecNumber, SQLWCHAR *pszName, SQLSMALLINT
nBufferLength, SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT
*pnSubTypePtr, SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT
*pnScalePtr, SQLSMALLINT *pnNullablePtr )
+{
+ MYODBCDbgEnter();
+
+ if ( nRecNumber < 0 )
+ MYODBCDbgReturn( diagnostic.doAppend( MDiagnostic::DIA_07009, 0, NULL ) );
+
+ /*! \internal ODBC Rule
+
+ SQL_NO_DATA is returned if RecNumber is greater than the current number of
descriptor records.
+ */
+ if ( nRecNumber >= getCount() )
+ MYODBCDbgReturn( SQL_NO_DATA );
+
+ /* push down to record for further processing */
+ MYODBCDbgReturn( children()[nRecNumber]->getDescRec( pszName, nBufferLength,
pnStringLengthPtr, pnTypePtr, pnSubTypePtr, pnLengthPtr, pnPrecisionPtr, pnScalePtr,
pnNullablePtr ) );
+}
+
+SQLRETURN MDescriptor::getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr )
+{
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( diagnostic.getDiagField( nRecNumber, nDiagIdentifier, pDiagInfoPtr,
nBufferLength, pnStringLengthPtr ) )
+}
+
+SQLRETURN MDescriptor::getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr )
+{
+ MYODBCDbgEnter();
+ MYODBCDbgReturn( diagnostic.getDiagRec( nRecNumber, psSQLState, pnNativeErrorPtr,
psMessageText, nBufferLength, pnTextLengthPtr ) )
+}
+
+MDescriptor &MDescriptor::operator=( MDescriptor &descriptor )
+{
+ descriptor.doClear();
+ descriptor.nArraySize = nArraySize;
+ descriptor.nBindType = nBindType;
+ descriptor.pnArrayStatusPtr = pnArrayStatusPtr;
+ descriptor.pnBindOffsetPtr = pnBindOffsetPtr;
+ descriptor.pnRowsProcessedPtr = pnRowsProcessedPtr;
+
+ QVectorIterator<MDescriptorRecord*> i( vectorRecords );
+ while ( i.hasNext() )
+ {
+ MDescriptorRecord *pDescriptorRecord = i.next();
+ descriptor.doAppend( pDescriptorRecord );
+ }
+
+ MYODBCDbgReturn3( "%p", *this );
+}
+
SQLRETURN MDescriptor::setArraySize( SQLUINTEGER nArraySize )
{
MYODBCDbgEnter();
@@ -193,7 +312,7 @@
less than 0.
*/
if ( nCount < 0 )
- MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
+ MYODBCDbgReturn( diagnostic.doAppend( MDiagnostic::DIA_07009, 0, NULL ) );
/* append */
while ( nCount > getCount() )
@@ -203,18 +322,18 @@
/* truncate */
{
- QMutableVectorIterator<MYODBCDesRec*> i( vectorRecords );
+ QMutableVectorIterator<MDescriptorRecord*> i( vectorRecords );
i.toBack();
while ( getCount() > nCount && i.hasPrevious() )
{
- MYODBCDesRec *pdesrec = i.previous();
+ MDescriptorRecord *pDescriptorRecord = i.previous();
/* do not delete bound records */
- if ( pdesrec->getDataPtr() && !bUnbind )
+ if ( pDescriptorRecord->getDataPtr() && !bUnbind )
break;
i.remove();
- delete pdesrec;
+ delete pDescriptorRecord;
}
}
@@ -230,94 +349,6 @@
MYODBCDbgReturn( SQL_SUCCESS );
}
-SQLRETURN MDescriptor::getDescRec( SQLSMALLINT nRecNumber, SQLWCHAR *pszName, SQLSMALLINT
nBufferLength, SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT
*pnSubTypePtr, SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT
*pnScalePtr, SQLSMALLINT *pnNullablePtr )
-{
- MYODBCDbgEnter();
-
- if ( nRecNumber < 0 )
- MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
-
- /*! \internal ODBC Rule
-
- SQL_NO_DATA is returned if RecNumber is greater than the current number of
descriptor records.
- */
- if ( nRecNumber >= getCount() )
- MYODBCDbgReturn( SQL_NO_DATA );
-
- /* push down to record for further processing */
- MYODBCDbgReturn( vectorRecords[nRecNumber]->getDescRec( pszName, nBufferLength,
pnStringLengthPtr, pnTypePtr, pnSubTypePtr, pnLengthPtr, pnPrecisionPtr, pnScalePtr,
pnNullablePtr ) );
-}
-
-SQLRETURN MDescriptor::getDescField( SQLSMALLINT nRecNumber, SQLSMALLINT
nFieldIdentifier, SQLPOINTER pValuePtr, SQLINTEGER nBufferLength, SQLINTEGER
*pnStringLengthPtr )
-{
- MYODBCDbgEnter();
-
- /*! \internal ODBC Rule
-
- When an application calls SQLGetDescField to retrieve the value of a field that
is undefined for a particular descriptor
- type, the function returns SQL_SUCCESS but the value returned for the field is
undefined. For example, calling
- SQLGetDescField for the SQL_DESC_NAME or SQL_DESC_NULLABLE field of an APD or ARD
will return SQL_SUCCESS but an
- undefined value for the field.
- */
-
- /*! \internal ODBC Rule
-
- When an application calls SQLGetDescField to retrieve the value of a field that
is defined for a particular descriptor
- type but that has no default value and has not been set yet, the function returns
SQL_SUCCESS but the value returned for
- the field is undefined. For more information on the initialization of descriptor
fields and descriptions of the fields,
- see "Initialization of Descriptor Fields" in SQLSetDescField. For more
information on descriptors, see Descriptors.
- */
-
- /* header field */
- switch ( nFieldIdentifier )
- {
- case SQL_DESC_ALLOC_TYPE:
- *((SQLSMALLINT *)pValuePtr) = getAllocType();
- MYODBCDbgReturn( SQL_SUCCESS );
-
- case SQL_DESC_ARRAY_SIZE:
- *((SQLUINTEGER *)pValuePtr) = getArraySize();
- MYODBCDbgReturn( SQL_SUCCESS );
-
- case SQL_DESC_ARRAY_STATUS_PTR:
- *((SQLUSMALLINT **)pValuePtr) = getArrayStatusPtr();
- MYODBCDbgReturn( SQL_SUCCESS );
-
- case SQL_DESC_BIND_OFFSET_PTR:
- *((SQLINTEGER **)pValuePtr) = getBindOffsetPtr();
- MYODBCDbgReturn( SQL_SUCCESS );
-
- case SQL_DESC_BIND_TYPE:
- *((SQLUINTEGER *)pValuePtr) = getBindType();
- MYODBCDbgReturn( SQL_SUCCESS );
-
- case SQL_DESC_COUNT:
- *((SQLSMALLINT *)pValuePtr) = getCount();
- MYODBCDbgReturn( SQL_SUCCESS );
-
- case SQL_DESC_ROWS_PROCESSED_PTR:
- *((SQLUINTEGER **)pValuePtr) = getRowsProcessedPtr();
- MYODBCDbgReturn( SQL_SUCCESS );
- }
-
- /*! \internal ODBC Rule
-
- The RecNumber argument was less than 0.
- */
- if ( nRecNumber < 0 )
- MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07009, 0, NULL ) );
-
- /*! \internal ODBC Rule
-
- SQL_NO_DATA is returned if RecNumber is greater than the current number of
descriptor records.
- */
- if ( nRecNumber >= getCount() )
- MYODBCDbgReturn( SQL_NO_DATA );
-
- /* push down to record for further processing */
- MYODBCDbgReturn( vectorRecords[nRecNumber]->getDescField( nFieldIdentifier,
pValuePtr, nBufferLength, pnStringLengthPtr ) );
-}
-
SQLSMALLINT MDescriptor::getAllocType()
{
MYODBCDbgEnter();
@@ -457,25 +488,6 @@
MYODBCDbgReturn3( "%d", nRecordsDeleted );
}
-MYODBCDes &MDescriptor::operator=( MYODBCDes &des )
-{
- des.doClear();
- des.nArraySize = nArraySize;
- des.nBindType = nBindType;
- des.pnArrayStatusPtr = pnArrayStatusPtr;
- des.pnBindOffsetPtr = pnBindOffsetPtr;
- des.pnRowsProcessedPtr = pnRowsProcessedPtr;
-
- QVectorIterator<MYODBCDesRec*> i( vectorRecords );
- while ( i.hasNext() )
- {
- MYODBCDesRec *pdesrec = i.next();
- des.doAppend( pdesrec );
- }
-
- MYODBCDbgReturn3( "%p", *this );
-}
-
void MDescriptor::doAppendBookmark()
{
MYODBCDbgEnter();
Modified: MYSQLCC/MYSQLCCLib/MYSQLCCLib.pro
===================================================================
--- MYSQLCC/MYSQLCCLib/MYSQLCCLib.pro 2006-04-26 22:05:26 UTC (rev 133)
+++ MYSQLCC/MYSQLCCLib/MYSQLCCLib.pro 2006-04-26 22:45:13 UTC (rev 134)
@@ -2,7 +2,7 @@
# COMMON
# #########################################################
TEMPLATE = lib
-TARGET = MYODBCCls
+TARGET = MYSQLPlus
DESTDIR = ../../lib
include( ../../common.pri )
include( ../../config.pri )
@@ -12,25 +12,44 @@
INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../../MYODBCDbg/include
INCLUDEPATH += ../../MYODBCIns/include
-INCLUDEPATH += ../../MYODBCDia/include
-INCLUDEPATH += ../../MYODBCDes/include
-INCLUDEPATH += ../../MYODBCAtt/include
-# INCLUDEPATH += ../../MYODBCRes/include
+include( ../../odbc.pri )
include( ../../mysql.pri )
# #########################################################
# FILES
# #########################################################
HEADERS = \
- ../include/MYODBCCls.h \
- ../include/MYODBCClsEnvironment.h \
- ../include/MYODBCClsConnection.h \
- ../include/MYODBCClsStatement.h \
- MYODBCClsInternal.h
+ ../include/M.h \
+ ../include/MEnvironment.h \
+ ../include/MConnection.h \
+ ../include/MStatement.h \
+ MDescriptorAPD.h \
+ MDescriptorARD.h \
+ MDescriptorIPD.h \
+ MDescriptorIRD.h \
+ MDescriptorRecord.h \
+ MDescriptorRecordAPD.h \
+ MDescriptorRecordARD.h \
+ MDescriptorRecordIPD.h \
+ MDescriptorRecordIRD.h \
+ MDiagnostic.h \
+ MDiagnosticRecord.h \
+ MInternal.h
SOURCES = \
- MYODBCClsEnvironment.cpp \
- MYODBCClsConnection.cpp \
- MYODBCClsStatement.cpp
+ MEnvironment.cpp \
+ MConnection.cpp \
+ MStatement.cpp \
+ MDescriptorAPD.cpp \
+ MDescriptorARD.cpp \
+ MDescriptorIPD.cpp \
+ MDescriptorIRD.cpp \
+ MDescriptorRecord.cpp \
+ MDescriptorRecordAPD.cpp \
+ MDescriptorRecordARD.cpp \
+ MDescriptorRecordIPD.cpp \
+ MDescriptorRecordIRD.cpp \
+ MDiagnostic.cpp \
+ MDiagnosticRecord.cpp
Modified: MYSQLCC/include/MConnection.h
===================================================================
--- MYSQLCC/include/MConnection.h 2006-04-26 22:05:26 UTC (rev 133)
+++ MYSQLCC/include/MConnection.h 2006-04-26 22:45:13 UTC (rev 134)
@@ -6,7 +6,6 @@
class MConnection : public QObject
{
friend class MStatement;
- friend class MDescriptor;
public:
MConnection( MEnvironment *pEnvironment );
@@ -32,7 +31,7 @@
protected:
private:
- MDiagnostic * pDiagnostic; /*!< our diagnostic information */
+ MDiagnostic diagnostic; /*!< our diagnostic information */
};
#endif
Modified: MYSQLCC/include/MDescriptor.h
===================================================================
--- MYSQLCC/include/MDescriptor.h 2006-04-26 22:05:26 UTC (rev 133)
+++ MYSQLCC/include/MDescriptor.h 2006-04-26 22:45:13 UTC (rev 134)
@@ -33,8 +33,8 @@
friend class MStatement;
public:
- MDescriptor( MConnection *pConnection, SQLSMALLINT nAllocType );
- MDescriptor( MStatement *pStatement, SQLSMALLINT nAllocType );
+ MDescriptor( MConnection *pConnection );
+ MDescriptor( MStatement *pStatement );
~MDescriptor();
/* setters */
@@ -70,7 +70,7 @@
virtual SQLUINTEGER * getRowsProcessedPtr();
private:
- MDiagnostic * pDiagnostic; /*!< our diagnostic information */
+ MDiagnostic diagnostic; /*!< our diagnostic information */
SQLSMALLINT nAllocType; /*!< SQL_DESC_ALLOC_TYPE */
SQLUINTEGER nArraySize; /*!< SQL_DESC_ARRAY_SIZE */
| Thread |
|---|
| • Connector/ODBC 5 commit: r134 - in MYSQLCC: MYSQLCCLib include | pharvey | 27 Apr |
