MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:pharvey Date:June 7 2006 5:44am
Subject:Connector/ODBC 5 commit: r322 - trunk/MYSQLPlus/MYSQLPlusLib
View as plain text  
Modified:
   trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
   trunk/MYSQLPlus/MYSQLPlusLib/MResult.h
Log:
more work on data conversion

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-06-06 23:00:15 UTC (rev 321)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-06-07 05:44:48 UTC (rev 322)
@@ -747,7 +747,7 @@
 
     \sa         "SQL to C: Character"
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcconverting_data_from_sql_to_c_data_types.asp
 */
-SQLRETURN MResult::fromCharacterSQL()
+SQLRETURN MResult::fromCharacterSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -756,58 +756,80 @@
 
         The following table shows the ODBC C data types to which character SQL data may
be converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
+            MYODBCDbgReturn( toCharC( pResultGetData ) );
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
+            MYODBCDbgReturn( toWCharC( pResultGetData ) );
         case SQL_C_STINYINT:
+            MYODBCDbgReturn( toSTinyIntC( pResultGetData ) );
         case SQL_C_UTINYINT:
+            MYODBCDbgReturn( toUTinyIntC( pResultGetData ) );
         case SQL_C_TINYINT:
+            MYODBCDbgReturn( toTinyIntC( pResultGetData ) );
         case SQL_C_SBIGINT:
+            MYODBCDbgReturn( toSBigIntC( pResultGetData ) );
         case SQL_C_UBIGINT:
+            MYODBCDbgReturn( toUBigIntC( pResultGetData ) );
+        case SQL_C_SHORT:
         case SQL_C_SSHORT:
+            MYODBCDbgReturn( toSShortC( pResultGetData ) );
         case SQL_C_USHORT:
-        case SQL_C_SHORT:
+            MYODBCDbgReturn( toUShortC( pResultGetData ) );
+        case SQL_C_LONG:
         case SQL_C_SLONG:
+            MYODBCDbgReturn( toSLongC( pResultGetData ) );
         case SQL_C_ULONG:
-        case SQL_C_LONG:
+            MYODBCDbgReturn( toULongC( pResultGetData ) );
         case SQL_C_NUMERIC:
+            MYODBCDbgReturn( toNumericC( pResultGetData ) );
         case SQL_C_FLOAT:
+            MYODBCDbgReturn( toFloatC( pResultGetData ) );
         case SQL_C_DOUBLE:
-
+            MYODBCDbgReturn( toDoubleC( pResultGetData ) );
         case SQL_C_BIT:
-            MYODBCDbgReturn( toCharC() );
-
+            MYODBCDbgReturn( toBitC( pResultGetData ) );
         case SQL_C_BINARY:
+            MYODBCDbgReturn( toBinaryC( pResultGetData ) );
         case SQL_C_TYPE_DATE:
+            MYODBCDbgReturn( toTypeDateC( pResultGetData ) );
         case SQL_C_TYPE_TIME:
+            MYODBCDbgReturn( toTypeTimeC( pResultGetData ) );
         case SQL_C_TYPE_TIMESTAMP:
+            MYODBCDbgReturn( toTypeTimestampC( pResultGetData ) );
         case SQL_C_INTERVAL_MONTH:
+            MYODBCDbgReturn( toIntervalMonthC( pResultGetData ) );
         case SQL_C_INTERVAL_YEAR:
+            MYODBCDbgReturn( toIntervalYearC( pResultGetData ) );
         case SQL_C_INTERVAL_YEAR_TO_MONTH:
+            MYODBCDbgReturn( toIntervalYearToMonthC( pResultGetData ) );
         case SQL_C_INTERVAL_DAY:
+            MYODBCDbgReturn( toIntervalDayC( pResultGetData ) );
         case SQL_C_INTERVAL_HOUR:
+            MYODBCDbgReturn( toIntervalHourC( pResultGetData ) );
         case SQL_C_INTERVAL_MINUTE:
+            MYODBCDbgReturn( toIntervalMinuteC( pResultGetData ) );
         case SQL_C_INTERVAL_SECOND:
+            MYODBCDbgReturn( toIntervalSecondC( pResultGetData ) );
         case SQL_C_INTERVAL_DAY_TO_HOUR:
+            MYODBCDbgReturn( toIntervalDayToHourC( pResultGetData ) );
         case SQL_C_INTERVAL_DAY_TO_MINUTE:
+            MYODBCDbgReturn( toIntervalDayToMinuteC( pResultGetData ) );
         case SQL_C_INTERVAL_DAY_TO_SECOND:
