List:Commits« Previous MessageNext Message »
From:pharvey Date:April 26 2006 10:14pm
Subject:Connector/ODBC 5 commit: r128 - in MYSQLCC: . MYSQLCCLib include
View as plain text  
Modified:
   MYSQLCC/MYSQLCC.vpj
   MYSQLCC/MYSQLCCLib/MInternal.h
   MYSQLCC/include/M.h
   MYSQLCC/include/MConnection.h
   MYSQLCC/include/MDescriptor.h
   MYSQLCC/include/MDiagnostic.h
   MYSQLCC/include/MEnvironment.h
   MYSQLCC/include/MStatement.h
Log:


Modified: MYSQLCC/MYSQLCC.vpj
===================================================================
--- MYSQLCC/MYSQLCC.vpj	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/MYSQLCC.vpj	2006-04-26 20:14:23 UTC (rev 128)
@@ -58,7 +58,6 @@
 			<F N="include/M.h"/>
 			<F N="include/MConnection.h"/>
 			<F N="include/MDescriptor.h"/>
-			<F N="include/MDiagnostic.h"/>
 			<F N="include/MEnvironment.h"/>
 			<F N="include/MStatement.h"/>
 		</Folder>

Modified: MYSQLCC/MYSQLCCLib/MInternal.h
===================================================================
--- MYSQLCC/MYSQLCCLib/MInternal.h	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/MYSQLCCLib/MInternal.h	2006-04-26 20:14:23 UTC (rev 128)
@@ -1,17 +1,20 @@
-#ifndef MYODBC_INTERNAL_H
-#define MYODBC_INTERNAL_H
+#ifndef MINTERNAL_H
+#define MINTERNAL_H
 
-#include "../include/MYODBC.h"
+#include "../include/M.h"
 
-#include "MYODBCDesAPD.h"
-#include "MYODBCDesARD.h"
-#include "MYODBCDesIPD.h"
-#include "MYODBCDesIRD.h"
-#include "MYODBCDesRec.h"
-#include "MYODBCDesRecAPD.h"
-#include "MYODBCDesRecARD.h"
-#include "MYODBCDesRecIPD.h"
-#include "MYODBCDesRecIRD.h"
+#include <MYODBCC.h>
+#include <MYODBCDbg.h>
 
+#include "MDiagnosticAPD.h"
+#include "MDiagnosticARD.h"
+#include "MDiagnosticIPD.h"
+#include "MDiagnosticIRD.h"
+#include "MDiagnosticRecord.h"
+#include "MDiagnosticRecordAPD.h"
+#include "MDiagnosticRecordARD.h"
+#include "MDiagnosticRecordIPD.h"
+#include "MDiagnosticRecordIRD.h"
+
 #endif
 

Modified: MYSQLCC/include/M.h
===================================================================
--- MYSQLCC/include/M.h	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/include/M.h	2006-04-26 20:14:23 UTC (rev 128)
@@ -2,7 +2,14 @@
 #define M_H
 
 #include <QObject>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
 
+/* forward declare this so we do not have to expose its details */
+class MDiagnostic
+
 #include "MEnvironment.h"
 #include "MConnection.h"
 #include "MStatement.h"

Modified: MYSQLCC/include/MConnection.h
===================================================================
--- MYSQLCC/include/MConnection.h	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/include/MConnection.h	2006-04-26 20:14:23 UTC (rev 128)
@@ -1,10 +1,13 @@
-#ifndef M_CONNECTION_H
-#define M_CONNECTION_H
+#ifndef MCONNECTION_H
+#define MCONNECTION_H
 
 #include "M.h"
 
 class MConnection : public QObject
 {
+    friend class MStatement;
+    friend class MDescriptor;
+
 public:
     MConnection( MEnvironment *pEnvironment );
     ~MConnection();
@@ -27,6 +30,8 @@
     SQLRETURN doNativeSql( SQLWCHAR *psInStatementText, SQLINTEGER nTextLength1, SQLWCHAR
*psOutStatementText, SQLINTEGER nBufferLength, SQLINTEGER *pnTextLength2Ptr );
 
 protected:
+
+private:
     MDiagnostic *   pDiagnostic;    /*!< our diagnostic information */
 };
 

