List:Commits« Previous MessageNext Message »
From:ahristov Date:April 3 2007 1:18pm
Subject:Connector/ODBC 5 commit: r834 - in trunk/SDK: C/Library C/include MYSQLPlus/Library
View as plain text  
Modified:
   trunk/SDK/C/Library/MYODBCC.cpp
   trunk/SDK/C/include/MYODBCC.h
   trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
   trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
   trunk/SDK/MYSQLPlus/Library/MStatement.cpp
Log:
Correct typo (introduced by me)


Modified: trunk/SDK/C/Library/MYODBCC.cpp
===================================================================
--- trunk/SDK/C/Library/MYODBCC.cpp	2007-04-03 10:18:06 UTC (rev 833)
+++ trunk/SDK/C/Library/MYODBCC.cpp	2007-04-03 11:18:36 UTC (rev 834)
@@ -2663,7 +2663,7 @@
     return src.length() < nDestMaxChars;
 }
 
-BOOL MYOBDCCValidator::isQuoteNeededSQL( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isQuoteNeededSQL( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -2808,7 +2808,7 @@
     return final;
 }
 
-BOOL MYOBDCCValidator::isConnectAttr( SQLINTEGER nAttribute )
+BOOL MYODBCCValidator::isConnectAttr( SQLINTEGER nAttribute )
 {
     switch ( nAttribute )
     {
@@ -2835,7 +2835,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isConnectOption( SQLUSMALLINT nOption )
+BOOL MYODBCCValidator::isConnectOption( SQLUSMALLINT nOption )
 {
     switch ( nOption )
     {
@@ -2857,7 +2857,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDiagField( SQLSMALLINT nDiagField )
+BOOL MYODBCCValidator::isDiagField( SQLSMALLINT nDiagField )
 {
     switch ( nDiagField )
     {
@@ -2882,7 +2882,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isEnvAttr( SQLINTEGER nAttribute )
+BOOL MYODBCCValidator::isEnvAttr( SQLINTEGER nAttribute )
 {
     switch ( nAttribute )
     {
@@ -2896,7 +2896,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isFunctions( SQLUSMALLINT nFunction )
+BOOL MYODBCCValidator::isFunctions( SQLUSMALLINT nFunction )
 {
     switch ( nFunction )
     {
@@ -2986,7 +2986,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isHandleType( SQLSMALLINT nHandleType )
+BOOL MYODBCCValidator::isHandleType( SQLSMALLINT nHandleType )
 {
     switch ( nHandleType )
     {
@@ -3000,7 +3000,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isInfoType( SQLUSMALLINT nInfoType )
+BOOL MYODBCCValidator::isInfoType( SQLUSMALLINT nInfoType )
 {
     switch ( nInfoType )
     {
@@ -3183,7 +3183,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isReturn( SQLRETURN nReturn )
+BOOL MYODBCCValidator::isReturn( SQLRETURN nReturn )
 {
     switch ( nReturn )
     {
@@ -3202,7 +3202,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isStmtAttr( SQLINTEGER nAttribute )
+BOOL MYODBCCValidator::isStmtAttr( SQLINTEGER nAttribute )
 {
     switch ( nAttribute )
     {
@@ -3245,7 +3245,7 @@
     return isStmtOption( nAttribute );
 }
 
-BOOL MYOBDCCValidator::isStmtOption( SQLUSMALLINT nOption )
+BOOL MYODBCCValidator::isStmtOption( SQLUSMALLINT nOption )
 {
     switch ( nOption )
     {
@@ -3270,7 +3270,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isTypeC( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isTypeC( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3300,7 +3300,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isTypeSQL( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3332,7 +3332,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isConciseTypeC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYODBCCValidator::isConciseTypeC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
 {
     /*! 
         \internal ODBC RULE
@@ -3421,7 +3421,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYODBCCValidator::isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
 {
     /*! 
         \internal ODBC RULE
@@ -3501,7 +3501,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isIntervalConciseTypeC( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isIntervalConciseTypeC( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3524,7 +3524,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isIntervalConciseTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isIntervalConciseTypeSQL( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3547,7 +3547,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDateTimeCode( SQLSMALLINT nCode )
+BOOL MYODBCCValidator::isDateTimeCode( SQLSMALLINT nCode )
 {
     switch ( nCode )
     {
@@ -3560,7 +3560,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isIntervalCode( SQLSMALLINT nCode )
+BOOL MYODBCCValidator::isIntervalCode( SQLSMALLINT nCode )
 {
     switch ( nCode )
     {
@@ -3583,7 +3583,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isCharTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isCharTypeSQL( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3599,7 +3599,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isBinTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isBinTypeSQL( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3612,7 +3612,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYODBCCValidator::isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
 {
     /*! 
         \internal ODBC RULE
@@ -3654,7 +3654,7 @@
 }
 
 
-BOOL MYOBDCCValidator::isCharTypeC( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isCharTypeC( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3665,7 +3665,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isBinTypeC( SQLSMALLINT nType )
+BOOL MYODBCCValidator::isBinTypeC( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -3676,7 +3676,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isBooleanValue( SQLINTEGER nValue )
+BOOL MYODBCCValidator::isBooleanValue( SQLINTEGER nValue )
 {
     switch ( nValue )
     {
@@ -3688,7 +3688,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDescField( SQLSMALLINT nField )
+BOOL MYODBCCValidator::isDescField( SQLSMALLINT nField )
 {
     switch ( nField )
     {
@@ -3740,7 +3740,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDescAllocType( SQLSMALLINT nAllocType )
+BOOL MYODBCCValidator::isDescAllocType( SQLSMALLINT nAllocType )
 {
     switch ( nAllocType )
     {
@@ -3752,7 +3752,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDescBindType( SQLINTEGER nBindType )
+BOOL MYODBCCValidator::isDescBindType( SQLINTEGER nBindType )
 {
     /*! \todo these values look suspect... */
     switch ( nBindType )
@@ -3766,7 +3766,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDescNullable( SQLSMALLINT nNullable )
+BOOL MYODBCCValidator::isDescNullable( SQLSMALLINT nNullable )
 {
     switch ( nNullable )
     {
@@ -3779,7 +3779,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDescParameterType( SQLSMALLINT nParameterType )
+BOOL MYODBCCValidator::isDescParameterType( SQLSMALLINT nParameterType )
 {
     switch ( nParameterType )
     {
@@ -3792,7 +3792,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDescSearchable( SQLSMALLINT nSearchable )
+BOOL MYODBCCValidator::isDescSearchable( SQLSMALLINT nSearchable )
 {
     switch ( nSearchable )
     {
@@ -3806,7 +3806,7 @@
     return false;
 }
     
-BOOL MYOBDCCValidator::isDescUnnamed( SQLSMALLINT nUnnamed )
+BOOL MYODBCCValidator::isDescUnnamed( SQLSMALLINT nUnnamed )
 {
     switch ( nUnnamed )
     {
@@ -3818,7 +3818,7 @@
     return false;
 }
 
-BOOL MYOBDCCValidator::isDescUpdatable( SQLSMALLINT nUpdatable )
+BOOL MYODBCCValidator::isDescUpdatable( SQLSMALLINT nUpdatable )
 {
     switch ( nUpdatable )
     {

Modified: trunk/SDK/C/include/MYODBCC.h
===================================================================
--- trunk/SDK/C/include/MYODBCC.h	2007-04-03 10:18:06 UTC (rev 833)
+++ trunk/SDK/C/include/MYODBCC.h	2007-04-03 11:18:36 UTC (rev 834)
@@ -561,7 +561,7 @@
     static SQLINTEGER getStmtAttrFromOption( SQLUSMALLINT nOption );
 };
 
-class MYOBDCCValidator
+class MYODBCCValidator
 {
 public:
     static BOOL    isQuoteNeededSQL( SQLSMALLINT nType );

Modified: trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp	2007-04-03 10:18:06 UTC (rev 833)
+++ trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp	2007-04-03 11:18:36 UTC (rev 834)
@@ -4077,7 +4077,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isDescBindType(nBindType))
+    if (!MYODBCCValidator::isDescBindType(nBindType))
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY092B ) );
 
     this->nBindType = nBindType;

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp	2007-04-03 10:18:06 UTC (rev 833)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp	2007-04-03 11:18:36 UTC (rev 834)
@@ -307,7 +307,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isDescBindType(nBindType))
+    if (!MYODBCCValidator::isDescBindType(nBindType))
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY092B ) );
 
     this->nBindType = nBindType;

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2007-04-03 10:18:06 UTC (rev 833)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2007-04-03 11:18:36 UTC (rev 834)
@@ -149,7 +149,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isBooleanValue(nAutoUniqueValue))
+    if (!MYODBCCValidator::isBooleanValue(nAutoUniqueValue))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nAutoUniqueValue = nAutoUniqueValue;
@@ -179,7 +179,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isBooleanValue(nCaseSensitive))
+    if (!MYODBCCValidator::isBooleanValue(nCaseSensitive))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nCaseSensitive = nCaseSensitive;
@@ -322,7 +322,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isDescNullable(nNullable))
+    if (!MYODBCCValidator::isDescNullable(nNullable))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nNullable = nNullable;
@@ -371,7 +371,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isDescParameterType(nParameterType))
+    if (!MYODBCCValidator::isDescParameterType(nParameterType))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
     
     this->nParameterType = nParameterType;
@@ -392,7 +392,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isBooleanValue(nRowver))
+    if (!MYODBCCValidator::isBooleanValue(nRowver))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nRowver = nRowver;
@@ -422,7 +422,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isDescSearchable(nSearchable))
+    if (!MYODBCCValidator::isDescSearchable(nSearchable))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nSearchable = nSearchable;
@@ -461,7 +461,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isDescUnnamed(nUnnamed))
+    if (!MYODBCCValidator::isDescUnnamed(nUnnamed))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nUnnamed = nUnnamed;
@@ -473,7 +473,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isBooleanValue(nUnsigned))
+    if (!MYODBCCValidator::isBooleanValue(nUnsigned))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nUnsigned = nUnsigned;
@@ -485,7 +485,7 @@
 {
     MYODBCDbgEnter();
 
-    if (!MYOBDCCValidator::isDescUpdatable(nUpdatable))
+    if (!MYODBCCValidator::isDescUpdatable(nUpdatable))
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
 
     this->nUpdatable = nUpdatable;

Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-03 10:18:06 UTC (rev 833)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-03 11:18:36 UTC (rev 834)
@@ -104,7 +104,7 @@
 
         The argument TargetType was neither a valid data type, SQL_C_DEFAULT, nor
SQL_ARD_TYPE.
     */
-    if (!MYOBDCCValidator::isConciseTypeC(nTargetType,
getEnvironment()->getODBCVersion()) &&
+    if (!MYODBCCValidator::isConciseTypeC(nTargetType,
getEnvironment()->getODBCVersion()) &&
         nTargetType != SQL_C_DEFAULT &&
         nTargetType != SQL_ARD_TYPE )
     {

Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-03 10:18:06 UTC (rev 833)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-03 11:18:36 UTC (rev 834)
@@ -917,8 +917,8 @@
     */
     if (nInputOutputType == SQL_PARAM_OUTPUT &&
         !pParameterValue &&
-        (MYOBDCCValidator::isCharTypeC(nValueType) ||
-         MYOBDCCValidator::isBinTypeC(nValueType)) &&
+        (MYODBCCValidator::isCharTypeC(nValueType) ||
+         MYODBCCValidator::isBinTypeC(nValueType)) &&
         nBufferLength > 0 )
     {
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY009 ) );

Thread
Connector/ODBC 5 commit: r834 - in trunk/SDK: C/Library C/include MYSQLPlus/Libraryahristov3 Apr