+            MYODBCDbgReturn( toIntervalDayToSecondC( pResultGetData ) );
         case SQL_C_INTERVAL_HOUR_TO_MINUTE:
+            MYODBCDbgReturn( toIntervalHourToMinuteC( pResultGetData ) );
         case SQL_C_INTERVAL_HOUR_TO_SECOND:
+            MYODBCDbgReturn( toIntervalHourToSecondC( pResultGetData ) );
         case SQL_C_INTERVAL_MINUTE_TO_SECOND:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
+            MYODBCDbgReturn( toIntervalMinuteToSecondC( pResultGetData ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromNumericSQL()
+SQLRETURN MResult::fromNumericSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -816,56 +838,45 @@
 
         The following table shows the ODBC C data types to which numeric SQL data may be
converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
+            MYODBCDbgReturn( toCharC( pResultGetData ) );
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
+            MYODBCDbgReturn( toWCharC( pResultGetData ) );
         case SQL_C_TINYINT:
         case SQL_C_STINYINT:
+            MYODBCDbgReturn( toSTinyIntC( pResultGetData ) );
+        case SQL_C_UTINYINT:
+            MYODBCDbgReturn( toUTinyIntC( pResultGetData ) );
         case SQL_C_BIT:
-            MYODBCDbgReturn( toCharC() );
-
-        case SQL_C_UTINYINT:
-            MYODBCDbgReturn( toUnsignedCharC() );
-
+            MYODBCDbgReturn( toBitC( pResultGetData ) );
         case SQL_C_SBIGINT:
-            MYODBCDbgReturn( toLongLongC() );
-
+            MYODBCDbgReturn( toSBigIntC( pResultGetData ) );
         case SQL_C_UBIGINT:
-            MYODBCDbgReturn( toUnsignedLongLongC() );
-
+            MYODBCDbgReturn( toUBigIntC( pResultGetData ) );
         case SQL_C_SHORT:
         case SQL_C_SSHORT:
-            MYODBCDbgReturn( toShortIntC() );
-
+            MYODBCDbgReturn( toSShortC( pResultGetData ) );
         case SQL_C_USHORT:
-            MYODBCDbgReturn( toUnsignedShortIntC() );
-
+            MYODBCDbgReturn( toUShortC( pResultGetData ) );
         case SQL_C_LONG:
         case SQL_C_SLONG:
-            MYODBCDbgReturn( toLongIntC() );
-
+            MYODBCDbgReturn( toSLongC( pResultGetData ) );
         case SQL_C_ULONG:
-            MYODBCDbgReturn( toUnsignedLongIntC() );
-
+            MYODBCDbgReturn( toULongC( pResultGetData ) );
         case SQL_C_NUMERIC:
-            MYODBCDbgReturn( toNumericC() );
-
+            MYODBCDbgReturn( toNumericC( pResultGetData ) );
         case SQL_C_FLOAT:
-            MYODBCDbgReturn( toFloatC() );
-
+            MYODBCDbgReturn( toFloatC( pResultGetData ) );
         case SQL_C_DOUBLE:
-            MYODBCDbgReturn( toDoubleC() );
-
+            MYODBCDbgReturn( toDoubleC( pResultGetData ) );
         case SQL_C_BINARY:
-            MYODBCDbgReturn( toBinaryC() );
-
+            MYODBCDbgReturn( toBinaryC( pResultGetData ) );
         case SQL_C_INTERVAL_MONTH:
+            MYODBCDbgReturn( toIntervalMonthC( pResultGetData ) );
         case SQL_C_INTERVAL_YEAR:
+            MYODBCDbgReturn( toIntervalYearC( pResultGetData ) );
         case SQL_C_INTERVAL_YEAR_TO_MONTH:
             /*!
                 \internal
@@ -875,7 +886,6 @@
                 a numeric. 
             */
             MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Loading SQL_INTERVAL_STRUCT/SQL_YEAR_MONTH_STRUCT from numeric not supported.") ) );
-
         case SQL_C_INTERVAL_DAY:
         case SQL_C_INTERVAL_HOUR:
         case SQL_C_INTERVAL_MINUTE:
@@ -893,15 +903,12 @@
                 a numeric. 
             */
             MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Loading SQL_INTERVAL_STRUCT/SQL_DAY_SECOND_STRUCT from numeric not supported.") ) );
-
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromBitSQL()
+SQLRETURN MResult::fromBitSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -910,39 +917,47 @@
 
         The following table shows the ODBC C data types to which bit SQL data may be
converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
+            MYODBCDbgReturn( toCharC( pResultGetData ) );
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
+            MYODBCDbgReturn( toWCharC( pResultGetData ) );
+        case SQL_C_TINYINT:
         case SQL_C_STINYINT:
+            MYODBCDbgReturn( toSTinyIntC( pResultGetData ) );
         case SQL_C_UTINYINT:
-        case SQL_C_TINYINT:
+            MYODBCDbgReturn( toUTinyIntC( pResultGetData ) );
         case SQL_C_SBIGINT:
+            MYODBCDbgReturn( toSBigIntC( pResultGetData ) );
         case SQL_C_UBIGINT:
+            MYODBCDbgReturn( toUBigIntC( pResultGetData ) );
+        case SQL_C_SHORT:
         case SQL_C_SSHORT:
+            MYODBCDbgReturn( toSShortC( pResultGetData ) );
         case SQL_C_USHORT:
-        case SQL_C_SHORT:
+            MYODBCDbgReturn( toUShortC( pResultGetData ) );
+        case SQL_C_LONG:
         case SQL_C_SLONG:
+            MYODBCDbgReturn( toSLongC( pResultGetData ) );
         case SQL_C_ULONG:
-        case SQL_C_LONG:
+            MYODBCDbgReturn( toULongC( pResultGetData ) );
         case SQL_C_FLOAT:
+            MYODBCDbgReturn( toFloatC( pResultGetData ) );
         case SQL_C_DOUBLE:
+            MYODBCDbgReturn( toDoubleC( pResultGetData ) );
         case SQL_C_NUMERIC:
+            MYODBCDbgReturn( toNumericC( pResultGetData ) );
         case SQL_C_BIT:
+            MYODBCDbgReturn( toBitC( pResultGetData ) );
         case SQL_C_BINARY:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
+            MYODBCDbgReturn( toBinaryC( pResultGetData ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromBinarySQL()
+SQLRETURN MResult::fromBinarySQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -951,25 +966,20 @@
 
         The following table shows the ODBC C data types to which binary SQL data may be
converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
+            MYODBCDbgReturn( toCharC( pResultGetData ) );
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
+            MYODBCDbgReturn( toWCharC( pResultGetData ) );
         case SQL_C_BINARY:
-            break;
-
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
+            MYODBCDbgReturn( toBinaryC( pResultGetData ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromDateSQL()
+SQLRETURN MResult::fromDateSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -978,26 +988,24 @@
 
         The following table shows the ODBC C data types to which date SQL data may be
converted. 
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
+            MYODBCDbgReturn( toCharC( pResultGetData ) );
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
+            MYODBCDbgReturn( toWCharC( pResultGetData ) );
         case SQL_C_BINARY:
+            MYODBCDbgReturn( toBinaryC( pResultGetData ) );
         case SQL_C_TYPE_DATE:
+            MYODBCDbgReturn( toTypeDateC( pResultGetData ) );
         case SQL_C_TYPE_TIMESTAMP:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
+            MYODBCDbgReturn( toTypeTimestampC( pResultGetData ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromGuidSQL()
+SQLRETURN MResult::fromGuidSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -1006,25 +1014,24 @@
 
         The following table shows the ODBC C data types to which GUID SQL data may be
converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    /*!
+        \internal MYODBC RULE
+
+        We do not have a GUID type to support here - so this method should not get
called. We are just
+        a stub.
+    */
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
         case SQL_C_BINARY:
         case SQL_C_GUID:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromTimeSQL()
+SQLRETURN MResult::fromTimeSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -1033,26 +1040,24 @@
 
         The following table shows the ODBC C data types to which time SQL data may be
converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
+            MYODBCDbgReturn( toCharC( pResultGetData ) );
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
+            MYODBCDbgReturn( toWCharC( pResultGetData ) );
         case SQL_C_BINARY:
+            MYODBCDbgReturn( toBinaryC( pResultGetData ) );
         case SQL_C_TYPE_TIME:
+            MYODBCDbgReturn( toTypeTimeC( pResultGetData ) );
         case SQL_C_TYPE_TIMESTAMP:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
+            MYODBCDbgReturn( toTypeTimestampC( pResultGetData ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromTimeStampSQL()
+SQLRETURN MResult::fromTimeStampSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -1061,27 +1066,26 @@
 
         The following table shows the ODBC C data types to which timestamp SQL data may
be converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
+            MYODBCDbgReturn( toCharC( pResultGetData ) );
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
+            MYODBCDbgReturn( toWCharC( pResultGetData ) );
         case SQL_C_BINARY:
+            MYODBCDbgReturn( toBinaryC( pResultGetData ) );
         case SQL_C_TYPE_DATE:
+            MYODBCDbgReturn( toTypeDateC( pResultGetData ) );
         case SQL_C_TYPE_TIME:
+            MYODBCDbgReturn( toTypeTimeC( pResultGetData ) );
         case SQL_C_TIMESTAMP:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
+            MYODBCDbgReturn( toTypeTimestampC( pResultGetData ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromIntervalYearMonthSQL()
+SQLRETURN MResult::fromIntervalYearMonthSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -1090,14 +1094,16 @@
 
         The following table shows the ODBC C data types to which year-month interval SQL
data may be converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    /*!
+        \internal MYODBC RULE
+
+        We do not have an interval type to support here - so this method should not get
called. We are just
+        a stub.
+    */
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
         case SQL_C_INTERVAL_MONTH:
         case SQL_C_INTERVAL_YEAR:
         case SQL_C_INTERVAL_YEAR_TO_MONTH:
@@ -1111,15 +1117,12 @@
         case SQL_C_SBIGINT:
         case SQL_C_UBIGINT:
         case SQL_C_BINARY:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
-SQLRETURN MResult::fromIntervalDayTimeSQL()
+SQLRETURN MResult::fromIntervalDayTimeSQL( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -1128,14 +1131,16 @@
 
         The following table shows the ODBC C data types to which day-time interval SQL
data may be converted.
     */
-    switch ( resultGetData.nTargetTypeAdjusted )
+    /*!
+        \internal MYODBC RULE
+
+        We do not have an interval type to support here - so this method should not get
called. We are just
+        a stub.
+    */
+    switch ( pResultGetData->nTargetTypeAdjusted )
     {
         case SQL_C_CHAR:
-            MYODBCDbgReturn( toCharStringC() );
-
         case SQL_C_WCHAR:
-            MYODBCDbgReturn( toWideCharStringC() );
-
         case SQL_C_STINYINT:
         case SQL_C_UTINYINT:
         case SQL_C_SBIGINT:
@@ -1158,12 +1163,9 @@
         case SQL_C_INTERVAL_HOUR_TO_MINUTE:
         case SQL_C_INTERVAL_HOUR_TO_SECOND:
         case SQL_C_INTERVAL_MINUTE_TO_SECOND:
-            break;
-        default:
-            MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
     }
 
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_07006 ) );
 }
 
 SQLRETURN MResult::toCharC( MResultGetData *pResultGetData )
@@ -1744,7 +1746,7 @@
     MYODBCDbgReturn( SQL_SUCCESS );
 }
 
-SQLRETURN MResult::toTypeTimeStampC( MResultGetData *pResultGetData )
+SQLRETURN MResult::toTypeTimestampC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
 
@@ -1928,85 +1930,85 @@
 SQLRETURN MResult::toGuidC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalMonthC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalYearC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalYearToMonthC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalDayC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalHourC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalMinuteC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalSecondC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalDayToHourC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalDayToMinuteC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalDayToSecondC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalHourToMinuteC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalHourToSecondC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 SQLRETURN MResult::toIntervalMinuteToSecondC( MResultGetData *pResultGetData )
 {
     MYODBCDbgEnter();
-    MYODBCDbgReturn( SQL_SUCCESS );
+    MYODBCDbgReturn( SQL_ERROR );
 }
 
 /*! 

Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.h
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.h	2006-06-06 23:00:15 UTC (rev 321)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.h	2006-06-07 05:44:48 UTC (rev 322)
@@ -166,16 +166,16 @@
         "Converting Data from SQL to C Data Types"
http://msdn.microsoft.com/library/en-us/odbc/htm/odbcconverting_data_from_sql_to_c_data_types.asp
     */
     /*@{*/
-    SQLRETURN       fromCharacterSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromNumericSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromBitSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromBinarySQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromDateSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromGuidSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromTimeSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromTimeStampSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromIntervalYearMonthSQL( MResultGetData  *pResultGetData );
-    SQLRETURN       fromIntervalDayTimeSQL( MResultGetData  *pResultGetData );
+    SQLRETURN       fromCharacterSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromNumericSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromBitSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromBinarySQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromDateSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromGuidSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromTimeSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromTimeStampSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromIntervalYearMonthSQL( MResultGetData *pResultGetData );
+    SQLRETURN       fromIntervalDayTimeSQL( MResultGetData *pResultGetData );
     /*@}*/
 
     /*!

Thread
Connector/ODBC 5 commit: r322 - trunk/MYSQLPlus/MYSQLPlusLibpharvey7 Jun