Modified: MYSQLCC/include/MDescriptor.h
===================================================================
--- MYSQLCC/include/MDescriptor.h	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/include/MDescriptor.h	2006-04-26 20:14:23 UTC (rev 128)
@@ -1,5 +1,5 @@
-#ifndef M_DESCRIPTOR_H
-#define M_DESCRIPTOR_H
+#ifndef MDESCRIPTOR_H
+#define MDESCRIPTOR_H
 
 #include "M.h"
 
@@ -29,6 +29,9 @@
 */
 class MDescriptor : public QObject
 {
+    friend class MConnection;
+    friend class MStatement;
+
 public:
     MDescriptor( MConnection *pConnection, SQLSMALLINT nAllocType );
     MDescriptor( MStatement *pStatement, SQLSMALLINT nAllocType );
@@ -37,6 +40,19 @@
     /* setters */
     virtual SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );
     virtual SQLRETURN setDescRec( SQLSMALLINT nRecNumber, SQLSMALLINT nType, SQLSMALLINT
nSubType, SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER
pDataPtr, SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr );
+
+    /* getters */
+    virtual SQLRETURN getDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength, SQLINTEGER *pnStringLengthPtr );
+    virtual SQLRETURN getDescRec( SQLSMALLINT nRecNumber, SQLWCHAR *psName, SQLSMALLINT
nBufferLength, SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT
*pnSubTypePtr, SQLLEN *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr,
SQLSMALLINT *pnNullablePtr );
+    virtual SQLRETURN getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
+    virtual SQLRETURN getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr );
+
+    /* operators */
+    virtual MDescriptor &operator=( MDescriptor &des );
+
+protected:
+
+    /* setters */
     virtual SQLRETURN setArraySize( SQLUINTEGER nArraySize );
     virtual SQLRETURN setArrayStatusPtr( SQLUSMALLINT *pnArrayStatusPtr );
     virtual SQLRETURN setBindOffsetPtr( SQLINTEGER *pnBindOffsetPtr );
@@ -45,22 +61,15 @@
     virtual SQLRETURN setRowsProcessedPtr( SQLUINTEGER *pnRowsProcessedPtr );
 
     /* getters */
-    virtual SQLRETURN       getDescField( SQLSMALLINT nRecNumber, SQLSMALLINT
nFieldIdentifier, SQLPOINTER pValuePtr, SQLINTEGER nBufferLength, SQLINTEGER
*pnStringLengthPtr );
-    virtual SQLRETURN       getDescRec( SQLSMALLINT nRecNumber, SQLWCHAR *psName,
SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr,
SQLSMALLINT *pnSubTypePtr, SQLLEN *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT
*pnScalePtr, SQLSMALLINT *pnNullablePtr );
-    virtual SQLRETURN       getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT
nDiagIdentifier, SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnStringLengthPtr );
-    virtual SQLRETURN       getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr );
-    virtual SQLSMALLINT     getAllocType();             /*!< SQL_DESC_ALLOC_TYPE      
     */
-    virtual SQLUINTEGER     getArraySize();             /*!< SQL_DESC_ARRAY_SIZE      
     */
-    virtual SQLUSMALLINT *  getArrayStatusPtr();        /*!< SQL_DESC_ARRAY_STATUS_PTR
     */
-    virtual SQLINTEGER *    getBindOffsetPtr();         /*!< SQL_DESC_BIND_OFFSET_PTR 
     */
-    virtual SQLUINTEGER     getBindType();              /*!< SQL_DESC_BIND_TYPE       
     */
-    virtual SQLSMALLINT     getCount();                 /*!< SQL_DESC_COUNT           
     */
-    virtual SQLUINTEGER *   getRowsProcessedPtr();      /*!<
SQL_DESC_ROWS_PROCESSED_PTR    */
+    virtual SQLSMALLINT     getAllocType();
+    virtual SQLUINTEGER     getArraySize();
+    virtual SQLUSMALLINT *  getArrayStatusPtr();
+    virtual SQLINTEGER *    getBindOffsetPtr();
+    virtual SQLUINTEGER     getBindType();
+    virtual SQLSMALLINT     getCount();
+    virtual SQLUINTEGER *   getRowsProcessedPtr();
 
