Modified:
trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MResult.h
Log:
- more work on bound parameters
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-06-13 18:00:59 UTC (rev 328)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-06-13 18:21:04 UTC (rev 329)
@@ -2447,59 +2447,57 @@
{
MYODBCDbgEnter();
- switch ( pResultPutData->pDescriptorRecordIPD->getConciseType() )
+ switch ( pResultPutData->pDescriptorRecordAPD->getConciseType() )
{
- case SQL_CHAR:
- case SQL_VARCHAR:
- case SQL_LONGVARCHAR:
- MYODBCDbgReturn( fromCharC( pResultPutData ) );
- case SQL_WCHAR:
- case SQL_WVARCHAR:
- case SQL_WLONGVARCHAR:
- MYODBCDbgReturn( fromWCharC( pResultPutData ) );
- case SQL_DECIMAL:
- case SQL_NUMERIC:
+ case SQL_C_CHAR:
+ case SQL_C_WCHAR:
+ MYODBCDbgReturn( fromCharacterC( pResultPutData ) );
+ case SQL_C_STINYINT:
+ case SQL_C_UTINYINT:
+ case SQL_C_TINYINT:
+ case SQL_C_SSHORT:
+ case SQL_C_USHORT:
+ case SQL_C_SHORT:
+ case SQL_C_SLONG:
+ case SQL_C_ULONG:
+ case SQL_C_LONG:
+ case SQL_C_FLOAT:
+ case SQL_C_DOUBLE:
+ case SQL_C_SBIGINT:
+ case SQL_C_UBIGINT:
+ case SQL_C_NUMERIC:
MYODBCDbgReturn( fromNumericC( pResultPutData ) );
- case SQL_SMALLINT:
- case SQL_INTEGER:
-
- case SQL_REAL:
-
- case SQL_FLOAT:
- MYODBCDbgReturn( fromFloatC( pResultPutData ) );
- case SQL_DOUBLE:
- MYODBCDbgReturn( fromDoubleC( pResultPutData ) );
- case SQL_BIT:
+ case SQL_C_BIT:
MYODBCDbgReturn( fromBitC( pResultPutData ) );
- case SQL_TINYINT:
- case SQL_BIGINT:
-
- case SQL_BINARY:
- case SQL_VARBINARY:
- case SQL_LONGVARBINARY:
-
- case SQL_TYPE_DATE:
- case SQL_TYPE_TIME:
- case SQL_TYPE_TIMESTAMP:
- case SQL_INTERVAL_MONTH:
- case SQL_INTERVAL_YEAR:
- case SQL_INTERVAL_YEAR_TO_MONTH:
- case SQL_INTERVAL_DAY:
- case SQL_INTERVAL_HOUR:
- case SQL_INTERVAL_MINUTE:
- case SQL_INTERVAL_SECOND:
- case SQL_INTERVAL_DAY_TO_HOUR:
- case SQL_INTERVAL_DAY_TO_MINUTE:
- case SQL_INTERVAL_DAY_TO_SECOND:
- case SQL_INTERVAL_HOUR_TO_MINUTE:
- case SQL_INTERVAL_HOUR_TO_SECOND:
- case SQL_INTERVAL_MINUTE_TO_SECOND:
-
- case SQL_GUID:
-
+ case SQL_C_BINARY:
+ MYODBCDbgReturn( fromBinaryC( pResultPutData ) );
+ case SQL_C_TYPE_DATE:
+ MYODBCDbgReturn( fromDateC( pResultPutData ) );
+ case SQL_C_GUID:
+ MYODBCDbgReturn( fromGuidC( pResultPutData ) );
+ case SQL_C_TYPE_TIME:
+ MYODBCDbgReturn( fromTimeC( pResultPutData ) );
+ case SQL_C_TYPE_TIMESTAMP:
+ MYODBCDbgReturn( fromTimestampC( pResultPutData ) );
+ case SQL_C_INTERVAL_MONTH:
+ case SQL_C_INTERVAL_YEAR:
+ case SQL_C_INTERVAL_YEAR_TO_MONTH:
+ MYODBCDbgReturn( fromIntervalYearMonthC( pResultPutData ) );
+ case SQL_C_INTERVAL_DAY:
+ case SQL_C_INTERVAL_HOUR:
+ case SQL_C_INTERVAL_MINUTE:
+ case SQL_C_INTERVAL_SECOND:
+ case SQL_C_INTERVAL_DAY_TO_HOUR:
+ case SQL_C_INTERVAL_DAY_TO_MINUTE:
+ case SQL_C_INTERVAL_DAY_TO_SECOND:
+ case SQL_C_INTERVAL_HOUR_TO_MINUTE:
+ case SQL_C_INTERVAL_HOUR_TO_SECOND:
+ case SQL_C_INTERVAL_MINUTE_TO_SECOND:
+ MYODBCDbgReturn( fromIntervalDayTimeC( pResultPutData ) );
+ /* case SQL_C_DEFAULT: this should have been translated to actual type based upon
odbc rules before getting here */
}
- MYODBCDbgReturn( SQL_ERROR );
+ MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, tr("unknown
C data type") ) );
}
SQLRETURN MResult::fromCharacterC( MResultPutData *pResultPutData )
@@ -2833,213 +2831,6 @@
}
-++++++++++
-SQLRETURN MResult::fromCharC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-
-SQLRETURN MResult::fromWCharC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromSShortC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromUShortC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromSLongC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromULongC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromFloatC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromDoubleC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromBitC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromSTinyIntC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromUTinyIntC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromSBigIntC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromUBigIntC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromBinaryC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromXmlC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromVarBookmarkC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromTypeDateC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromTypeTimeC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromTypeTimestampC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromNumericC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromGuidC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalMonthC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalYearC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalYearToMonthC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalDayC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalHourC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalMinuteC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalSecondC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalDayToHourC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalDayToMinuteC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalDayToSecondC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalHourToMinuteC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalHourToSecondC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-SQLRETURN MResult::fromIntervalMinuteToSecondC( MResultPutData *pResultPutData )
-{
- MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
-}
-
-
/*!
\brief Appends an IRD record describing the given field.
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.h
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.h 2006-06-13 18:00:59 UTC (rev 328)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.h 2006-06-13 18:21:04 UTC (rev 329)
@@ -260,7 +260,6 @@
"Converting Data from C to SQL Data Types"
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcconverting_data_from_c_to_sql_data_types.asp
*/
/*@{*/
-
SQLRETURN fromC( MResultPutData *pResultPutData );
SQLRETURN fromCharacterC( MResultPutData *pResultPutData );
SQLRETURN fromNumericC( MResultPutData *pResultPutData );
@@ -272,41 +271,6 @@
SQLRETURN fromTimeStampC( MResultPutData *pResultPutData );
SQLRETURN fromIntervalYearMonthC( MResultPutData *pResultPutData );
SQLRETURN fromIntervalDayTimeC( MResultPutData *pResultPutData );
-+++++++++
- SQLRETURN fromCharC( MResultPutData *pResultPutData );
/*!< SQL_C_CHAR SQLCHAR * unsigned char * */
- SQLRETURN fromWCharC( MResultPutData *pResultPutData );
/*!< SQL_C_WCHAR SQLWCHAR * wchar_t * */
- SQLRETURN fromSShortC( MResultPutData *pResultPutData );
/*!< SQL_C_SSHORT SQLSMALLINT short int */
- SQLRETURN fromUShortC( MResultPutData *pResultPutData );
/*!< SQL_C_USHORT SQLUSMALLINT unsigned short int */
- SQLRETURN fromSLongC( MResultPutData *pResultPutData );
/*!< SQL_C_SLONG SQLINTEGER long int */
- SQLRETURN fromULongC( MResultPutData *pResultPutData );
/*!< SQL_C_ULONG SQLUINTEGER unsigned long int */
- SQLRETURN fromFloatC( MResultPutData *pResultPutData );
/*!< SQL_C_FLOAT SQLREAL float */
- SQLRETURN fromDoubleC( MResultPutData *pResultPutData );
/*!< SQL_C_DOUBLE SQLDOUBLE,SQLFLOAT double */
- SQLRETURN fromBitC( MResultPutData *pResultPutData );
/*!< SQL_C_BIT SQLCHAR unsigned char */
- SQLRETURN fromSTinyIntC( MResultPutData *pResultPutData );
/*!< SQL_C_STINYINT SQLSCHAR signed char */
- SQLRETURN fromUTinyIntC( MResultPutData *pResultPutData );
/*!< SQL_C_UTINYINT SQLCHAR unsigned char */
- SQLRETURN fromSBigIntC( MResultPutData *pResultPutData );
/*!< SQL_C_SBIGINT SQLBIGINT _int64 */
- SQLRETURN fromUBigIntC( MResultPutData *pResultPutData );
/*!< SQL_C_UBIGINT SQLUBIGINT unsigned _int64 */
- SQLRETURN fromBinaryC( MResultPutData *pResultPutData );
/*!< SQL_C_BINARY SQLCHAR * unsigned char * */
- SQLRETURN fromXmlC( MResultPutData *pResultPutData );
/*!< SQL_C_XML SQLCHAR * unsigned char * */
- SQLRETURN fromVarBookmarkC( MResultPutData *pResultPutData );
/*!< SQL_C_VARBOOKMARK SQLCHAR * unsigned char * */
- SQLRETURN fromTypeDateC( MResultPutData *pResultPutData );
/*!< SQL_C_TYPE_DATE SQL_DATE_STRUCT DATE_STRUCT */
- SQLRETURN fromTypeTimeC( MResultPutData *pResultPutData );
/*!< SQL_C_TYPE_TIME SQL_TIME_STRUCT TIME_STRUCT */
- SQLRETURN fromTypeTimestampC( MResultPutData *pResultPutData );
/*!< SQL_C_TYPE_TIMESTAMP SQL_TIMESTAMP_STRUCT TIMESTAMP_STRUCT */
- SQLRETURN fromNumericC( MResultPutData *pResultPutData );
/*!< SQL_C_NUMERIC SQL_NUMERIC_STRUCT SQL_NUMERIC_STRUCT */
- SQLRETURN fromGuidC( MResultPutData *pResultPutData );
/*!< SQL_C_GUID SQLGUID SQLGUID */
- SQLRETURN fromIntervalMonthC( MResultPutData *pResultPutData );
/*!< interval type SQL_INTERVAL_STRUCT SQL_INTERVAL_STRUCT */
- SQLRETURN fromIntervalYearC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalYearToMonthC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalDayC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalHourC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalMinuteC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalSecondC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalDayToHourC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalDayToMinuteC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalDayToSecondC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalHourToMinuteC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalHourToSecondC( MResultPutData *pResultPutData );
- SQLRETURN fromIntervalMinuteToSecondC( MResultPutData *pResultPutData );
/*@}*/
/* doers */
| Thread |
|---|
| • Connector/ODBC 5 commit: r329 - trunk/MYSQLPlus/MYSQLPlusLib | pharvey | 13 Jun |
