Connector/ODBC 5 commit: r212 - MYODBCC/MYODBCCLib MYODBCC/include MYSQLPlus/MYSQLPlusLib doc/Project

[pharvey]

Modified:
   MYODBCC/MYODBCCLib/MYODBCC.cpp
   MYODBCC/include/MYODBCC.h
   MYSQLPlus/MYSQLPlusLib/MStatement.cpp
   doc/Project/SituationReport-20060512.ods
Log:


Modified: MYODBCC/MYODBCCLib/MYODBCC.cpp
===================================================================
--- MYODBCC/MYODBCCLib/MYODBCC.cpp	2006-05-09 16:06:13 UTC (rev 211)
+++ MYODBCC/MYODBCCLib/MYODBCC.cpp	2006-05-09 16:22:18 UTC (rev 212)
@@ -2081,3 +2081,25 @@
     return false;
 }
 
+BOOLEAN MYODBCC::isCharTypeC( SQLSMALLINT nType )
+{
+    switch ( nType )
+    {
+        case SQL_C_CHAR:
+            return true;
+    }
+
+    return false;
+}
+
+BOOLEAN MYODBCC::isBinTypeC( SQLSMALLINT nType )
+{
+    switch ( nType )
+    {
+        case SQL_C_BINARY:
+            return true;
+    }
+
+    return false;
+}
+

Modified: MYODBCC/include/MYODBCC.h
===================================================================
--- MYODBCC/include/MYODBCC.h	2006-05-09 16:06:13 UTC (rev 211)
+++ MYODBCC/include/MYODBCC.h	2006-05-09 16:22:18 UTC (rev 212)
@@ -266,6 +266,8 @@
     static BOOLEAN isIntervalConciseTypeSQL( SQLSMALLINT nType );
     static BOOLEAN isDateTimeCode( SQLSMALLINT nCode );
     static BOOLEAN isIntervalCode( SQLSMALLINT nCode );
+    static BOOLEAN isCharTypeC( SQLSMALLINT nType );
+    static BOOLEAN isBinTypeC( SQLSMALLINT nType );
 };
 
 #endif

Modified: MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-05-09 16:06:13 UTC (rev 211)
+++ MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-05-09 16:22:18 UTC (rev 212)
@@ -733,7 +733,7 @@
         SQL_PARAM_OUTPUT, where the argument ParameterValuePtr was a null pointer, the 
         C-type was char or binary, and the BufferLength (cbValueMax) was greater than 0.
     */
-    if ( nInputOutputType == SQL_PARAM_OUTPUT && !nParameterValue && (
isCharTypeC( nValueType ) || isBinTypeC( nValueType ) ) && nBufferLength > 0 )
+    if ( nInputOutputType == SQL_PARAM_OUTPUT && !pParameterValue && (
MYODBCC::isCharTypeC( nValueType ) || MYODBCC::isBinTypeC( nValueType ) ) &&
nBufferLength > 0 )
         MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY009 ) );
 
     /*!
@@ -1025,7 +1025,7 @@
         We want to set this value last, as long as we are using MYODBCDrvSetDescField
         to set the value, because this will cause a deeper validation.
     */       
-    nReturn = pAppParamDesc->setDescField( nParameterNumber, SQL_DESC_DATA_PTR,
nParameterValue, SQL_IS_POINTER );
+    nReturn = pAppParamDesc->setDescField( nParameterNumber, SQL_DESC_DATA_PTR,
pParameterValue, SQL_IS_POINTER );
     switch ( nReturn )
     {
         case SQL_SUCCESS:

Modified: doc/Project/SituationReport-20060512.ods
===================================================================
(Binary files differ)