-    /* operators */
-    virtual MDescriptor &operator=( MDescriptor &des );
-
-protected:
+private:
     MDiagnostic *   pDiagnostic;            /*!< our diagnostic information     */
 
     SQLSMALLINT     nAllocType;             /*!< SQL_DESC_ALLOC_TYPE            */

Modified: MYSQLCC/include/MDiagnostic.h
===================================================================
--- MYSQLCC/include/MDiagnostic.h	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/include/MDiagnostic.h	2006-04-26 20:14:23 UTC (rev 128)
@@ -1,10 +1,10 @@
-/*! \file   MYODBCDia.h
+/*! \file   MDiagnostic.h
     \author Peter Harvey <pharvey@stripped>
     \brief  This code is used to support diagnostic information
             associated with various handles.
 
-            This code is for internal use and as such is for MyODBC 
-            developers only. 
+            This code is for internal use and as such is for MySQL C/ODBC 
+            developers. 
             
             0 - n diagnostic records can be associated with the following 
             ODBC handles;
@@ -25,21 +25,11 @@
             SQLGetDiagField - these functions never clear diagnostic information.
 */
 
-#ifndef MYODBC_DIA_H
-#define MYODBC_DIA_H
+#ifndef MDIAGNOSTIC_H
+#define MDIAGNOSTIC_H
 
-#include <MYODBCC.h>
-#include <MYODBCDbg.h>
+#include "MInternal.h"
 
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QTextStream>
-
-#include "MYODBCDiaState.h"
-
-class MYODBCDiaRec;
-
 /*!
     \internal
     \brief  This is the main handle for diagnostic information.
@@ -48,14 +38,27 @@
             diagnostic records. Each; environment, connection, statement
             and descriptor handle has one of these. 
 */
-class MYODBCDia 
+class MDiagnostic : public QObject 
 {
-    friend class MYODBCDiaRec;
-    friend QTextStream &operator<<( QTextStream &stream, const MYODBCDia
&rval );
+    friend class MEnvironment;
+    friend class MConnection;
+    friend class MStatement;
+    friend class MDiagnosticRecord;
+    friend QTextStream &operator<<( QTextStream &stream, const MDiagnostic
&rval );
+
 public:
-    MYODBCDia();
-    ~MYODBCDia();
+    MDiagnostic();
+    ~MDiagnostic();
 
+    /* setters */
+
+    /* getters */
+    SQLRETURN getDiagRec( SQLSMALLINT nRecNumber /* 1-based */, SQLWCHAR *psSqlstate,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr );
+    SQLRETURN getDiagField( SQLSMALLINT nRecNumber /* 1-based */, SQLSMALLINT
nDiagIdentifier, SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnStringLengthPtr );
+
+protected:
+    /* setters */
+
     /* header fields... */
     SQLRETURN setCursorRowCount( SQLINTEGER nCursorRowCount );
     SQLRETURN setDynamicFunctionCode( SQLINTEGER nDynamicFunctionCode );
@@ -67,9 +70,8 @@
     SQLRETURN setConnectionName( const QString &stringConnectionName );
     SQLRETURN setServerName( const QString &stringServerName );
 
-    /* these for direct support for odbc api calls (most relevant odbc rules in these)...
*/
-    SQLRETURN   getDiagRec( SQLSMALLINT nRecNumber /* 1-based */, SQLWCHAR *psSqlstate,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *pszMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr );
-    SQLRETURN   getDiagField( SQLSMALLINT nRecNumber /* 1-based */, SQLSMALLINT
nDiagIdentifier, SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnStringLengthPtr );
+    /* getters */
+
     /* header fields... */
     SQLINTEGER  getCursorRowCount();
     QString     getDynamicFunction();       /*!< String indicating type of SQL
executed (ie "UPDATE WHERE")                   */
@@ -92,12 +94,14 @@
     QString     getConnectionName();
     QString     getServerName();
 
+    /* doers */
+
     SQLRETURN   doAppend( MYODBC_DIA_ID nState, SQLINTEGER nNative = 0, const QString
&stringMessage = QString::null );
     SQLRETURN   doAppend( MYODBC_DIA_ID nState, SQLINTEGER nNative, const QString
&stringMessage, SQLINTEGER nRowNumber, SQLINTEGER nColumnNumber );
     void        doClear();
     SQLRETURN   doDelete( SQLSMALLINT nRecNumber );
 
-protected:
+private:
     SQLINTEGER  nCursorRowCount;        /*!< Count of rows in the cursor.             
                                   */
     SQLINTEGER  nDynamicFunctionCode;   /*!< Code indicating type of SQL executed (ie
SQL_DIAG_UPDATE_WHERE)              */
     SQLRETURN   nReturnCode;            /*!< Return code (as in SQLRETURN) returned by
the function.                      */
@@ -106,8 +110,6 @@
     /* these values are copied by new records */
     QString   stringConnectionName;     /*!< This is dbc->server.                  
                                      */
     QString   stringServerName;         /*!< This is dbc->dsn. Same as
SQL_DATA_SOURCE_NAME in SQLGetInfo().              */
-
-    QList<MYODBCDiaRec*> listRecords;/*!< the records we own                    
                                      */
 };
 
 

