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:
Move validating methods, actually real global functions to
separate class MYODBCCValidator
Modified: trunk/SDK/C/Library/MYODBCC.cpp
===================================================================
--- trunk/SDK/C/Library/MYODBCC.cpp 2007-04-03 09:44:06 UTC (rev 831)
+++ trunk/SDK/C/Library/MYODBCC.cpp 2007-04-03 09:55:44 UTC (rev 832)
@@ -2663,7 +2663,7 @@
return src.length() < nDestMaxChars;
}
-BOOL MYODBCC::isQuoteNeededSQL( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isQuoteNeededSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2808,7 +2808,7 @@
return final;
}
-BOOL MYODBCC::isConnectAttr( SQLINTEGER nAttribute )
+BOOL MYOBDCCValidator::isConnectAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -2835,7 +2835,7 @@
return false;
}
-BOOL MYODBCC::isConnectOption( SQLUSMALLINT nOption )
+BOOL MYOBDCCValidator::isConnectOption( SQLUSMALLINT nOption )
{
switch ( nOption )
{
@@ -2857,7 +2857,7 @@
return false;
}
-BOOL MYODBCC::isDiagField( SQLSMALLINT nDiagField )
+BOOL MYOBDCCValidator::isDiagField( SQLSMALLINT nDiagField )
{
switch ( nDiagField )
{
@@ -2882,7 +2882,7 @@
return false;
}
-BOOL MYODBCC::isEnvAttr( SQLINTEGER nAttribute )
+BOOL MYOBDCCValidator::isEnvAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -2896,7 +2896,7 @@
return false;
}
-BOOL MYODBCC::isFunctions( SQLUSMALLINT nFunction )
+BOOL MYOBDCCValidator::isFunctions( SQLUSMALLINT nFunction )
{
switch ( nFunction )
{
@@ -2986,7 +2986,7 @@
return false;
}
-BOOL MYODBCC::isHandleType( SQLSMALLINT nHandleType )
+BOOL MYOBDCCValidator::isHandleType( SQLSMALLINT nHandleType )
{
switch ( nHandleType )
{
@@ -3000,7 +3000,7 @@
return false;
}
-BOOL MYODBCC::isInfoType( SQLUSMALLINT nInfoType )
+BOOL MYOBDCCValidator::isInfoType( SQLUSMALLINT nInfoType )
{
switch ( nInfoType )
{
@@ -3183,7 +3183,7 @@
return false;
}
-BOOL MYODBCC::isReturn( SQLRETURN nReturn )
+BOOL MYOBDCCValidator::isReturn( SQLRETURN nReturn )
{
switch ( nReturn )
{
@@ -3202,7 +3202,7 @@
return false;
}
-BOOL MYODBCC::isStmtAttr( SQLINTEGER nAttribute )
+BOOL MYOBDCCValidator::isStmtAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -3245,7 +3245,7 @@
return isStmtOption( nAttribute );
}
-BOOL MYODBCC::isStmtOption( SQLUSMALLINT nOption )
+BOOL MYOBDCCValidator::isStmtOption( SQLUSMALLINT nOption )
{
switch ( nOption )
{
@@ -3270,7 +3270,7 @@
return false;
}
-BOOL MYODBCC::isTypeC( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3300,7 +3300,7 @@
return false;
}
-BOOL MYODBCC::isTypeSQL( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3332,7 +3332,7 @@
return false;
}
-BOOL MYODBCC::isConciseTypeC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYOBDCCValidator::isConciseTypeC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
{
/*!
\internal ODBC RULE
@@ -3421,7 +3421,7 @@
return false;
}
-BOOL MYODBCC::isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYOBDCCValidator::isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
{
/*!
\internal ODBC RULE
@@ -3501,7 +3501,7 @@
return false;
}
-BOOL MYODBCC::isIntervalConciseTypeC( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isIntervalConciseTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3524,7 +3524,7 @@
return false;
}
-BOOL MYODBCC::isIntervalConciseTypeSQL( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isIntervalConciseTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3547,7 +3547,7 @@
return false;
}
-BOOL MYODBCC::isDateTimeCode( SQLSMALLINT nCode )
+BOOL MYOBDCCValidator::isDateTimeCode( SQLSMALLINT nCode )
{
switch ( nCode )
{
@@ -3560,7 +3560,7 @@
return false;
}
-BOOL MYODBCC::isIntervalCode( SQLSMALLINT nCode )
+BOOL MYOBDCCValidator::isIntervalCode( SQLSMALLINT nCode )
{
switch ( nCode )
{
@@ -3583,7 +3583,7 @@
return false;
}
-BOOL MYODBCC::isCharTypeSQL( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isCharTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3599,7 +3599,7 @@
return false;
}
-BOOL MYODBCC::isBinTypeSQL( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isBinTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3612,7 +3612,7 @@
return false;
}
-BOOL MYODBCC::isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYOBDCCValidator::isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
{
/*!
\internal ODBC RULE
@@ -3654,7 +3654,7 @@
}
-BOOL MYODBCC::isCharTypeC( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isCharTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3665,7 +3665,7 @@
return false;
}
-BOOL MYODBCC::isBinTypeC( SQLSMALLINT nType )
+BOOL MYOBDCCValidator::isBinTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3676,7 +3676,7 @@
return false;
}
-BOOL MYODBCC::isBooleanValue( SQLINTEGER nValue )
+BOOL MYOBDCCValidator::isBooleanValue( SQLINTEGER nValue )
{
switch ( nValue )
{
@@ -3688,7 +3688,7 @@
return false;
}
-BOOL MYODBCC::isDescField( SQLSMALLINT nField )
+BOOL MYOBDCCValidator::isDescField( SQLSMALLINT nField )
{
switch ( nField )
{
@@ -3740,7 +3740,7 @@
return false;
}
-BOOL MYODBCC::isDescAllocType( SQLSMALLINT nAllocType )
+BOOL MYOBDCCValidator::isDescAllocType( SQLSMALLINT nAllocType )
{
switch ( nAllocType )
{
@@ -3752,7 +3752,7 @@
return false;
}
-BOOL MYODBCC::isDescBindType( SQLINTEGER nBindType )
+BOOL MYOBDCCValidator::isDescBindType( SQLINTEGER nBindType )
{
/*! \todo these values look suspect... */
switch ( nBindType )
@@ -3766,7 +3766,7 @@
return false;
}
-BOOL MYODBCC::isDescNullable( SQLSMALLINT nNullable )
+BOOL MYOBDCCValidator::isDescNullable( SQLSMALLINT nNullable )
{
switch ( nNullable )
{
@@ -3779,7 +3779,7 @@
return false;
}
-BOOL MYODBCC::isDescParameterType( SQLSMALLINT nParameterType )
+BOOL MYOBDCCValidator::isDescParameterType( SQLSMALLINT nParameterType )
{
switch ( nParameterType )
{
@@ -3792,7 +3792,7 @@
return false;
}
-BOOL MYODBCC::isDescSearchable( SQLSMALLINT nSearchable )
+BOOL MYOBDCCValidator::isDescSearchable( SQLSMALLINT nSearchable )
{
switch ( nSearchable )
{
@@ -3806,7 +3806,7 @@
return false;
}
-BOOL MYODBCC::isDescUnnamed( SQLSMALLINT nUnnamed )
+BOOL MYOBDCCValidator::isDescUnnamed( SQLSMALLINT nUnnamed )
{
switch ( nUnnamed )
{
@@ -3818,7 +3818,7 @@
return false;
}
-BOOL MYODBCC::isDescUpdatable( SQLSMALLINT nUpdatable )
+BOOL MYOBDCCValidator::isDescUpdatable( SQLSMALLINT nUpdatable )
{
switch ( nUpdatable )
{
Modified: trunk/SDK/C/include/MYODBCC.h
===================================================================
--- trunk/SDK/C/include/MYODBCC.h 2007-04-03 09:44:06 UTC (rev 831)
+++ trunk/SDK/C/include/MYODBCC.h 2007-04-03 09:55:44 UTC (rev 832)
@@ -559,8 +559,11 @@
static SQLSMALLINT getCDefault( SQLINTEGER nODBCVersion, SQLSMALLINT nSQLType,
SQLSMALLINT nUnsigned = SQL_FALSE );
static SQLINTEGER getStmtAttrFromOption( SQLUSMALLINT nOption );
+};
-
+class MYOBDCCValidator
+{
+public:
static BOOL isQuoteNeededSQL( SQLSMALLINT nType );
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-04-03 09:44:06 UTC (rev 831)
+++ trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-04-03 09:55:44 UTC (rev 832)
@@ -4077,7 +4077,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isDescBindType( nBindType ) )
+ if (!MYOBDCCValidator::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 09:44:06 UTC (rev 831)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2007-04-03 09:55:44 UTC (rev 832)
@@ -307,7 +307,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isDescBindType( nBindType ) )
+ if (!MYOBDCCValidator::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 09:44:06 UTC (rev 831)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2007-04-03 09:55:44 UTC (rev 832)
@@ -149,7 +149,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isBooleanValue( nAutoUniqueValue ) )
+ if (!MYOBDCCValidator::isBooleanValue(nAutoUniqueValue))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nAutoUniqueValue = nAutoUniqueValue;
@@ -179,7 +179,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isBooleanValue( nCaseSensitive ) )
+ if (!MYOBDCCValidator::isBooleanValue(nCaseSensitive))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nCaseSensitive = nCaseSensitive;
@@ -322,7 +322,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isDescNullable( nNullable ) )
+ if (!MYOBDCCValidator::isDescNullable(nNullable))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nNullable = nNullable;
@@ -371,7 +371,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isDescParameterType( nParameterType ) )
+ if (!MYOBDCCValidator::isDescParameterType(nParameterType))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nParameterType = nParameterType;
@@ -392,7 +392,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isBooleanValue( nRowver ) )
+ if (!MYOBDCCValidator::isBooleanValue(nRowver))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nRowver = nRowver;
@@ -422,7 +422,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isDescSearchable( nSearchable ) )
+ if (!MYOBDCCValidator::isDescSearchable(nSearchable))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nSearchable = nSearchable;
@@ -461,7 +461,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isDescUnnamed( nUnnamed ) )
+ if (!MYOBDCCValidator::isDescUnnamed(nUnnamed))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nUnnamed = nUnnamed;
@@ -473,7 +473,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isBooleanValue( nUnsigned ) )
+ if (!MYOBDCCValidator::isBooleanValue(nUnsigned))
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
this->nUnsigned = nUnsigned;
@@ -485,7 +485,7 @@
{
MYODBCDbgEnter();
- if ( !MYODBCC::isDescUpdatable( nUpdatable ) )
+ if (!MYOBDCCValidator::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 09:44:06 UTC (rev 831)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp 2007-04-03 09:55:44 UTC (rev 832)
@@ -104,9 +104,9 @@
The argument TargetType was neither a valid data type, SQL_C_DEFAULT, nor
SQL_ARD_TYPE.
*/
- if ( !MYODBCC::isConciseTypeC( nTargetType, getEnvironment()->getODBCVersion() )
&&
- nTargetType != SQL_C_DEFAULT &&
- nTargetType != SQL_ARD_TYPE )
+ if (!MYOBDCCValidator::isConciseTypeC(nTargetType,
getEnvironment()->getODBCVersion()) &&
+ nTargetType != SQL_C_DEFAULT &&
+ nTargetType != SQL_ARD_TYPE )
{
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY003, 0,
QString( "Invalid C-type=%1=%2" ).arg( nTargetType )
Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-04-03 09:44:06 UTC (rev 831)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-04-03 09:55:44 UTC (rev 832)
@@ -915,8 +915,10 @@
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 && !pParameterValue &&
- (MYODBCC::isCharTypeC( nValueType ) || MYODBCC::isBinTypeC( nValueType ))
&&
+ if (nInputOutputType == SQL_PARAM_OUTPUT &&
+ !pParameterValue &&
+ (MYOBDCCValidator::isCharTypeC(nValueType) ||
+ MYOBDCCValidator::isBinTypeC(nValueType)) &&
nBufferLength > 0 )
{
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY009 ) );
| Thread |
|---|
| • Connector/ODBC 5 commit: r832 - in trunk/SDK: C/Library C/include MYSQLPlus/Library | ahristov | 3 Apr |
