Modified:
MYODBCDbg/include/MYODBCDbg.h
MYODBCDes/MYODBCDesLib/MYODBCDes.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp
MYODBCDes/include/MYODBCDes.h
MYODBCDes/include/MYODBCDesAPD.h
MYODBCDes/include/MYODBCDesARD.h
MYODBCDes/include/MYODBCDesIPD.h
MYODBCDes/include/MYODBCDesIRD.h
Log:
UNICODE:
- descriptors close to clean compile
Modified: MYODBCDbg/include/MYODBCDbg.h
===================================================================
--- MYODBCDbg/include/MYODBCDbg.h 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDbg/include/MYODBCDbg.h 2006-01-06 06:48:42 UTC (rev 30)
@@ -191,7 +191,7 @@
}\
}
-#define MYODBCDbgReturn3(A)\
+#define MYODBCDbgReturn3(A)\
{\
if ( gpMYODBCDbg )\
{\
Modified: MYODBCDes/MYODBCDesLib/MYODBCDes.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDes.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDes.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -502,10 +502,6 @@
SQLRETURN MYODBCDes::getDescRec( SQLSMALLINT nRecNumber, SQLWCHAR *pszName, SQLSMALLINT
nBufferLength, SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT
*pnSubTypePtr, SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT
*pnScalePtr, SQLSMALLINT *pnNullablePtr )
{
- SQLINTEGER nStringLengthPtr;
- SQLRETURN nReturn;
- bool bHasInfo = false;
-
MYODBCDbgEnter();
if ( nRecNumber < 0 )
@@ -610,14 +606,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( pnArrayStatusPtr );
+ MYODBCDbgReturn3( (qlonglong)pnArrayStatusPtr );
}
SQLINTEGER *MYODBCDes::getBindOffsetPtr()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( nBindOffsetPtr );
+ MYODBCDbgReturn3( (qlonglong)pnBindOffsetPtr );
}
SQLUINTEGER MYODBCDes::getBindType()
@@ -638,7 +634,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( pnRowsProcessedPtr );
+ MYODBCDbgReturn3( (qlonglong)pnRowsProcessedPtr );
}
@@ -709,7 +705,7 @@
Q_ASSERT( nRecord < 0 );
Q_ASSERT( nRecord >= listRecords.count() );
- MYODBCDbgReturn3( listRecords[nRecord]->getDataPtr() );
+ MYODBCDbgReturn3( (qlonglong)listRecords[nRecord]->getDataPtr() );
}
SQLSMALLINT MYODBCDes::getDatetimeIntervalCode( SQLSMALLINT nRecord )
@@ -759,7 +755,7 @@
Q_ASSERT( nRecord < 0 );
Q_ASSERT( nRecord >= listRecords.count() );
- MYODBCDbgReturn3( listRecords[nRecord]->getIndicatorPtr() );
+ MYODBCDbgReturn3( (qlonglong)listRecords[nRecord]->getIndicatorPtr() );
}
QString MYODBCDes::getLabel( SQLSMALLINT nRecord )
@@ -859,7 +855,7 @@
Q_ASSERT( nRecord < 0 );
Q_ASSERT( nRecord >= listRecords.count() );
- MYODBCDbgReturn3( listRecords[nRecord]->getOctetLengthPtr() );
+ MYODBCDbgReturn3( (qlonglong)listRecords[nRecord]->getOctetLengthPtr() );
}
SQLSMALLINT MYODBCDes::getParamterType( SQLSMALLINT nRecord )
@@ -986,7 +982,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( hOwner );
+ MYODBCDbgReturn3( (qlonglong)hOwner );
}
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesAPD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -1,6 +1,7 @@
#include "MYODBCDesInternal.h"
MYODBCDesAPD::MYODBCDesAPD( SQLHANDLE hOwner )
+ : MYODBCDes( hOwner )
{
/* add bookmark record at index 0 */
/*
@@ -19,52 +20,6 @@
precord->setDatetimeIntervalCode( 0 );
}
-SQLRETURN MYODBCDesRecAPD::setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType,
SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr,
SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr )
-{
- SQLRETURN nReturn = SQL_SUCCESS;
- bool bHasInfo = false;
-
- MYODBCDbgEnter();
-
- nReturn = MYODBCDesRecType( nType );
- if ( !SQL_SUCCEEDED( nReturn ) )
- MYODBCDbgReturn( nReturn );
-
- /* set SQL_DESC_DATETIME_INTERVAL_CODE as appropriate */
- if ( the_type == SQL_DATETIME || the_type == SQL_INTERVAL )
- {
- nReturn = MYODBCDesRecIntervalCode( pDesRec, the_type);
- if ( !SQL_SUCCEEDED( nReturn ) )
- MYODBCDbgReturn( nReturn );
- }
-
- /* set remainder */
- nReturn = MYODBCDrvSetDescField( pDes, nRecNum, SQL_DESC_OCTET_LENGTH,
(SQLPOINTER)octet_length, SQL_IS_INTEGER );
- if ( !SQL_SUCCEEDED( nReturn ) )
- MYODBCDbgReturn( nReturn );
-
- nReturn = MYODBCDrvSetDescField( pDes, nRecNum, SQL_DESC_PRECISION,
(SQLPOINTER)precision, SQL_IS_SMALLINT );
- if ( !SQL_SUCCEEDED( nReturn ) )
- MYODBCDbgReturn( nReturn );
-
- nReturn = MYODBCDrvSetDescField( pDes, nRecNum, SQL_DESC_SCALE, (SQLPOINTER)scale,
SQL_IS_SMALLINT );
- if ( !SQL_SUCCEEDED( nReturn ) )
- MYODBCDbgReturn( nReturn );
-
- nReturn = MYODBCDrvSetDescField( pDes, nRecNum, SQL_DESC_OCTET_LENGTH_PTR,
(SQLPOINTER)scale, SQL_IS_POINTER );
- if ( !SQL_SUCCEEDED( nReturn ) )
- MYODBCDbgReturn( nReturn );
-
- nReturn = MYODBCDrvSetDescField( pDes, nRecNum, SQL_DESC_INDICATOR_PTR,
indicator_ptr, SQL_IS_POINTER );
- if ( !SQL_SUCCEEDED( nReturn ) )
- MYODBCDbgReturn( nReturn );
-
- /* do last (causes extra validation) */
- nReturn = MYODBCDrvSetDescField( pDes, nRecNum, SQL_DESC_DATA_PTR, (SQLPOINTER)scale,
SQL_IS_POINTER );
-
- MYODBCDbgReturn( nReturn );
-}
-
SQLRETURN MYODBCDesAPD::setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT
nFieldIdentifier, SQLPOINTER pValuePtr, SQLINTEGER nBufferLength )
{
MYODBCDbgEnter();
@@ -114,7 +69,7 @@
IRD: Unused
IPD: Unused
*/
- MYODBCDbgReturn( setBindOffsetPtr( (SQLUINTEGER*)pValuePtr ) );
+ MYODBCDbgReturn( setBindOffsetPtr( (SQLINTEGER*)pValuePtr ) );
case SQL_DESC_BIND_TYPE:
/*!
@@ -162,11 +117,11 @@
} /* switch (for header fields) */
/* record field needs a valid record */
- if ( nRecord < 0 || nRecord >= getCount() )
+ if ( nRecNumber < 0 || nRecNumber >= getCount() )
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
/* handle as record field */
- MYODBCDbgReturn( listRecords[nRecord]->setDescField( nFieldIdentifier, pValuePtr,
nBufferLength ) );
+ MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
}
/*!
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesARD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -1,6 +1,7 @@
#include "MYODBCDesInternal.h"
MYODBCDesARD::MYODBCDesARD( SQLHANDLE hOwner )
+ : MYODBCDes( hOwner )
{
/* add bookmark record at index 0 */
/*
@@ -42,9 +43,6 @@
\internal ODBC Rule
ARD: R
- APD: R
- IRD: R
- IPD: R
*/
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
@@ -53,9 +51,6 @@
\internal ODBC Rule
ARD: R/W
- APD: R/W
- IRD: Unused
- IPD: Unused
*/
MYODBCDbgReturn( setArraySize( (SQLUINTEGER)pValuePtr ) );
@@ -64,9 +59,6 @@
\internal ODBC Rule
ARD: R/W
- APD: R/W
- IRD: R/W
- IPD: R/W
*/
MYODBCDbgReturn( setArrayStatusPtr( (SQLUSMALLINT*)pValuePtr ) );
@@ -75,20 +67,14 @@
\internal ODBC Rule
ARD: R/W
- APD: R/W
- IRD: Unused
- IPD: Unused
*/
- MYODBCDbgReturn( setBindOffsetPtr( (SQLUINTEGER*)pValuePtr ) );
+ MYODBCDbgReturn( setBindOffsetPtr( (SQLINTEGER*)pValuePtr ) );
case SQL_DESC_BIND_TYPE:
/*!
\internal ODBC Rule
ARD: R/W
- APD: R/W
- IRD: Unused
- IPD: Unused
*/
/*
@@ -115,9 +101,6 @@
\internal ODBC Rule
ARD: R/W
- APD: R/W
- IRD: R
- IPD: R/W
*/
/* expand/shrink record list; free, even, bound records as needed */
MYODBCDbgReturn( setCount( (SQLINTEGER)pValuePtr, true ) );
@@ -127,20 +110,17 @@
\internal ODBC Rule
ARD: Unused
- APD: Unused
- IRD: R/W
- IPD: R/W
*/
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
} /* switch (for header fields) */
/* record field needs a valid record */
- if ( nRecord < 0 || nRecord >= getCount() )
+ if ( nRecNumber < 0 || nRecNumber >= getCount() )
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
/* handle as record field */
- MYODBCDbgReturn( listRecords[nRecord]->setDescField( nFieldIdentifier, pValuePtr,
nBufferLength ) );
+ MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
}
/*!
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesIPD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -1,6 +1,7 @@
#include "MYODBCDesInternal.h"
MYODBCDesIPD::MYODBCDesIPD( SQLHANDLE hOwner )
+ : MYODBCDes( hOwner )
{
/* add bookmark record at index 0 */
/*
@@ -118,11 +119,11 @@
} /* switch (for header fields) */
/* record field needs a valid record */
- if ( nRecord < 0 || nRecord >= getCount() )
+ if ( nRecNumber < 0 || nRecNumber >= getCount() )
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
/* handle as record field */
- MYODBCDbgReturn( listRecords[nRecord]->setDescField( nFieldIdentifier, pValuePtr,
nBufferLength ) );
+ MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
}
/*!
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesIRD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -1,6 +1,7 @@
#include "MYODBCDesInternal.h"
MYODBCDesIRD::MYODBCDesIRD( SQLHANDLE hOwner )
+ : MYODBCDes( hOwner )
{
/* add bookmark record at index 0 */
/*
@@ -41,21 +42,13 @@
/*!
\internal ODBC Rule
- ARD: R
- APD: R
IRD: R
- IPD: R
*/
- MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
-
case SQL_DESC_ARRAY_SIZE:
/*!
\internal ODBC Rule
- ARD: R/W
- APD: R/W
IRD: Unused
- IPD: Unused
*/
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
@@ -63,10 +56,7 @@
/*!
\internal ODBC Rule
- ARD: R/W
- APD: R/W
IRD: R/W
- IPD: R/W
*/
MYODBCDbgReturn( setArrayStatusPtr( (SQLUSMALLINT*)pValuePtr ) );
@@ -74,32 +64,19 @@
/*!
\internal ODBC Rule
- ARD: R/W
- APD: R/W
IRD: Unused
- IPD: Unused
*/
- MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
-
case SQL_DESC_BIND_TYPE:
/*!
\internal ODBC Rule
- ARD: R/W
- APD: R/W
IRD: Unused
- IPD: Unused
*/
- MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
-
case SQL_DESC_COUNT:
/*!
\internal ODBC Rule
- ARD: R/W
- APD: R/W
IRD: R
- IPD: R/W
*/
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_HY091, 0, NULL ) );
@@ -107,20 +84,17 @@
/*!
\internal ODBC Rule
- ARD: Unused
- APD: Unused
IRD: R/W
- IPD: R/W
*/
MYODBCDbgReturn( setRowsProcessedPtr( (SQLUINTEGER*)pValuePtr ) );
} /* switch (for header fields) */
/* record field needs a valid record */
- if ( nRecord < 0 || nRecord >= getCount() )
+ if ( nRecNumber < 0 || nRecNumber >= getCount() )
MYODBCDbgReturn( dia.doAppend( MYODBC_DIA_07009, 0, NULL ) );
/* handle as record field */
- MYODBCDbgReturn( listRecords[nRecord]->setDescField( nFieldIdentifier, pValuePtr,
nBufferLength ) );
+ MYODBCDbgReturn( listRecords[nRecNumber]->setDescField( nFieldIdentifier,
pValuePtr, nBufferLength ) );
}
/*!
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -48,6 +48,97 @@
SQLRETURN MYODBCDesRec::setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType, SQLINTEGER
nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr, SQLINTEGER
*pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr )
{
+ bool bHasInfo = false;
+ SQLRETURN nReturn = SQL_SUCCESS;
+
+ MYODBCDbgEnter();
+
+ /*! \internal ODBC Rule
+
+ When setting descriptor fields by calling SQLSetDescField, the
+ application must follow a specific sequence:
+
+ 1. The application must first set the SQL_DESC_TYPE,
+ SQL_DESC_CONCISE_TYPE, or SQL_DESC_DATETIME_INTERVAL_CODE field.
+ 2. After one of these fields has been set, the application can set an
+ attribute of a data type, and the driver sets data type attribute
+ fields to the appropriate default values for the data type. Automatic
+ defaulting of type attribute fields ensures that the descriptor is
+ always ready to use once the application has specified a data type.
+ If the application explicitly sets a data type attribute, it is
+ overriding the default attribute.
+ 3. After one of the fields listed in step 1 has been set, and data type
+ attributes have been set, the application can set SQL_DESC_DATA_PTR.
+ This prompts a consistency check of descriptor fields. If the
+ application changes the data type or attributes after setting the
+ SQL_DESC_DATA_PTR field, the driver sets SQL_DESC_DATA_PTR to a null
+ pointer, unbinding the pDesRec. This forces the application to complete
+ the proper steps in sequence, before the descriptor pDesRec is usable.
+
+ */
+
+ nReturn = setDescField( SQL_DESC_TYPE, (SQLPOINTER)nType, SQL_IS_SMALLINT );
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+
+ /*! \internal ODBC Rule
+
+ For records whose type is SQL_DATETIME or SQL_INTERVAL, nSubType is the value
+ to which to set the SQL_DESC_DATETIME_INTERVAL_CODE field.
+ */
+ if ( nType == SQL_DATETIME || nType == SQL_INTERVAL )
+ {
+ nReturn = setDescField( SQL_DESC_DATETIME_INTERVAL_CODE, (SQLPOINTER)nSubType,
SQL_IS_SMALLINT );
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+ }
+
+ nReturn = setDescField( SQL_DESC_OCTET_LENGTH, (SQLPOINTER)nLength, SQL_IS_INTEGER );
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+
+ nReturn = setDescField( SQL_DESC_PRECISION, (SQLPOINTER)nPrecision, SQL_IS_SMALLINT
);
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+
+ nReturn = setDescField( SQL_DESC_SCALE, (SQLPOINTER)nScale, SQL_IS_SMALLINT );
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+
+ nReturn = setDescField( SQL_DESC_OCTET_LENGTH_PTR, (SQLPOINTER)pnStringLengthPtr,
SQL_IS_POINTER );
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+
+ nReturn = setDescField( SQL_DESC_INDICATOR_PTR, (SQLPOINTER)pnIndicatorPtr,
SQL_IS_POINTER );
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+
+ /* do last (causes extra validation) */
+ nReturn = setDescField( SQL_DESC_DATA_PTR, pDataPtr, SQL_IS_POINTER );
+ if ( nReturn == SQL_SUCCESS_WITH_INFO )
+ bHasInfo = true;
+ if ( !SQL_SUCCEEDED( nReturn ) )
+ MYODBCDbgReturn( nReturn );
+
+ /* fini */
+ if ( bHasInfo )
+ MYODBCDbgReturn( SQL_SUCCESS_WITH_INFO );
+
+ MYODBCDbgReturn( nReturn );
}
SQLRETURN MYODBCDesRec::setAutoUniqueValue( SQLINTEGER nAutoUniqueValue )
@@ -514,7 +605,7 @@
break;
case SQL_DESC_LENGTH:
- *pUnsignedInt = getLength();
+ *(SQLUINTEGER*)pValuePtr = getLength();
break;
case SQL_DESC_LITERAL_PREFIX:
@@ -667,7 +758,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( pDataPtr );
+ MYODBCDbgReturn3( (qlonglong)pDataPtr );
}
SQLSMALLINT MYODBCDesRec::getDatetimeIntervalCode()
@@ -702,7 +793,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( pnIndicatorPtr );
+ MYODBCDbgReturn3( (qlonglong)pnIndicatorPtr );
}
QString MYODBCDesRec::getLabel()
@@ -772,7 +863,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( pnOctetLengthPtr );
+ MYODBCDbgReturn3( (qlonglong)pnOctetLengthPtr );
}
SQLSMALLINT MYODBCDesRec::getParamterType()
@@ -904,7 +995,7 @@
MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
}
-SQLRETURN MYODBCDesRec::setTypeC( SQLSMALLINT nType );
+SQLRETURN MYODBCDesRec::setTypeC( SQLSMALLINT nType )
{
MYODBCDbgEnter();
@@ -1017,7 +1108,7 @@
from each other by 100. This is likely true for unixODBC and XP but
I am not sure about other SDKs. So I do not rely on this.
*/
- switch ( pDesRec->desc_datetime_interval_code )
+ switch ( getDatetimeIntervalCode() )
{
case SQL_CODE_DATE:
setType( nType );
@@ -1055,7 +1146,7 @@
from each other by 100. This is likely true for unixODBC and XP but
I am not sure about other SDKs. So I do not rely on this.
*/
- switch ( pDesRec->desc_datetime_interval_code )
+ switch ( getDatetimeIntervalCode() )
{
case SQL_CODE_MONTH:
setType( nType );
@@ -1117,7 +1208,7 @@
MYODBCDbgReturn( pdes->dia.doAppend( MYODBC_DIA_HY092, 0, NULL ) );
}
-SQLRETURN MYODBCDesRec::setTypeSQL( SQLSMALLINT nType );
+SQLRETURN MYODBCDesRec::setTypeSQL( SQLSMALLINT nType )
{
/*
\internal ODBC Rule
@@ -1228,7 +1319,7 @@
from each other by 100. This is likely true for unixODBC and XP but
I am not sure about other SDKs. So I do not rely on this.
*/
- switch ( pDesRec->desc_datetime_interval_code )
+ switch ( getDatetimeIntervalCode() )
{
case SQL_CODE_DATE:
setType( nType );
@@ -1266,7 +1357,7 @@
from each other by 100. This is likely true for unixODBC and XP but
I am not sure about other SDKs. So I do not rely on this.
*/
- switch ( pDesRec->desc_datetime_interval_code )
+ switch ( getDatetimeIntervalCode() )
{
case SQL_CODE_MONTH:
setType( nType );
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecAPD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -12,7 +12,7 @@
\sa zzzzz
*/
MYODBCDesRecAPD::MYODBCDesRecAPD( MYODBCDesAPD *pdes )
- : MYODBCResRec( pdes )
+ : MYODBCDesRec( pdes )
{
MYODBCDbgEnter();
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -12,7 +12,7 @@
\sa zzzzz
*/
MYODBCDesRecARD::MYODBCDesRecARD( MYODBCDesARD *pdes )
- : MYODBCResRec( pdes )
+ : MYODBCDesRec( pdes )
{
MYODBCDbgEnter();
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -12,7 +12,7 @@
\sa zzzzz
*/
MYODBCDesRecIPD::MYODBCDesRecIPD( MYODBCDesIPD *pdes )
- : MYODBCResRec( pdes )
+ : MYODBCDesRec( pdes )
{
MYODBCDbgEnter();
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp 2006-01-06 06:48:42 UTC (rev 30)
@@ -12,7 +12,7 @@
\sa zzzzz
*/
MYODBCDesRecIRD::MYODBCDesRecIRD( MYODBCDesIRD *pdes )
- : MYODBCResRec( pdes )
+ : MYODBCDesRec( pdes )
{
MYODBCDbgEnter();
Modified: MYODBCDes/include/MYODBCDes.h
===================================================================
--- MYODBCDes/include/MYODBCDes.h 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/include/MYODBCDes.h 2006-01-06 06:48:42 UTC (rev 30)
@@ -57,7 +57,7 @@
#include <QStringList>
#include <QTextStream>
-class MYODBCResRec;
+class MYODBCDesRec;
/*!
\brief This is the top-level descriptor struct. It represents a;
@@ -72,7 +72,7 @@
*/
class MYODBCDes
{
- friend class MYODBCResRec;
+ friend class MYODBCDesRec;
public:
MYODBCDes( SQLHANDLE hOwner );
~MYODBCDes();
@@ -192,7 +192,7 @@
SQLUINTEGER nBindType;
SQLUINTEGER * pnRowsProcessedPtr;
- QList<MYODBCResRec*> listRecords; /*!< An array of MYODBC_DES_REC.
We should always
+ QList<MYODBCDesRec*> listRecords; /*!< An array of MYODBC_DES_REC.
We should always
have record at index 0. Index 0 is
used for
bookmarks when an ARD desc.
*/
};
Modified: MYODBCDes/include/MYODBCDesAPD.h
===================================================================
--- MYODBCDes/include/MYODBCDesAPD.h 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/include/MYODBCDesAPD.h 2006-01-06 06:48:42 UTC (rev 30)
@@ -15,7 +15,7 @@
*/
class MYODBCDesAPD : public MYODBCDes
{
- friend class MYODBCResRecAPD;
+ friend class MYODBCDesRecAPD;
public:
MYODBCDesAPD( SQLHANDLE hOwner );
Modified: MYODBCDes/include/MYODBCDesARD.h
===================================================================
--- MYODBCDes/include/MYODBCDesARD.h 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/include/MYODBCDesARD.h 2006-01-06 06:48:42 UTC (rev 30)
@@ -15,7 +15,7 @@
*/
class MYODBCDesARD : public MYODBCDes
{
- friend class MYODBCResRecARD;
+ friend class MYODBCDesRecARD;
public:
MYODBCDesARD( SQLHANDLE hOwner );
Modified: MYODBCDes/include/MYODBCDesIPD.h
===================================================================
--- MYODBCDes/include/MYODBCDesIPD.h 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/include/MYODBCDesIPD.h 2006-01-06 06:48:42 UTC (rev 30)
@@ -15,7 +15,7 @@
*/
class MYODBCDesIPD : public MYODBCDes
{
- friend class MYODBCResRecIPD;
+ friend class MYODBCDesRecIPD;
public:
MYODBCDesIPD( SQLHANDLE hOwner );
Modified: MYODBCDes/include/MYODBCDesIRD.h
===================================================================
--- MYODBCDes/include/MYODBCDesIRD.h 2006-01-05 05:07:04 UTC (rev 29)
+++ MYODBCDes/include/MYODBCDesIRD.h 2006-01-06 06:48:42 UTC (rev 30)
@@ -15,7 +15,7 @@
*/
class MYODBCDesIRD : public MYODBCDes
{
- friend class MYODBCResRecIRD;
+ friend class MYODBCDesRecIRD;
public:
MYODBCDesIRD( SQLHANDLE hOwner );
| Thread |
|---|
| • Connector/ODBC 5 commit: r30 - MYODBCDbg/include MYODBCDes/MYODBCDesLib MYODBCDes/include | pharvey | 6 Jan |