Modified: MYSQLCC/include/MEnvironment.h
===================================================================
--- MYSQLCC/include/MEnvironment.h	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/include/MEnvironment.h	2006-04-26 20:14:23 UTC (rev 128)
@@ -1,10 +1,11 @@
-#ifndef M_ENVIRONMENT_H
-#define M_ENVIRONMENT_H
+#ifndef MENVIRONMENT_H
+#define MENVIRONMENT_H
 
 #include "M.h"
 
 class MEnvironment : public QObject
 {
+    friend class MConnection;
 public:
     MEnvironment();
     ~MEnvironment();
@@ -34,12 +35,12 @@
     SQLINTEGER  getOutputNTS();
 
 private:
-    MDiagnostic     diagnostic;         /*!< our diagnostic information             
*/
+    MDiagnostic diagnostic;         /*!< our diagnostic information              */
 
-    SQLUINTEGER     nConnectionPooling; /*!< SQL_ATTR_CONNECTION_POOLING (DM)       
*/
-    SQLUINTEGER     nCPMatch;           /*!< SQL_ATTR_CP_MATCH (DM)                 
*/
-    SQLINTEGER      nODBCVersion;       /*!< SQL_ATTR_ODBC_VERSION                  
*/
-    SQLINTEGER      bOutputNTS;         /*!< SQL_ATTR_OUTPUT_NTS                    
*/
+    SQLUINTEGER nConnectionPooling; /*!< SQL_ATTR_CONNECTION_POOLING (DM)        */
+    SQLUINTEGER nCPMatch;           /*!< SQL_ATTR_CP_MATCH (DM)                  */
+    SQLINTEGER  nODBCVersion;       /*!< SQL_ATTR_ODBC_VERSION                   */
+    SQLINTEGER  bOutputNTS;         /*!< SQL_ATTR_OUTPUT_NTS                     */
 };
 
 #endif

