Modified:
MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp
MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp
MYODBCDes/include/MYODBCDesRec.h
MYODBCDes/include/MYODBCDesRecIRD.h
Log:
UNICODE:
- more refinements to descriptors
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp 2006-01-31 22:38:03 UTC (rev 53)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRec.cpp 2006-02-01 04:27:52 UTC (rev 54)
@@ -1332,11 +1332,9 @@
case SQL_CHAR:
case SQL_VARCHAR:
case SQL_LONGVARCHAR:
-#ifdef UNICODE
case SQL_WCHAR:
case SQL_WVARCHAR:
case SQL_WLONGVARCHAR:
-#endif
case SQL_DECIMAL:
case SQL_NUMERIC:
case SQL_SMALLINT:
@@ -1787,6 +1785,84 @@
MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0, NULL ) );
}
+QString MYODBCDesRec::getTypeNameSQL( SQLSMALLINT nType )
+{
+ MYODBCDbgEnter();
+
+ /*! \TODO make this accuratly reflect data mapping to/from mysql supported types */
+
+ switch ( nType )
+ {
+ case SQL_CHAR:
+ MYODBCDbgReturn3( "%s", "CHAR" );
+
+ case SQL_VARCHAR:
+ MYODBCDbgReturn3( "%s", "VARCHAR" );
+
+ case SQL_LONGVARCHAR:
+ MYODBCDbgReturn3( "%s", "LONGVARCHAR" );
+
+ case SQL_WCHAR:
+ MYODBCDbgReturn3( "%s", "WCHAR" );
+
+ case SQL_WVARCHAR:
+ MYODBCDbgReturn3( "%s", "WVARCHAR" );
+
+ case SQL_WLONGVARCHAR:
+ MYODBCDbgReturn3( "%s", "WLONGVARCHAR" );
+
+ case SQL_DECIMAL:
+ MYODBCDbgReturn3( "%s", "DECIMAL" );
+
+ case SQL_NUMERIC:
+ MYODBCDbgReturn3( "%s", "NUMERIC" );
+
+ case SQL_SMALLINT:
+ MYODBCDbgReturn3( "%s", "SMALLINT" );
+
+ case SQL_INTEGER:
+ MYODBCDbgReturn3( "%s", "INTEGER" );
+
+ case SQL_REAL:
+ MYODBCDbgReturn3( "%s", "REAL" );
+
+ case SQL_FLOAT:
+ MYODBCDbgReturn3( "%s", "FLOAT" );
+
+ case SQL_DOUBLE:
+ MYODBCDbgReturn3( "%s", "DOUBLE" );
+
+ case SQL_BIT:
+ MYODBCDbgReturn3( "%s", "BIT" );
+
+ case SQL_TINYINT:
+ MYODBCDbgReturn3( "%s", "TINYINT" );
+
+ case SQL_BIGINT:
+ MYODBCDbgReturn3( "%s", "BIGINT" );
+
+ case SQL_BINARY:
+ MYODBCDbgReturn3( "%s", "BINARY" );
+
+ case SQL_VARBINARY:
+ MYODBCDbgReturn3( "%s", "VARBINARY" );
+
+ case SQL_LONGVARBINARY:
+ MYODBCDbgReturn3( "%s", "LONGVARBINARY" );
+
+ case SQL_DATETIME:
+ MYODBCDbgReturn3( "%s", "DATETIME" );
+
+ case SQL_INTERVAL:
+ MYODBCDbgReturn3( "%s", "INTERVAL" );
+
+ case SQL_GUID:
+ MYODBCDbgReturn3( "%s", "GUID" );
+ }
+
+ MYODBCDbgReturn3( "%s", "VARCHAR" );
+}
+
SQLRETURN MYODBCDesRec::doConsistencyCheck()
{
MYODBCDbgEnter();
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp 2006-01-31 22:38:03 UTC (rev 53)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecARD.cpp 2006-02-01 04:27:52 UTC (rev 54)
@@ -27,6 +27,8 @@
{
MYODBCDbgEnter();
+ SQLRETURN nReturn = SQL_SUCCESS;
+
/*! \internal ODBC Rule
If an application calls SQLSetDescField to set any field other than
SQL_DESC_COUNT or the
@@ -72,7 +74,8 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_CONCISE_TYPE:
/*!
@@ -80,7 +83,8 @@
ARD: R/W
*/
- MYODBCDbgReturn( setConciseTypeC( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setConciseTypeC( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_DATA_PTR:
/*!
@@ -119,7 +123,7 @@
if ( bHasInfo )
MYODBCDbgReturn( SQL_SUCCESS_WITH_INFO );
}
- MYODBCDbgReturn( SQL_SUCCESS );
+ break;
case SQL_DESC_DATETIME_INTERVAL_CODE:
/*!
@@ -127,7 +131,8 @@
ARD: R/W
*/
- MYODBCDbgReturn( setIntervalCode( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setIntervalCode( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_DATETIME_INTERVAL_PRECISION:
/*!
@@ -146,7 +151,8 @@
or SQL_INTERVAL_SECOND data type. This field is undefined for
all other data types.
*/
- MYODBCDbgReturn( setDatetimeIntervalPrecision( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setDatetimeIntervalPrecision( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_DISPLAY_SIZE:
/*!
@@ -160,7 +166,8 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_INDICATOR_PTR:
/*!
@@ -168,7 +175,8 @@
ARD: R/W
*/
- MYODBCDbgReturn( setIndicatorPtr( (SQLINTEGER*)pValuePtr ) );
+ nReturn = setIndicatorPtr( (SQLINTEGER*)pValuePtr ) );
+ break;
case SQL_DESC_LABEL:
/*!
@@ -176,7 +184,8 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_LENGTH:
/*!
@@ -184,7 +193,7 @@
ARD: R/W
*/
- MYODBCDbgReturn( setLength( (SQLUINTEGER)pValuePtr ) );
+ nReturn = setLength( (SQLUINTEGER)pValuePtr ) );
case SQL_DESC_LITERAL_PREFIX:
/*!
@@ -216,7 +225,8 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_NUM_PREC_RADIX:
/*!
@@ -240,10 +250,11 @@
SQLINTEGER n = (SQLINTEGER)pValuePtr;
if ( n != 0 && n != 2 && n != 10 )
- MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY092, 0, NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0,
NULL );
+ else
+ nReturn = setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
}
-
- MYODBCDbgReturn( setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
+ break;
case SQL_DESC_OCTET_LENGTH:
/*!
@@ -258,7 +269,8 @@
For ARDs, this field is defined only for output or input/output
parameters.
*/
- MYODBCDbgReturn( setOctetLength( (SQLINTEGER)pValuePtr ) );
+ nReturn = setOctetLength( (SQLINTEGER)pValuePtr ) );
+ break;
case SQL_DESC_OCTET_LENGTH_PTR:
/*!
@@ -266,7 +278,8 @@
ARD: R/W
*/
- MYODBCDbgReturn( setOctetLengthPtr( (SQLINTEGER*)pValuePtr ) );
+ nReturn = setOctetLengthPtr( (SQLINTEGER*)pValuePtr ) );
+ break;
case SQL_DESC_PARAMETER_TYPE:
/*!
@@ -274,7 +287,8 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_PRECISION:
/*!
@@ -293,7 +307,8 @@
SQL_TYPE_TIMESTAMP, or SQL_INTERVAL_SECOND data type. This field
is undefined for all other data types.
*/
- MYODBCDbgReturn( setPrecision( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setPrecision( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_ROWVER:
/*!
@@ -301,7 +316,8 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_SCALE:
/*!
@@ -317,7 +333,8 @@
decimal and numeric data types. The field is undefined for all
other data types.
*/
- MYODBCDbgReturn( setScale( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setScale( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_SCHEMA_NAME:
/*!
@@ -337,7 +354,8 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_TYPE:
/*!
@@ -345,7 +363,8 @@
ARD: R/W
*/
- MYODBCDbgReturn( setTypeC( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setTypeC( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_TYPE_NAME:
/*!
@@ -371,17 +390,24 @@
ARD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
+
+ default:
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
}
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+ MYODBCDbgReturn( nReturn );
}
SQLRETURN MYODBCDesRecARD::setConciseType( SQLSMALLINT nConciseType )
{
MYODBCDbgEnter();
- MYODBCDbgReturn( setConciseTypeC( nConciseType ) );
+ SQLRETURN nReturn = setConciseTypeC( nConciseType );
+
+ MYODBCDbgReturn( nReturn );
}
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp 2006-01-31 22:38:03 UTC (rev 53)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecIPD.cpp 2006-02-01 04:27:52 UTC (rev 54)
@@ -25,6 +25,8 @@
{
MYODBCDbgEnter();
+ SQLRETURN nReturn = SQL_SUCCESS;
+
/*! \internal ODBC Rule
If an application calls SQLSetDescField to set any field other than
SQL_DESC_COUNT or the
@@ -70,7 +72,8 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_CONCISE_TYPE:
/*!
@@ -78,7 +81,8 @@
IPD: R/W
*/
- MYODBCDbgReturn( setConciseTypeC( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setConciseTypeC( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_DATA_PTR:
/*!
@@ -117,7 +121,7 @@
if ( bHasInfo )
MYODBCDbgReturn( SQL_SUCCESS_WITH_INFO );
}
- MYODBCDbgReturn( SQL_SUCCESS );
+ break;
case SQL_DESC_DATETIME_INTERVAL_CODE:
/*!
@@ -125,7 +129,8 @@
IPD: R/W
*/
- MYODBCDbgReturn( setIntervalCode( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setIntervalCode( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_DATETIME_INTERVAL_PRECISION:
/*!
@@ -144,7 +149,8 @@
or SQL_INTERVAL_SECOND data type. This field is undefined for
all other data types.
*/
- MYODBCDbgReturn( setDatetimeIntervalPrecision( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setDatetimeIntervalPrecision( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_DISPLAY_SIZE:
/*!
@@ -158,7 +164,8 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_INDICATOR_PTR:
/*!
@@ -166,7 +173,8 @@
IPD: R/W
*/
- MYODBCDbgReturn( setIndicatorPtr( (SQLINTEGER*)pValuePtr ) );
+ nReturn = setIndicatorPtr( (SQLINTEGER*)pValuePtr ) );
+ break;
case SQL_DESC_LABEL:
/*!
@@ -174,7 +182,8 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_LENGTH:
/*!
@@ -182,7 +191,8 @@
IPD: R/W
*/
- MYODBCDbgReturn( setLength( (SQLUINTEGER)pValuePtr ) );
+ nReturn = setLength( (SQLUINTEGER)pValuePtr ) );
+ break;
case SQL_DESC_LITERAL_PREFIX:
/*!
@@ -214,7 +224,8 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_NUM_PREC_RADIX:
/*!
@@ -238,10 +249,11 @@
SQLINTEGER n = (SQLINTEGER)pValuePtr;
if ( n != 0 && n != 2 && n != 10 )
- MYODBCDbgReturn( getDes()->getDia()->doAppend(
MYODBC_DIA_HY092, 0, NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY092, 0,
NULL );
+ else
+ nReturn = setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
}
-
- MYODBCDbgReturn( setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
+ break;
case SQL_DESC_OCTET_LENGTH:
/*!
@@ -256,7 +268,8 @@
For IPDs, this field is defined only for output or input/output
parameters.
*/
- MYODBCDbgReturn( setOctetLength( (SQLINTEGER)pValuePtr ) );
+ nReturn = setOctetLength( (SQLINTEGER)pValuePtr ) );
+ break;
case SQL_DESC_OCTET_LENGTH_PTR:
/*!
@@ -264,7 +277,8 @@
IPD: R/W
*/
- MYODBCDbgReturn( setOctetLengthPtr( (SQLINTEGER*)pValuePtr ) );
+ nReturn = setOctetLengthPtr( (SQLINTEGER*)pValuePtr ) );
+ break;
case SQL_DESC_PARAMETER_TYPE:
/*!
@@ -272,7 +286,8 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_PRECISION:
/*!
@@ -291,7 +306,8 @@
SQL_TYPE_TIMESTAMP, or SQL_INTERVAL_SECOND data type. This field
is undefined for all other data types.
*/
- MYODBCDbgReturn( setPrecision( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setPrecision( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_ROWVER:
/*!
@@ -299,7 +315,8 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_SCALE:
/*!
@@ -315,7 +332,8 @@
decimal and numeric data types. The field is undefined for all
other data types.
*/
- MYODBCDbgReturn( setScale( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setScale( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_SCHEMA_NAME:
/*!
@@ -335,7 +353,8 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
case SQL_DESC_TYPE:
/*!
@@ -343,7 +362,8 @@
IPD: R/W
*/
- MYODBCDbgReturn( setTypeC( (SQLSMALLINT)pValuePtr ) );
+ nReturn = setTypeC( (SQLSMALLINT)pValuePtr ) );
+ break;
case SQL_DESC_TYPE_NAME:
/*!
@@ -369,17 +389,24 @@
IPD: Unused
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0,
NULL ) );
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
+
+ default:
+ nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL );
+ break;
}
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY091, 0, NULL ) );
+ MYODBCDbgReturn( nReturn );
}
SQLRETURN MYODBCDesRecIPD::setConciseType( SQLSMALLINT nConciseType )
{
MYODBCDbgEnter();
- MYODBCDbgReturn( setConciseTypeSQL( nConciseType ) );
+ SQLRETURN nReturn = setConciseTypeSQL( nConciseType );
+
+ MYODBCDbgReturn( nReturn );
}
Modified: MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp
===================================================================
--- MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp 2006-01-31 22:38:03 UTC (rev 53)
+++ MYODBCDes/MYODBCDesLib/MYODBCDesRecIRD.cpp 2006-02-01 04:27:52 UTC (rev 54)
@@ -30,25 +30,31 @@
The DescriptorHandle argument was associated with an IRD, and the FieldIdentifier
argument was not SQL_DESC_ARRAY_STATUS_PTR or SQL_DESC_ROWS_PROCESSED_PTR.
*/
- MYODBCDbgReturn( getDes()->getDia()->doAppend( MYODBC_DIA_HY016, 0, NULL ) );
+ SQLRETURN nReturn = getDes()->getDia()->doAppend( MYODBC_DIA_HY016, 0, NULL );
+
+ MYODBCDbgReturn( nReturn );
}
SQLRETURN MYODBCDesRecIRD::setConciseType( SQLSMALLINT nConciseType )
{
MYODBCDbgEnter();
- MYODBCDbgReturn( setConciseTypeSQL( nConciseType ) );
+ SQLRETURN nReturn = setConciseTypeSQL( nConciseType );
+
+ MYODBCDbgReturn( nReturn );
}
SQLRETURN MYODBCDesRecIRD::setDefaultInteger()
{
+ MYODBCDbgEnter();
+ SQLRETURN nReturn;
+
setAutoUniqueValue( SQL_FALSE );
setBaseColumnName( "" );
setBaseTableName( "" );
setCaseSensitive( SQL_FALSE );
setCatalogName( "" );
- setConciseTypeSQL( SQL_INTEGER );
setDisplaySize( 28 );
setFixedPrecScale( SQL_TRUE );
setLabel( "" );
@@ -67,6 +73,79 @@
setUnsigned( SQL_FALSE );
setUpdatable( SQL_ATTR_READONLY );
+ /* last as it causes a validation */
+ nReturn = setConciseTypeSQL( SQL_INTEGER );
+
+ MYODBCDbgReturn( nReturn );
}
+SQLRETURN MYODBCDesRecIRD::setDefaultSmallInt()
+{
+ MYODBCDbgEnter();
+ SQLRETURN nReturn;
+
+ setAutoUniqueValue( SQL_FALSE );
+ setBaseColumnName( "" );
+ setBaseTableName( "" );
+ setCaseSensitive( SQL_FALSE );
+ setCatalogName( "" );
+ setDisplaySize( 7 );
+ setFixedPrecScale( SQL_TRUE );
+ setLabel( "" );
+ setLiteralPrefix( "" );
+ setLiteralSuffix( "" );
+ setLocalTypeName( "" );
+ setName( "" );
+ setNullable( SQL_NULLABLE_UNKNOWN );
+ setNumPrecRadix( 10 );
+ setOctetLength( 0 );
+ setPrecision( 5 );
+ setScale( 0 );
+ setSchemaName( "" );
+ setSearchable( SQL_PRED_NONE );
+ setTableName( "" );
+ setUnsigned( SQL_FALSE );
+ setUpdatable( SQL_ATTR_READONLY );
+
+ /* last as it causes validation */
+ nReturn = setConciseTypeSQL( SQL_SMALLINT );
+
+ MYODBCDbgReturn( nReturn );
+}
+
+SQLRETURN MYODBCDesRecIRD::setDefaultVarChar()
+{
+ MYODBCDbgEnter();
+
+ SQLRETURN nReturn;
+
+ setAutoUniqueValue( SQL_FALSE );
+ setBaseColumnName( "" );
+ setBaseTableName( "" );
+ setCaseSensitive( SQL_TRUE );
+ setCatalogName( "" );
+ setDisplaySize( 255 );
+ setLabel( "" );
+ setLength( 255 );
+ setLiteralPrefix( "" );
+ setLiteralSuffix( "" );
+ setLocalTypeName( "" );
+ setName( "" );
+ setNullable( SQL_NULLABLE_UNKNOWN );
+ setNumPrecRadix( 0 );
+ setOctetLength( 255 );
+ setSchemaName( "" );
+ setSearchable( SQL_PRED_NONE );
+ setTableName( "" );
+ setTypeName( "VARCHAR" );
+ setUnsigned( SQL_TRUE );
+ setUpdatable( SQL_ATTR_READONLY );
+
+ /* last as it causes validation */
+ nReturn = setConciseTypeSQL( SQL_VARCHAR );
+
+ MYODBCDbgReturn( nReturn );
+}
+
+
Modified: MYODBCDes/include/MYODBCDesRec.h
===================================================================
--- MYODBCDes/include/MYODBCDesRec.h 2006-01-31 22:38:03 UTC (rev 53)
+++ MYODBCDes/include/MYODBCDesRec.h 2006-02-01 04:27:52 UTC (rev 54)
@@ -166,6 +166,8 @@
virtual SQLRETURN setConciseTypeC( SQLSMALLINT nConciseType );
virtual SQLRETURN setConciseTypeSQL( SQLSMALLINT nConciseType );
+ virtual QString getTypeNameSQL( SQLSMALLINT nType );
+
virtual SQLRETURN doConsistencyCheck();
};
Modified: MYODBCDes/include/MYODBCDesRecIRD.h
===================================================================
--- MYODBCDes/include/MYODBCDesRecIRD.h 2006-01-31 22:38:03 UTC (rev 53)
+++ MYODBCDes/include/MYODBCDesRecIRD.h 2006-02-01 04:27:52 UTC (rev 54)
@@ -17,8 +17,8 @@
SQLRETURN setDefaultVarChar();
/* getters */
+
-
};
| Thread |
|---|
| • Connector/ODBC 5 commit: r54 - in MYODBCDes: MYODBCDesLib include | pharvey | 1 Feb |