Modified: MYSQLCC/include/MStatement.h
===================================================================
--- MYSQLCC/include/MStatement.h	2006-04-26 19:29:51 UTC (rev 127)
+++ MYSQLCC/include/MStatement.h	2006-04-26 20:14:23 UTC (rev 128)
@@ -1,10 +1,11 @@
-#ifndef M_STATEMENT_H
-#define M_STATEMENT_H
+#ifndef MSTATEMENT_H
+#define MSTATEMENT_H
 
 #include "M.h"
 
 class MStatement : public QObject
 {
+    friend class MDescriptor;
 public:
     MStatement( MConnection *pConnection );
     ~MStatement();
@@ -13,6 +14,51 @@
     SQLRETURN setCursorName( SQLWCHAR *psCursorName, SQLSMALLINT nNameLength );
     SQLRETURN setPos( SQLUSMALLINT nRowNumber, SQLUSMALLINT nOperation, SQLUSMALLINT
nLockType );
     SQLRETURN setStmtAttr( SQLINTEGER nAttribute, SQLPOINTER pValue, SQLINTEGER
nStringLength );
+
+    /* getters */
+    SQLRETURN getCursorName( SQLWCHAR *psCursorName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnNameLengthPtr );
+    SQLRETURN getData( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType, SQLPOINTER
pTargetValuePtr, SQLINTEGER nBufferLength, SQLINTEGER *pnStrLenOrIndPtr );
+    SQLRETURN getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
+    SQLRETURN getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnTextLengthPtr );
+    SQLRETURN getStmtAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStringLengthPtr );
+    SQLRETURN getTypeInfo( SQLSMALLINT nDataType );
+
+    /* doers */
+    SQLRETURN doBindCol( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType, SQLPOINTER
pTargetValuePtr, SQLINTEGER nBufferLength, SQLLEN *pnStrLenOrInd );
+    SQLRETURN doBindParameter( SQLUSMALLINT nParameterNumber, SQLSMALLINT
nInputOutputType, SQLSMALLINT nValueType, SQLSMALLINT nParameterType, SQLUINTEGER
nColumnSize, SQLSMALLINT nDecimalDigits, SQLPOINTER pParameterValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStrLenOrIndPtr );
+    SQLRETURN doBulkOperations( SQLSMALLINT nOperation );
+    SQLRETURN doCancel();
+    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 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 );
+    SQLRETURN doExecute();
+    SQLRETURN doExtendedFetch( SQLUSMALLINT nFetchOrientation, SQLINTEGER nFetchOffset,
SQLUINTEGER *pnRowCountPtr, SQLUSMALLINT *pnRowStatusArray );
+    SQLRETURN doFetch();
+    SQLRETURN doFetchScroll( SQLSMALLINT nFetchOrientation, SQLINTEGER nFetchOffset );
+    SQLRETURN doForeignKeys( SQLWCHAR *psPKCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psPKSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psPKTableName, SQLSMALLINT
nNameLength3, SQLWCHAR *psFKCatalogName, SQLSMALLINT nNameLength4, SQLWCHAR
*psFKSchemaName, SQLSMALLINT nNameLength5, SQLWCHAR *psFKTableName, SQLSMALLINT
nNameLength6 );
+    SQLRETURN doFreeStmt( SQLUSMALLINT nOption );
+    SQLRETURN doMoreResults();
+    SQLRETURN doNumParams( SQLSMALLINT *pnParameterCountPtr );
+    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 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 );
+    SQLRETURN doRowCount( SQLINTEGER *pnRowCountPtr );
+    SQLRETURN doSpecialColumns( SQLSMALLINT nIdentifierType, SQLWCHAR *psCatalogName,
SQLSMALLINT nNameLength1, SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR
*psTableName, SQLSMALLINT nNameLength3, SQLSMALLINT nScope, SQLSMALLINT nNullable );
+    SQLRETURN doStatistics( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3,
SQLUSMALLINT nUnique, SQLUSMALLINT nReserved );
+    SQLRETURN doTablePrivileges( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT
nNameLength3 );
+    SQLRETURN doTables( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3,
SQLWCHAR *psTableType, SQLSMALLINT nNameLength4 );
+
+protected:
+
+    /* setters */
     SQLRETURN setAppParamDesc( MYODBCDes *pdes );                           /*!<
SQL_ATTR_APP_PARAM_DESC                                            */
     SQLRETURN setAppRowDesc( MYODBCDes *pdes );                             /*!<
SQL_ATTR_APP_ROW_DESC                                              */       
     SQLRETURN setAsyncEnable( SQLUINTEGER nAsyncEnable );                   /*!<
SQL_ATTR_ASYNC_ENABLE                                              */
@@ -46,12 +92,6 @@
     SQLRETURN setUseBookmarks( SQLUINTEGER nUseBookmarks );                 /*!<
SQL_ATTR_USE_BOOKMARKS                                             */
 
     /* getters */
-    SQLRETURN       getCursorName( SQLWCHAR *psCursorName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnNameLengthPtr );
-    SQLRETURN       getData( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType,
SQLPOINTER pTargetValuePtr, SQLINTEGER nBufferLength, SQLINTEGER *pnStrLenOrIndPtr );
-    SQLRETURN       getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
-    SQLRETURN       getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnTextLengthPtr );
-    SQLRETURN       getStmtAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStringLengthPtr );
-    SQLRETURN       getTypeInfo( SQLSMALLINT nDataType );
     MDescriptor*    getAppParamDescOrig();          /*!< Original app param desc.     
                                     */ 
     MDescriptor*    getAppRowDescOrig();            /*!< Original app row desc.       
                                     */ 
     MDescriptor*    getAppParamDesc();              /*!< SQL_ATTR_APP_PARAM_DESC      
                                     */
@@ -88,41 +128,8 @@
     SQLUINTEGER     getSimulateCursor();            /*!< SQL_ATTR_SIMULATE_CURSOR     
                                     */
     SQLUINTEGER     getUseBookmarks();              /*!< SQL_ATTR_USE_BOOKMARKS       
                                     */
 
-    /* doers */
-    SQLRETURN doBindCol( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType, SQLPOINTER
pTargetValuePtr, SQLINTEGER nBufferLength, SQLLEN *pnStrLenOrInd );
-    SQLRETURN doBindParameter( SQLUSMALLINT nParameterNumber, SQLSMALLINT
nInputOutputType, SQLSMALLINT nValueType, SQLSMALLINT nParameterType, SQLUINTEGER
nColumnSize, SQLSMALLINT nDecimalDigits, SQLPOINTER pParameterValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStrLenOrIndPtr );
-    SQLRETURN doBulkOperations( SQLSMALLINT nOperation );
-    SQLRETURN doCancel();
-    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 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 );
-    SQLRETURN doExecute();
-    SQLRETURN doExtendedFetch( SQLUSMALLINT nFetchOrientation, SQLINTEGER nFetchOffset,
SQLUINTEGER *pnRowCountPtr, SQLUSMALLINT *pnRowStatusArray );
-    SQLRETURN doFetch();
-    SQLRETURN doFetchScroll( SQLSMALLINT nFetchOrientation, SQLINTEGER nFetchOffset );
-    SQLRETURN doForeignKeys( SQLWCHAR *psPKCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psPKSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psPKTableName, SQLSMALLINT
nNameLength3, SQLWCHAR *psFKCatalogName, SQLSMALLINT nNameLength4, SQLWCHAR
*psFKSchemaName, SQLSMALLINT nNameLength5, SQLWCHAR *psFKTableName, SQLSMALLINT
nNameLength6 );
-    SQLRETURN doFreeStmt( SQLUSMALLINT nOption );
-    SQLRETURN doMoreResults();
-    SQLRETURN doNumParams( SQLSMALLINT *pnParameterCountPtr );
-    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 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 );
-    SQLRETURN doRowCount( SQLINTEGER *pnRowCountPtr );
-    SQLRETURN doSpecialColumns( SQLSMALLINT nIdentifierType, SQLWCHAR *psCatalogName,
SQLSMALLINT nNameLength1, SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR
*psTableName, SQLSMALLINT nNameLength3, SQLSMALLINT nScope, SQLSMALLINT nNullable );
-    SQLRETURN doStatistics( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3,
SQLUSMALLINT nUnique, SQLUSMALLINT nReserved );
-    SQLRETURN doTablePrivileges( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT
nNameLength3 );
-    SQLRETURN doTables( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3,
SQLWCHAR *psTableType, SQLSMALLINT nNameLength4 );
-
-protected:
-    MDiagnostic *   pDiagnostic;            /*!< Statements diagnostic.               
 */
+private:
+    MDiagnostic     diagnostic;             /*!< Statements diagnostic.               
 */
     MDescriptor *   pAppParamDescOrig;      /*!< Original app param desc.             
 */
     MDescriptor *   pAppRowDescOrig;        /*!< Original app row desc.               
 */
 

Thread
Connector/ODBC 5 commit: r128 - in MYSQLCC: . MYSQLCCLib includepharvey26 Apr