Modified:
MYODBCC/MYODBCCLib/MYODBCC.cpp
MYODBCC/include/MYODBCC.h
MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro
MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro
MYODBCIns/MYODBCInsLib/MYODBCIns.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsLib.pro
MYODBCIns/MYODBCInsTest/MYODBCInsTest.pro
MYODBCIns/include/MYODBCIns.h
MYODBCIns/include/MYODBCInsDataSource.h
MYODBCIns/include/MYODBCInsDriver.h
MYODBCIns/include/MYODBCInsDriverConnect.h
MYSQLPlus/MYSQLPlusLib/MConnection.cpp
MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp
MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp
MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.h
MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp
MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp
MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp
MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
MYSQLPlus/MYSQLPlusLib/MInternal.h
MYSQLPlus/MYSQLPlusLib/MResult.cpp
MYSQLPlus/MYSQLPlusLib/MResult.h
MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp
MYSQLPlus/MYSQLPlusLib/MResultPlus.h
MYSQLPlus/MYSQLPlusLib/MResultRes.h
MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
MYSQLPlus/MYSQLPlusLib/MResultStmt.h
MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
MYSQLPlus/include/M.h
MYSQLPlus/include/MConnection.h
MYSQLPlus/include/MDescriptor.h
common.pri
dltest/dltest.pro
mysql.pri
Log:
- defining 'bool' in mysql includes without checking that it exists messes up C++ apps if
redefinition is diff than the one C++ expects and depending upon order of includes etc.
(mysql win src v5.0.21)
- work around for now is to use 'BOOLEAN'
- we now avoid forcing code above MYSQLPlus from having to include mysql include files
Modified: MYODBCC/MYODBCCLib/MYODBCC.cpp
===================================================================
--- MYODBCC/MYODBCCLib/MYODBCC.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCC/MYODBCCLib/MYODBCC.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -1387,7 +1387,7 @@
free( p );
}
-bool MYODBCC::isConnectAttr( SQLINTEGER nAttribute )
+BOOLEAN MYODBCC::isConnectAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -1414,7 +1414,7 @@
return false;
}
-bool MYODBCC::isConnectOption( SQLUSMALLINT nOption )
+BOOLEAN MYODBCC::isConnectOption( SQLUSMALLINT nOption )
{
switch ( nOption )
{
@@ -1436,7 +1436,7 @@
return false;
}
-bool MYODBCC::isDiagField( SQLSMALLINT nDiagField )
+BOOLEAN MYODBCC::isDiagField( SQLSMALLINT nDiagField )
{
switch ( nDiagField )
{
@@ -1461,7 +1461,7 @@
return false;
}
-bool MYODBCC::isEnvAttr( SQLINTEGER nAttribute )
+BOOLEAN MYODBCC::isEnvAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -1475,7 +1475,7 @@
return false;
}
-bool MYODBCC::isFunctions( SQLUSMALLINT nFunction )
+BOOLEAN MYODBCC::isFunctions( SQLUSMALLINT nFunction )
{
switch ( nFunction )
{
@@ -1565,7 +1565,7 @@
return false;
}
-bool MYODBCC::isHandleType( SQLSMALLINT nHandleType )
+BOOLEAN MYODBCC::isHandleType( SQLSMALLINT nHandleType )
{
switch ( nHandleType )
{
@@ -1579,7 +1579,7 @@
return false;
}
-bool MYODBCC::isInfoType( SQLUSMALLINT nInfoType )
+BOOLEAN MYODBCC::isInfoType( SQLUSMALLINT nInfoType )
{
switch ( nInfoType )
{
@@ -1762,7 +1762,7 @@
return false;
}
-bool MYODBCC::isReturn( SQLRETURN nReturn )
+BOOLEAN MYODBCC::isReturn( SQLRETURN nReturn )
{
switch ( nReturn )
{
@@ -1781,7 +1781,7 @@
return false;
}
-bool MYODBCC::isStmtAttr( SQLINTEGER nAttribute )
+BOOLEAN MYODBCC::isStmtAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -1824,7 +1824,7 @@
return false;
}
-bool MYODBCC::isStmtOption( SQLUSMALLINT nOption )
+BOOLEAN MYODBCC::isStmtOption( SQLUSMALLINT nOption )
{
switch ( nOption )
{
@@ -1849,7 +1849,7 @@
return false;
}
-bool MYODBCC::isTypeC( SQLSMALLINT nType )
+BOOLEAN MYODBCC::isTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -1878,7 +1878,7 @@
return false;
}
-bool MYODBCC::isTypeSQL( SQLSMALLINT nType )
+BOOLEAN MYODBCC::isTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -1910,7 +1910,7 @@
return false;
}
-bool MYODBCC::isConciseTypeC( SQLSMALLINT nType )
+BOOLEAN MYODBCC::isConciseTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -1953,7 +1953,7 @@
return false;
}
-bool MYODBCC::isConciseTypeSQL( SQLSMALLINT nType )
+BOOLEAN MYODBCC::isConciseTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -1999,7 +1999,7 @@
return false;
}
-bool MYODBCC::isIntervalConciseTypeC( SQLSMALLINT nType )
+BOOLEAN MYODBCC::isIntervalConciseTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2022,7 +2022,7 @@
return false;
}
-bool MYODBCC::isIntervalConciseTypeSQL( SQLSMALLINT nType )
+BOOLEAN MYODBCC::isIntervalConciseTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2045,7 +2045,7 @@
return false;
}
-bool MYODBCC::isDateTimeCode( SQLSMALLINT nCode )
+BOOLEAN MYODBCC::isDateTimeCode( SQLSMALLINT nCode )
{
switch ( nCode )
{
@@ -2058,7 +2058,7 @@
return false;
}
-bool MYODBCC::isIntervalCode( SQLSMALLINT nCode )
+BOOLEAN MYODBCC::isIntervalCode( SQLSMALLINT nCode )
{
switch ( nCode )
{
Modified: MYODBCC/include/MYODBCC.h
===================================================================
--- MYODBCC/include/MYODBCC.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCC/include/MYODBCC.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -248,24 +248,24 @@
static errno_t doStrNCpy( SQLWCHAR *pszDest, size_t nMaxChars, const SQLWCHAR
*pszSrc, size_t nChars = _TRUNCATE );
static void doFree( void *p );
- static bool isConnectAttr( SQLINTEGER nAttribute );
- static bool isConnectOption( SQLUSMALLINT nOption );
- static bool isDiagField( SQLSMALLINT nDiagField );
- static bool isEnvAttr( SQLINTEGER nAttribute );
- static bool isFunctions( SQLUSMALLINT nFunction );
- static bool isHandleType( SQLSMALLINT nHandleType );
- static bool isInfoType( SQLUSMALLINT nInfoType );
- static bool isReturn( SQLRETURN nReturn );
- static bool isStmtAttr( SQLINTEGER nAttribute );
- static bool isStmtOption( SQLUSMALLINT nOption );
- static bool isTypeC( SQLSMALLINT nType );
- static bool isTypeSQL( SQLSMALLINT nType );
- static bool isConciseTypeC( SQLSMALLINT nType );
- static bool isConciseTypeSQL( SQLSMALLINT nType );
- static bool isIntervalConciseTypeC( SQLSMALLINT nType );
- static bool isIntervalConciseTypeSQL( SQLSMALLINT nType );
- static bool isDateTimeCode( SQLSMALLINT nCode );
- static bool isIntervalCode( SQLSMALLINT nCode );
+ static BOOLEAN isConnectAttr( SQLINTEGER nAttribute );
+ static BOOLEAN isConnectOption( SQLUSMALLINT nOption );
+ static BOOLEAN isDiagField( SQLSMALLINT nDiagField );
+ static BOOLEAN isEnvAttr( SQLINTEGER nAttribute );
+ static BOOLEAN isFunctions( SQLUSMALLINT nFunction );
+ static BOOLEAN isHandleType( SQLSMALLINT nHandleType );
+ static BOOLEAN isInfoType( SQLUSMALLINT nInfoType );
+ static BOOLEAN isReturn( SQLRETURN nReturn );
+ static BOOLEAN isStmtAttr( SQLINTEGER nAttribute );
+ static BOOLEAN isStmtOption( SQLUSMALLINT nOption );
+ static BOOLEAN isTypeC( SQLSMALLINT nType );
+ static BOOLEAN isTypeSQL( SQLSMALLINT nType );
+ static BOOLEAN isConciseTypeC( SQLSMALLINT nType );
+ static BOOLEAN isConciseTypeSQL( SQLSMALLINT nType );
+ static BOOLEAN isIntervalConciseTypeC( SQLSMALLINT nType );
+ static BOOLEAN isIntervalConciseTypeSQL( SQLSMALLINT nType );
+ static BOOLEAN isDateTimeCode( SQLSMALLINT nCode );
+ static BOOLEAN isIntervalCode( SQLSMALLINT nCode );
};
#endif
Modified: MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro 2006-05-06 05:03:19 UTC (rev 190)
@@ -10,8 +10,7 @@
include( ../../odbc.pri )
CONFIG += staticlib
CONFIG += console
-INCLUDEPATH += ../../MYODBCRtti/include
-INCLUDEPATH += ../../MYODBCC/include
+ INCLUDEPATH += ../../MYODBCC/include
# #########################################################
# UNIX
Modified: MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro
===================================================================
--- MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro 2006-05-06 05:03:19 UTC (rev 190)
@@ -8,7 +8,6 @@
include( ../../config.pri )
include( ../../defines.pri )
CONFIG += qtestlib
-INCLUDEPATH += ../../MYODBCRtti/include
INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../include
LIBS += -L../../lib
Modified: MYODBCIns/MYODBCInsLib/MYODBCIns.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCIns.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/MYODBCInsLib/MYODBCIns.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -28,7 +28,7 @@
*/
#include "MYODBCInsInternal.h"
-bool MYODBCIns::setError( const QString &stringError, DWORD nError )
+BOOLEAN MYODBCIns::setError( const QString &stringError, DWORD nError )
{
MYODBCDbgEnter();
@@ -153,7 +153,7 @@
MYODBCDbgReturn3( "%s", stringDefaultInstallLocation );
}
-bool MYODBCIns::getKeywordValues( QHash<QString,QString> *phashKeywordValues, const
QString &stringKeywordValues, DELIM nDelim )
+BOOLEAN MYODBCIns::getKeywordValues( QHash<QString,QString> *phashKeywordValues,
const QString &stringKeywordValues, DELIM nDelim )
{
MYODBCDbgEnter();
@@ -324,7 +324,7 @@
MYODBCDbgReturn3( "%s", stringlistErrors );
}
-bool MYODBCIns::doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount )
+BOOLEAN MYODBCIns::doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount )
{
MYODBCDbgEnter();
@@ -365,7 +365,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::doDeregisterDriver( const QString &stringName, bool bRemoveDSNs,
DWORD *pnUsageCount )
+BOOLEAN MYODBCIns::doDeregisterDriver( const QString &stringName, BOOLEAN
bRemoveDSNs, DWORD *pnUsageCount )
{
MYODBCDbgEnter();
@@ -386,7 +386,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOLEAN MYODBCIns::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -420,7 +420,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOLEAN MYODBCIns::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -429,7 +429,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOLEAN MYODBCIns::doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -438,22 +438,22 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::isError()
+BOOLEAN MYODBCIns::isError()
{
MYODBCDbgEnter();
- bool bReturn = SQL_SUCCEEDED( SQLInstallerError( 0, NULL, NULL, 0, NULL ) );
+ BOOLEAN bReturn = SQL_SUCCEEDED( SQLInstallerError( 0, NULL, NULL, 0, NULL ) );
MYODBCDbgReturn3( "%d", bReturn );
}
-bool MYODBCIns::isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOLEAN MYODBCIns::isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
SQLWCHAR szSectionNames[SQL_MAX_DSN_LENGTH * MYODBC_INS_MAX_DSN_NAMES];
SQLWCHAR * pszSectionName;
- bool bReturn = false;
+ BOOLEAN bReturn = false;
UWORD nScopeToRestore = ODBC_BOTH_DSN;
if ( !SQLGetConfigMode( &nScopeToRestore ) )
@@ -513,7 +513,7 @@
}
-bool MYODBCIns::isDelim( const QString &stringKeywordValues, int nScanChar, DELIM
*pnDelim )
+BOOLEAN MYODBCIns::isDelim( const QString &stringKeywordValues, int nScanChar, DELIM
*pnDelim )
{
MYODBCDbgEnter();
@@ -523,7 +523,7 @@
MYODBCDbgReturn3( "%d", false );
}
-bool MYODBCIns::isDelimKeywordValue( const QChar &charChar, DELIM *pnDelim )
+BOOLEAN MYODBCIns::isDelimKeywordValue( const QChar &charChar, DELIM *pnDelim )
{
MYODBCDbgEnter();
@@ -575,7 +575,7 @@
MYODBCDbgReturn3( "%d", false );
}
-bool MYODBCIns::isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim )
+BOOLEAN MYODBCIns::isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim )
{
MYODBCDbgEnter();
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -47,7 +47,7 @@
MYODBCDbgReturn2();
}
-bool MYODBCInsDataSource::setAttributes( const QHash<QString,QString>
&hashAttributes, bool bReplace )
+BOOLEAN MYODBCInsDataSource::setAttributes( const QHash<QString,QString>
&hashAttributes, BOOLEAN bReplace )
{
MYODBCDbgEnter();
@@ -68,7 +68,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setName( const QString &stringName )
+BOOLEAN MYODBCInsDataSource::setName( const QString &stringName )
{
MYODBCDbgEnter();
@@ -77,7 +77,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setDRIVER( const QString &stringDRIVER )
+BOOLEAN MYODBCInsDataSource::setDRIVER( const QString &stringDRIVER )
{
MYODBCDbgEnter();
@@ -86,7 +86,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setDESCRIPTION( const QString &stringDESCRIPTION )
+BOOLEAN MYODBCInsDataSource::setDESCRIPTION( const QString &stringDESCRIPTION )
{
MYODBCDbgEnter();
@@ -95,7 +95,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setSERVER( const QString &stringSERVER )
+BOOLEAN MYODBCInsDataSource::setSERVER( const QString &stringSERVER )
{
MYODBCDbgEnter();
@@ -104,7 +104,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setUID( const QString &stringUID )
+BOOLEAN MYODBCInsDataSource::setUID( const QString &stringUID )
{
MYODBCDbgEnter();
@@ -113,7 +113,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setPWD( const QString &stringPWD )
+BOOLEAN MYODBCInsDataSource::setPWD( const QString &stringPWD )
{
MYODBCDbgEnter();
@@ -122,7 +122,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setDATABASE( const QString &stringDATABASE )
+BOOLEAN MYODBCInsDataSource::setDATABASE( const QString &stringDATABASE )
{
MYODBCDbgEnter();
@@ -131,7 +131,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setPORT( const QString &stringPORT )
+BOOLEAN MYODBCInsDataSource::setPORT( const QString &stringPORT )
{
MYODBCDbgEnter();
@@ -140,7 +140,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setSOCKET( const QString &stringSOCKET )
+BOOLEAN MYODBCInsDataSource::setSOCKET( const QString &stringSOCKET )
{
MYODBCDbgEnter();
@@ -149,7 +149,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setSTMT( const QString &stringSTMT )
+BOOLEAN MYODBCInsDataSource::setSTMT( const QString &stringSTMT )
{
MYODBCDbgEnter();
@@ -158,7 +158,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setOPTION( const QString &stringOPTION )
+BOOLEAN MYODBCInsDataSource::setOPTION( const QString &stringOPTION )
{
MYODBCDbgEnter();
@@ -167,7 +167,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setMode( DATASOURCE_MODE nMode )
+BOOLEAN MYODBCInsDataSource::setMode( DATASOURCE_MODE nMode )
{
MYODBCDbgEnter();
@@ -176,7 +176,7 @@
MYODBCDbgReturn3( "%d", true )
}
-bool MYODBCInsDataSource::setScope( DATASOURCE_SCOPE nScope )
+BOOLEAN MYODBCInsDataSource::setScope( DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -285,7 +285,7 @@
MYODBCDbgReturn3( "%d", nScope );
}
-bool MYODBCInsDataSource::doRead( const QString &stringDataSourceName,
DATASOURCE_SCOPE nScope )
+BOOLEAN MYODBCInsDataSource::doRead( const QString &stringDataSourceName,
DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -294,7 +294,7 @@
SQLWCHAR sValue[4096];
int nChars = 0;
UWORD nScopeToRestore = ODBC_BOTH_DSN;
- bool bReturn = false;
+ BOOLEAN bReturn = false;
if ( stringDataSourceName.isEmpty() )
MYODBCDbgReturn3( "%d", false )
@@ -383,29 +383,29 @@
MYODBCDbgReturn3( "%d", bReturn );
}
-bool MYODBCInsDataSource::doRead( const QString &stringDataSourceName )
+BOOLEAN MYODBCInsDataSource::doRead( const QString &stringDataSourceName )
{
MYODBCDbgEnter();
- bool bReturn = doRead( stringDataSourceName, nScope );
+ BOOLEAN bReturn = doRead( stringDataSourceName, nScope );
MYODBCDbgReturn3( "%d", bReturn );
}
-bool MYODBCInsDataSource::doRead()
+BOOLEAN MYODBCInsDataSource::doRead()
{
MYODBCDbgEnter();
- bool bReturn = doRead( stringName, nScope );
+ BOOLEAN bReturn = doRead( stringName, nScope );
MYODBCDbgReturn3( "%d", bReturn );
}
-bool MYODBCInsDataSource::doWrite( DATASOURCE_SCOPE nScope )
+BOOLEAN MYODBCInsDataSource::doWrite( DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
- bool bReturn = false;
+ BOOLEAN bReturn = false;
UWORD nScopeToRestore = ODBC_BOTH_DSN;
if ( !SQLGetConfigMode( &nScopeToRestore ) )
@@ -449,11 +449,11 @@
MYODBCDbgReturn3( "%d", bReturn );
}
-bool MYODBCInsDataSource::doWrite()
+BOOLEAN MYODBCInsDataSource::doWrite()
{
MYODBCDbgEnter();
- bool bReturn = doWrite( nScope );
+ BOOLEAN bReturn = doWrite( nScope );
MYODBCDbgReturn3( "%d", bReturn );
}
@@ -482,16 +482,16 @@
MYODBCDbgReturn2();
}
-bool MYODBCInsDataSource::doDelete( const QString &stringDataSourceName )
+BOOLEAN MYODBCInsDataSource::doDelete( const QString &stringDataSourceName )
{
MYODBCDbgEnter();
- bool bReturn = SQLRemoveDSNFromIni( stringDataSourceName.utf16() );
+ BOOLEAN bReturn = SQLRemoveDSNFromIni( stringDataSourceName.utf16() );
MYODBCDbgReturn3( "%d", bReturn );
}
-bool MYODBCInsDataSource::isValidAttributes( const QHash<QString,QString>
&hashAttributes )
+BOOLEAN MYODBCInsDataSource::isValidAttributes( const QHash<QString,QString>
&hashAttributes )
{
MYODBCDbgEnter();
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -29,7 +29,7 @@
#include "MYODBCInsInternal.h"
-bool MYODBCInsDriver::setFriendlyName( const QString &stringFriendlyName )
+BOOLEAN MYODBCInsDriver::setFriendlyName( const QString &stringFriendlyName )
{
MYODBCDbgEnter();
@@ -38,7 +38,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCInsDriver::setDRIVER( const QString &stringDriverFileName )
+BOOLEAN MYODBCInsDriver::setDRIVER( const QString &stringDriverFileName )
{
MYODBCDbgEnter();
@@ -47,7 +47,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCInsDriver::setSETUP( const QString &stringSetupFileName )
+BOOLEAN MYODBCInsDriver::setSETUP( const QString &stringSetupFileName )
{
MYODBCDbgEnter();
@@ -118,7 +118,7 @@
MYODBCDbgReturn3( "%s", psz );
}
-bool MYODBCInsDriver::doRead( const QString &stringFriendlyName )
+BOOLEAN MYODBCInsDriver::doRead( const QString &stringFriendlyName )
{
MYODBCDbgEnter();
@@ -177,7 +177,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCInsDriver::doWrite()
+BOOLEAN MYODBCInsDriver::doWrite()
{
MYODBCDbgEnter();
@@ -203,11 +203,11 @@
MYODBCDbgReturn2();
}
-bool MYODBCInsDriver::doDelete( const QString &stringDriverName, bool
bRemoveDataSourceNames, LPDWORD pnUsageCount )
+BOOLEAN MYODBCInsDriver::doDelete( const QString &stringDriverName, BOOLEAN
bRemoveDataSourceNames, LPDWORD pnUsageCount )
{
MYODBCDbgEnter();
- bool b = SQLRemoveDriver( stringDriverName.utf16(), bRemoveDataSourceNames,
pnUsageCount );
+ BOOLEAN b = SQLRemoveDriver( stringDriverName.utf16(), bRemoveDataSourceNames,
pnUsageCount );
MYODBCDbgReturn3( "%d", b );
}
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -40,7 +40,7 @@
MYODBCDbgReturn2();
}
-bool MYODBCInsDriverConnect::setConnectString( const QString &stringConnectString )
+BOOLEAN MYODBCInsDriverConnect::setConnectString( const QString &stringConnectString
)
{
MYODBCDbgEnter();
@@ -87,7 +87,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCInsDriverConnect::setConnectMethod( DRIVERCONNECT_METHOD nConnectMethod )
+BOOLEAN MYODBCInsDriverConnect::setConnectMethod( DRIVERCONNECT_METHOD nConnectMethod )
{
MYODBCDbgEnter();
@@ -96,7 +96,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCInsDriverConnect::setPrompt( DRIVERCONNECT_PROMPT nPrompt )
+BOOLEAN MYODBCInsDriverConnect::setPrompt( DRIVERCONNECT_PROMPT nPrompt )
{
MYODBCDbgEnter();
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsLib.pro
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsLib.pro 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsLib.pro 2006-05-06 05:03:19 UTC (rev 190)
@@ -13,6 +13,9 @@
INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../../MYODBCDbg/include
INCLUDEPATH += ../include
+LIBS += -L../../lib
+LIBS += -lMYODBCDbg
+LIBS += -lMYODBCC
# #########################################################
# UNIX
Modified: MYODBCIns/MYODBCInsTest/MYODBCInsTest.pro
===================================================================
--- MYODBCIns/MYODBCInsTest/MYODBCInsTest.pro 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/MYODBCInsTest/MYODBCInsTest.pro 2006-05-06 05:03:19 UTC (rev 190)
@@ -17,8 +17,11 @@
LIBS += -lMYODBCDbg
LIBS += -lMYODBCC
+# #########################################################
+# WIN
+# #########################################################
win32 {
- LIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib
+# LIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib
}
# #########################################################
Modified: MYODBCIns/include/MYODBCIns.h
===================================================================
--- MYODBCIns/include/MYODBCIns.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/include/MYODBCIns.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -86,7 +86,7 @@
This uses SQLPostInstallerError().
*/
- static bool setError( const QString &stringMessage, DWORD nErrorCode =
ODBC_ERROR_GENERAL_ERR );
+ static BOOLEAN setError( const QString &stringMessage, DWORD nErrorCode =
ODBC_ERROR_GENERAL_ERR );
/*!
\brief Gets a list of registered drivers.
@@ -134,7 +134,7 @@
\retval true The parse succeeded
\retval false The parse failed. The reason can be found using getError().
*/
- static bool MYODBCIns::getKeywordValues( QHash<QString,QString>
*phashKeywordValues, const QString &stringKeywordValues, DELIM nDelim = DELIM_BOTH );
+ static BOOLEAN MYODBCIns::getKeywordValues( QHash<QString,QString>
*phashKeywordValues, const QString &stringKeywordValues, DELIM nDelim = DELIM_BOTH );
/*!
\brief Get the error stored at location nError.
@@ -165,7 +165,7 @@
This uses SQLInstallDriverEx().
*/
- static bool doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount = NULL );
+ static BOOLEAN doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount = NULL );
/*!
\brief Deregisters a driver.
@@ -179,39 +179,39 @@
This uses SQLRemoveDriver().
*/
- static bool doDeregisterDriver( const QString &stringName, bool bRemoveDSNs =
false, DWORD *pnUsageCount = NULL );
+ static BOOLEAN doDeregisterDriver( const QString &stringName, BOOLEAN bRemoveDSNs
= false, DWORD *pnUsageCount = NULL );
/*!
\brief Inserts a new data source into the ODBC sys info.
*/
- static bool doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOLEAN doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
/*!
\brief Updates an existing data source in the ODBC sys info.
*/
- static bool doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOLEAN doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
/*!
\brief Deletes an existing data source from the ODBC sys info.
*/
- static bool doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOLEAN doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
/*!
\brief Use this to check if there are installer errors.
*/
- static bool isError();
+ static BOOLEAN isError();
/*!
\brief Use this to check if a data source name exists in the ODBC sys info.
*/
- static bool isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOLEAN isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
protected:
/*!
\brief Use this to check if a character is a keyword/value pair delimiter or a
end-of-string marker.
*/
- static bool isDelim( const QString &stringKeywordValues, int nScanChar, DELIM
*pnDelim );
+ static BOOLEAN isDelim( const QString &stringKeywordValues, int nScanChar, DELIM
*pnDelim );
/*!
\brief Use this to check if a character is a keyword/value pair delimiter.
@@ -222,7 +222,7 @@
\note Auto detection is not fool proof and as such the use of DELIM_BOTH is not
recommended.
*/
- static bool isDelimKeywordValue( const QChar &charChar, DELIM *pnDelim );
+ static BOOLEAN isDelimKeywordValue( const QChar &charChar, DELIM *pnDelim );
/*!
\brief Use this to check if a character is a end-of-string marker for a
keyword/value string.
@@ -234,7 +234,7 @@
omitted. This means that the end-of-string marker (in this case a single
'\0') can act as
both a keyword/value pair delimiter and as the end-of-string marker.
*/
- static bool isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim );
+ static BOOLEAN isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim );
};
#endif
Modified: MYODBCIns/include/MYODBCInsDataSource.h
===================================================================
--- MYODBCIns/include/MYODBCInsDataSource.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/include/MYODBCInsDataSource.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -91,20 +91,20 @@
};
- bool setAttributes( const QHash<QString,QString> &hashAttributes, bool
bReplace = true );
- bool setName( const QString &stringName );
- bool setDRIVER( const QString &stringDRIVER );
- bool setDESCRIPTION( const QString &stringDESCRIPTION );
- bool setSERVER( const QString &stringSERVER );
- bool setUID( const QString &stringUID );
- bool setPWD( const QString &stringPWD );
- bool setDATABASE( const QString &stringDATABASE );
- bool setPORT( const QString &stringPORT );
- bool setSOCKET( const QString &stringSOCKET );
- bool setSTMT( const QString &stringSTMT );
- bool setOPTION( const QString &stringOPTION );
- bool setMode( DATASOURCE_MODE nMode );
- bool setScope( DATASOURCE_SCOPE nScope );
+ BOOLEAN setAttributes( const QHash<QString,QString> &hashAttributes,
BOOLEAN bReplace = true );
+ BOOLEAN setName( const QString &stringName );
+ BOOLEAN setDRIVER( const QString &stringDRIVER );
+ BOOLEAN setDESCRIPTION( const QString &stringDESCRIPTION );
+ BOOLEAN setSERVER( const QString &stringSERVER );
+ BOOLEAN setUID( const QString &stringUID );
+ BOOLEAN setPWD( const QString &stringPWD );
+ BOOLEAN setDATABASE( const QString &stringDATABASE );
+ BOOLEAN setPORT( const QString &stringPORT );
+ BOOLEAN setSOCKET( const QString &stringSOCKET );
+ BOOLEAN setSTMT( const QString &stringSTMT );
+ BOOLEAN setOPTION( const QString &stringOPTION );
+ BOOLEAN setMode( DATASOURCE_MODE nMode );
+ BOOLEAN setScope( DATASOURCE_SCOPE nScope );
QString getName();
QString getDRIVER();
@@ -120,15 +120,15 @@
DATASOURCE_MODE getMode();
DATASOURCE_SCOPE getScope();
- bool doRead( const QString &stringDataSourceName, DATASOURCE_SCOPE nScope );
- bool doRead( const QString &stringDataSourceName );
- bool doRead();
- bool doWrite( DATASOURCE_SCOPE nScope );
- bool doWrite();
+ BOOLEAN doRead( const QString &stringDataSourceName, DATASOURCE_SCOPE nScope );
+ BOOLEAN doRead( const QString &stringDataSourceName );
+ BOOLEAN doRead();
+ BOOLEAN doWrite( DATASOURCE_SCOPE nScope );
+ BOOLEAN doWrite();
void doClear();
- static bool doDelete( const QString &stringDataSourceName );
+ static BOOLEAN doDelete( const QString &stringDataSourceName );
- bool isValidAttributes( const QHash<QString,QString> &hashAttributes );
+ BOOLEAN isValidAttributes( const QHash<QString,QString> &hashAttributes );
MYODBCInsDataSource operator=( MYODBCInsDataSource rval );
friend QTextStream &operator<<( QTextStream &stream, const
MYODBCInsDataSource &rval );
Modified: MYODBCIns/include/MYODBCInsDriver.h
===================================================================
--- MYODBCIns/include/MYODBCInsDriver.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/include/MYODBCInsDriver.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -61,9 +61,9 @@
class MYODBCInsDriver
{
public:
- bool setFriendlyName( const QString &stringFriendlyName );
- bool setDRIVER( const QString &stringDriverFileName );
- bool setSETUP( const QString &stringSetupFileName );
+ BOOLEAN setFriendlyName( const QString &stringFriendlyName );
+ BOOLEAN setDRIVER( const QString &stringDriverFileName );
+ BOOLEAN setSETUP( const QString &stringSetupFileName );
QString getFriendlyName();
QString getDRIVER();
@@ -71,10 +71,10 @@
static SQLWCHAR *getAttributesNullDelim( const QString &stringFriendlyName, const
QString &stringDRIVER, const QString &stringSETUP );
SQLWCHAR *getAttributesNullDelim();
- bool doRead( const QString &stringFriendlyName );
- bool doWrite();
+ BOOLEAN doRead( const QString &stringFriendlyName );
+ BOOLEAN doWrite();
void doClear();
- static bool doDelete( const QString &stringDriverName, bool
bRemoveDataSourceNames, LPDWORD pnUsageCount );
+ static BOOLEAN doDelete( const QString &stringDriverName, BOOLEAN
bRemoveDataSourceNames, LPDWORD pnUsageCount );
MYODBCInsDriver operator=( MYODBCInsDriver rval );
friend QTextStream &operator<<( QTextStream &stream, const
MYODBCInsDriver &rval );
Modified: MYODBCIns/include/MYODBCInsDriverConnect.h
===================================================================
--- MYODBCIns/include/MYODBCInsDriverConnect.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYODBCIns/include/MYODBCInsDriverConnect.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -70,9 +70,9 @@
DRIVERCONNECT_PROMPT nPrompt =
DRIVERCONNECT_PROMPT_NOPROMPT );
- bool setConnectString( const QString &stringConnectString );
- bool setConnectMethod( DRIVERCONNECT_METHOD nConnectMethod );
- bool setPrompt( DRIVERCONNECT_PROMPT nPrompt );
+ BOOLEAN setConnectString( const QString &stringConnectString );
+ BOOLEAN setConnectMethod( DRIVERCONNECT_METHOD nConnectMethod );
+ BOOLEAN setPrompt( DRIVERCONNECT_PROMPT nPrompt );
QString getConnectString();
DRIVERCONNECT_METHOD getConnectMethod();
@@ -81,14 +81,14 @@
protected:
QString stringDriverFriendlyName; /*!< friendly name - we intercept the DRIVER
attribute as it is diffrent than in DSN */
- bool setMode( DATASOURCE_MODE ) { return false; }
- bool setScope( DATASOURCE_SCOPE ) { return false; }
+ BOOLEAN setMode( DATASOURCE_MODE ) { return false; }
+ BOOLEAN setScope( DATASOURCE_SCOPE ) { return false; }
DATASOURCE_MODE getMode() { return nMode; }
DATASOURCE_SCOPE getScope() { return nScope; }
- bool doWrite( DATASOURCE_SCOPE ) { return false; }
- bool doWrite() { return false; }
+ BOOLEAN doWrite( DATASOURCE_SCOPE ) { return false; }
+ BOOLEAN doWrite() { return false; }
void doClear() {}
DRIVERCONNECT_METHOD nConnectMethod; /*!< SQLDriverConnect() using a DSN or a
DRIVER to connect. */
Modified: MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -496,7 +496,7 @@
MYODBCDbgReturn3( "%d", nStatementType );
}
-MYSQL *MConnection::getMySQL()
+SQLHANDLE MConnection::getMySQL()
{
MYODBCDbgEnter();
@@ -640,7 +640,7 @@
ulong nFlags = getClientFlag( datasource.getOPTION().toULong(), datasource.getSTMT()
);
/* ask mysql for a connection */
- if ( !mysql_real_connect( pMySQL,
+ if ( !mysql_real_connect( (MYSQL*)pMySQL,
datasource.getSERVER().toUtf8().data(),
datasource.getUID().toUtf8().data(),
datasource.getPWD().toUtf8().data(),
@@ -649,8 +649,8 @@
datasource.getSOCKET().toUtf8().data(),
(uint)nFlags ) )
{
- pDiagnostic->doAppend( MDiagnostic::DIA_HY000, mysql_errno( pMySQL ),
mysql_error( pMySQL ) );
- mysql_close( pMySQL );
+ pDiagnostic->doAppend( MDiagnostic::DIA_HY000, mysql_errno( (MYSQL*)pMySQL ),
mysql_error( (MYSQL*)pMySQL ) );
+ mysql_close( (MYSQL*)pMySQL );
pMySQL = NULL;
MYODBCDbgReturn( SQL_ERROR );
}
@@ -699,7 +699,7 @@
MYODBCDbgReturn( SQL_ERROR );
}
-bool MConnection::setState( STATE nState )
+BOOLEAN MConnection::setState( STATE nState )
{
MYODBCDbgEnter();
@@ -708,7 +708,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MConnection::setServerAliveSanityCheckInterval( int nMilliseconds )
+BOOLEAN MConnection::setServerAliveSanityCheckInterval( int nMilliseconds )
{
MYODBCDbgEnter();
@@ -839,8 +839,8 @@
/*! \todo check each statement for state */
/* try to switch databases */
- if ( mysql_select_db( pMySQL, stringCurrentCatalog.toUtf8().data() ) )
- MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_3D000,
mysql_errno( pMySQL ), mysql_error( pMySQL ) ) );
+ if ( mysql_select_db( (MYSQL*)pMySQL, stringCurrentCatalog.toUtf8().data() ) )
+ MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_3D000,
mysql_errno( (MYSQL*)pMySQL ), mysql_error( (MYSQL*)pMySQL ) ) );
}
this->stringCurrentCatalog = stringCurrentCatalog;
@@ -1122,17 +1122,17 @@
#ifdef __WIN__
if ( nOptions & MYODBC_FLAG_NAMED_PIPE )
- mysql_options( pMySQL, MYSQL_OPT_NAMED_PIPE, NULL );
+ mysql_options( (MYSQL*)pMySQL, MYSQL_OPT_NAMED_PIPE, NULL );
#endif
if ( nOptions & MYODBC_FLAG_USE_MYCNF )
- mysql_options( pMySQL, MYSQL_READ_DEFAULT_GROUP, "odbc" );
+ mysql_options( (MYSQL*)pMySQL, MYSQL_READ_DEFAULT_GROUP, "odbc" );
if ( !stringSTMT.isEmpty() )
- mysql_options( pMySQL, MYSQL_INIT_COMMAND, stringSTMT.toUtf8().data() );
+ mysql_options( (MYSQL*)pMySQL, MYSQL_INIT_COMMAND, stringSTMT.toUtf8().data() );
- mysql_options( pMySQL, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&nLoginTimeout );
+ mysql_options( (MYSQL*)pMySQL, MYSQL_OPT_CONNECT_TIMEOUT, (const char
*)&nLoginTimeout );
return nClientFlag;
}
@@ -1180,7 +1180,7 @@
if ( getState() >= STATE_C4 )
{
- int nReturn = mysql_ping( pMySQL );
+ int nReturn = mysql_ping( (MYSQL*)pMySQL );
switch ( nReturn )
{
case 0:
@@ -1295,13 +1295,13 @@
{
MYODBCDbgEnter();
- if ( !doServerAliveSanityCheck() || mysql_real_query( pMySQL,
stringCommand.toUtf8().data(), stringCommand.length() ) )
- MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000, mysql_errno(
pMySQL ), mysql_error( pMySQL ) ) );
+ if ( !doServerAliveSanityCheck() || mysql_real_query( (MYSQL*)pMySQL,
stringCommand.toUtf8().data(), stringCommand.length() ) )
+ MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000, mysql_errno(
(MYSQL*)pMySQL ), mysql_error( (MYSQL*)pMySQL ) ) );
MYODBCDbgReturn( SQL_SUCCESS );
}
-bool MConnection::doServerAliveSanityCheck()
+BOOLEAN MConnection::doServerAliveSanityCheck()
{
if ( timeLastQuery.restart() >= getServerAliveSanityCheckInterval() )
{
@@ -1312,10 +1312,10 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MConnection::isTransactionSupport()
+BOOLEAN MConnection::isTransactionSupport()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", (pMySQL->server_capabilities & CLIENT_TRANSACTIONS) );
+ MYODBCDbgReturn3( "%d", (((MYSQL*)pMySQL)->server_capabilities &
CLIENT_TRANSACTIONS) );
}
Modified: MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -318,7 +318,7 @@
SQL_DESC_COUNT)
\retval MYODBC_C_FALSE failed
*/
-SQLRETURN MDescriptor::setCount( SQLSMALLINT nCount, bool bUnbind )
+SQLRETURN MDescriptor::setCount( SQLSMALLINT nCount, BOOLEAN bUnbind )
{
MYODBCDbgEnter();
Modified: MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -52,7 +52,7 @@
SQLRETURN MDescriptorRecord::setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType,
SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr,
SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr )
{
- bool bHasInfo = false;
+ BOOLEAN bHasInfo = false;
SQLRETURN nReturn = SQL_SUCCESS;
MYODBCDbgEnter();
@@ -450,7 +450,7 @@
SQLRETURN MDescriptorRecord::getDescRec( SQLWCHAR *pszName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT *pnSubTypePtr,
SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr,
SQLSMALLINT *pnNullablePtr )
{
SQLRETURN nReturn;
- bool bHasInfo = false;
+ BOOLEAN bHasInfo = false;
SQLINTEGER nStringLength;
MYODBCDbgEnter();
@@ -966,7 +966,7 @@
MYODBCDbgReturn( SQL_SUCCESS );
}
-bool MDescriptorRecord::isBound()
+BOOLEAN MDescriptorRecord::isBound()
{
MYODBCDbgEnter();
Modified: MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MDescriptorRecord.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -135,7 +135,7 @@
virtual SQLRETURN doConsistencyCheck();
/* isers */
- virtual bool isBound();
+ virtual BOOLEAN isBound();
private:
/* some of these 'fields' will be calculated and not stored in the future */
Modified: MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MDescriptorRecordAPD.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -91,7 +91,7 @@
APD: R/W
*/
{
- bool bHasInfo = false;
+ BOOLEAN bHasInfo = false;
SQLRETURN nReturn = setDataPtr( pValuePtr );
if ( nReturn == SQL_SUCCESS_WITH_INFO )
Modified: MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MDescriptorRecordARD.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -91,7 +91,7 @@
ARD: R/W
*/
{
- bool bHasInfo = false;
+ BOOLEAN bHasInfo = false;
SQLRETURN nReturn = setDataPtr( pValuePtr );
if ( nReturn == SQL_SUCCESS_WITH_INFO )
Modified: MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MDescriptorRecordIPD.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -87,7 +87,7 @@
IPD: R/W
*/
{
- bool bHasInfo = false;
+ BOOLEAN bHasInfo = false;
SQLRETURN nReturn = setDataPtr( pValuePtr );
if ( nReturn == SQL_SUCCESS_WITH_INFO )
Modified: MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -98,7 +98,7 @@
SQLRETURN MDiagnosticRecord::getDiagRec( SQLWCHAR *psSqlstate, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *pszMessageText, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnTextLengthPtr )
{
SQLRETURN nReturn;
- bool bHasInfo = false;
+ BOOLEAN bHasInfo = false;
SQLSMALLINT nStringLength;
MYODBCDbgEnter();
Modified: MYSQLPlus/MYSQLPlusLib/MInternal.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MInternal.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MInternal.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -3,6 +3,10 @@
#include "../include/M.h"
+#include <my_global.h>
+#include <mysql.h>
+#include <errmsg.h>
+
#include <MYODBCDbg.h>
#include <MYODBCIns.h>
Modified: MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -60,9 +60,9 @@
MYODBCDbgReturn2();
}
-bool MResult::isValidColumn( uint nColumn )
+BOOLEAN MResult::isValidColumn( uint nColumn )
{
- bool b;
+ BOOLEAN b;
MYODBCDbgEnter();
Modified: MYSQLPlus/MYSQLPlusLib/MResult.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResult.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MResult.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -51,9 +51,9 @@
virtual SQLRETURN doSkip( qlonglong nRows ) = 0;
/* isers */
- virtual bool isValidColumn( uint nColumn );
- virtual bool isValidRow() = 0;
- virtual bool isValidRow( qulonglong nRow ) = 0;
+ virtual BOOLEAN isValidColumn( uint nColumn );
+ virtual BOOLEAN isValidRow() = 0;
+ virtual BOOLEAN isValidRow( qulonglong nRow ) = 0;
protected:
Modified: MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -382,9 +382,9 @@
MYODBCDbgReturn( SQL_SUCCESS );
}
-bool MResultPlus::isValidRow()
+BOOLEAN MResultPlus::isValidRow()
{
- bool b;
+ BOOLEAN b;
MYODBCDbgEnter();
@@ -393,9 +393,9 @@
MYODBCDbgReturn3( "%d", b );
}
-bool MResultPlus::isValidRow( qulonglong nRow )
+BOOLEAN MResultPlus::isValidRow( qulonglong nRow )
{
- bool b;
+ BOOLEAN b;
MYODBCDbgEnter();
Modified: MYSQLPlus/MYSQLPlusLib/MResultPlus.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultPlus.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MResultPlus.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -54,8 +54,8 @@
SQLRETURN doGetTypeInfo( SQLSMALLINT nDataType ); /*<! \sa SQLGetTypeInfo */
- bool isValidRow();
- bool isValidRow( qulonglong nRow );
+ BOOLEAN isValidRow();
+ BOOLEAN isValidRow( qulonglong nRow );
protected:
Modified: MYSQLPlus/MYSQLPlusLib/MResultRes.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultRes.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MResultRes.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -42,8 +42,8 @@
SQLRETURN doPrev();
SQLRETURN doSkip( qlonglong nRows );
- bool isValidRow();
- bool isValidRow( qulonglong nRow );
+ BOOLEAN isValidRow();
+ BOOLEAN isValidRow( qulonglong nRow );
protected:
Modified: MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp 2006-05-06 05:03:19 UTC (rev 190)
@@ -1003,14 +1003,14 @@
The current row is either valid or position at 0 (invalid). When the current
row is positioned
at 0; a doNext will do same as a doFirst while a doPrev will do same as a
doLast.
- \return bool
+ \return BOOLEAN
\sa getRow
getRows
*/
-bool MResultStmt::isValidRow()
+BOOLEAN MResultStmt::isValidRow()
{
- bool b;
+ BOOLEAN b;
MYODBCDbgEnter();
@@ -1027,12 +1027,12 @@
\param nRow Row to be checked.
- \return bool
+ \return BOOLEAN
\sa getRow
getRows
*/
-bool MResultStmt::isValidRow( qulonglong nRow )
+BOOLEAN MResultStmt::isValidRow( qulonglong nRow )
{
SQLRETURN nReturn;
qulonglong nRows;
Modified: MYSQLPlus/MYSQLPlusLib/MResultStmt.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultStmt.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusLib/MResultStmt.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -45,8 +45,8 @@
SQLRETURN doSkip( qlonglong nRows );
SQLRETURN doRefresh();
- bool isValidRow();
- bool isValidRow( qulonglong nRow );
+ BOOLEAN isValidRow();
+ BOOLEAN isValidRow( qulonglong nRow );
protected:
Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-06 05:03:19 UTC (rev 190)
@@ -7,6 +7,8 @@
include( ../../common.pri )
include( ../../config.pri )
include( ../../defines.pri )
+include( ../../odbc.pri )
+include( ../../mysql.pri )
CONFIG += qtestlib
INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../../MYODBCDbg/include
@@ -18,18 +20,29 @@
LIBS += -lMYODBCDbg
LIBS += -lMYODBCC
-include( ../../odbc.pri )
-include( ../../mysql.pri )
-
# #########################################################
# WIN
# #########################################################
win32 {
+# This lib is needed to resolve a couple of symbols used in odbc installer library.
LIBS += user32.lib
- LIBS += /VERBOSE:LIB /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib
/NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib
+
+# The default link for mysql client is /MT but for Qt it is /MD. This may cause conflicts
during
+# link-time (multiply defined symbols). One can use /NODEFAULTLIB to give one way
precedence over
+# other or one may edit the Qt qmake spec file to change /MD to /MT.
+
+# Uncomment following line when you want /MT (static run-time which is LIBCMT.lib based)
to have precedence.
+# LIBS += /VERBOSE:LIB /NODEFAULTLIB:libc.lib /NODEFAULTLIB:msvcrt.lib
/NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib
+
+# Uncomment following line when you want /MD (dynamic run-time which is
MSVCRT.lib/MSVCR80.DLL based) to have precedence.
+# LIBS += /VERBOSE:LIB /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib
/NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib
+
+# Or simply remove all default libraries and append only those libs which are desired.
+# LIBS += /NODEFAULTLIB
+# LIBS += kernel32.lib user32.lib odbccp32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
+
}
-
# #########################################################
# FILES
# #########################################################
Modified: MYSQLPlus/include/M.h
===================================================================
--- MYSQLPlus/include/M.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/include/M.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -14,10 +14,6 @@
#include <QByteArray>
#include <QDateTime>
-#include <my_global.h>
-#include <mysql.h>
-#include <errmsg.h>
-
/* connection flags - this list needs to be cleaned up */
#define MYODBC_FLAG_FIELD_LENGTH 1 /* field_length instead of max_length */
#define MYODBC_FLAG_FOUND_ROWS 2 /* Access can't handle affected_rows */
Modified: MYSQLPlus/include/MConnection.h
===================================================================
--- MYSQLPlus/include/MConnection.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/include/MConnection.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -42,7 +42,7 @@
STATE getState();
STATEMENT_TYPE getStatementType();
- MYSQL * getMySQL();
+ SQLHANDLE getMySQL();
/* doers */
SQLRETURN doBrowseConnect( SQLWCHAR *psInConnectionString, SQLSMALLINT
nStringLength1, SQLWCHAR *psOutConnectionString, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnStringLength2Ptr );
@@ -55,8 +55,8 @@
protected:
/* setters */
- bool setState( STATE nState );
- bool setServerAliveSanityCheckInterval( int nMilliseconds );
+ BOOLEAN setState( STATE nState );
+ BOOLEAN setServerAliveSanityCheckInterval( int nMilliseconds );
SQLRETURN setAccessMode( SQLUINTEGER nAccessMode );
SQLRETURN setAsyncEnable( SQLUINTEGER nAsyncEnable );
@@ -99,17 +99,17 @@
/* doers */
SQLRETURN doSubmitCommand( const QString &stringCommand );
- bool doServerAliveSanityCheck();
+ BOOLEAN doServerAliveSanityCheck();
/* iser */
- bool isTransactionSupport();
+ BOOLEAN isTransactionSupport();
private:
- STATE nState; /*!< our current state
*/
- MDiagnostic * pDiagnostic; /*!< our diagnostic information
*/
- MYSQL * pMySQL; /*!< main mysql connection handle, others may
be used internally */
- STATEMENT_TYPE nStatementType; /*!< tells us which MStatement based class we
are going to work with */
- QTime timeLastQuery; /*!< part of ensuring we keep our connection
*/
+ STATE nState; /*!< our current state
*/
+ MDiagnostic * pDiagnostic; /*!< our diagnostic information
*/
+ SQLHANDLE pMySQL; /*!< SQLHANDLE instead of MYSQL* so we can
avoid *forcing* someone to include mysql headers */
+ STATEMENT_TYPE nStatementType; /*!< tells us which MStatement based class we
are going to work with */
+ QTime timeLastQuery; /*!< part of ensuring we keep our connection
*/
int nServerAliveSanityCheckInterval; /*!< milliseconds between queries
which we consider a connection check needed */
SQLUINTEGER nAccessMode; /*!< SQL_ATTR_ACCESS_MODE */
Modified: MYSQLPlus/include/MDescriptor.h
===================================================================
--- MYSQLPlus/include/MDescriptor.h 2006-05-05 06:05:41 UTC (rev 189)
+++ MYSQLPlus/include/MDescriptor.h 2006-05-06 05:03:19 UTC (rev 190)
@@ -87,7 +87,7 @@
virtual SQLRETURN setArrayStatusPtr( SQLUSMALLINT *pnArrayStatusPtr );
virtual SQLRETURN setBindOffsetPtr( SQLINTEGER *pnBindOffsetPtr );
virtual SQLRETURN setBindType( SQLINTEGER nBindType );
- virtual SQLRETURN setCount( SQLSMALLINT nCount, bool bUnbind = false );
+ virtual SQLRETURN setCount( SQLSMALLINT nCount, BOOLEAN bUnbind = false );
virtual SQLRETURN setRowsProcessedPtr( SQLUINTEGER *pnRowsProcessedPtr );
/* getters */
Modified: common.pri
===================================================================
--- common.pri 2006-05-05 06:05:41 UTC (rev 189)
+++ common.pri 2006-05-06 05:03:19 UTC (rev 190)
@@ -6,9 +6,15 @@
UI_DIR = .tmp
MOC_DIR = .tmp
+# #########################################################
+# WIN
+# #########################################################
win32 {
}
+# #########################################################
+# UNIX
+# #########################################################
unix {
}
Modified: dltest/dltest.pro
===================================================================
--- dltest/dltest.pro 2006-05-05 06:05:41 UTC (rev 189)
+++ dltest/dltest.pro 2006-05-06 05:03:19 UTC (rev 190)
@@ -18,14 +18,15 @@
DESTDIR = ../bin
include( ../common.pri )
include( ../config.pri )
+include( ../defines.pri )
CONFIG -= qt
CONFIG += console
-include( ../defines.pri )
# #########################################################
# WIN
# #########################################################
win32 {
+
}
# #########################################################
Modified: mysql.pri
===================================================================
--- mysql.pri 2006-05-05 06:05:41 UTC (rev 189)
+++ mysql.pri 2006-05-06 05:03:19 UTC (rev 190)
@@ -20,7 +20,7 @@
# #########################################################
win32 {
DEFINES += DBUG_OFF _DBUG_OFF NDEBUG _NDEBUG
- DEFINES += _WIN32 WIN32 _WINDOWS __WIN__
+# DEFINES += _WIN32 WIN32 _WINDOWS __WIN__
INCLUDEPATH += "C:\Program Files\MySQL\MySQL Server 5.0\include"
LIBS += -L"C:\Program Files\MySQL\MySQL Server 5.0\lib\opt" libmysql.lib zlib.lib
# LIBS += -L"C:\Program Files\MySQL\MySQL Server 5.0\lib\opt" mysqlclient.lib zlib.lib
| Thread |
|---|
| • Connector/ODBC 5 commit: r190 - / MYODBCC/MYODBCCLib MYODBCC/include MYODBCDbg/MYODBCDbgLib MYODBCDbg/MYODBCDbgTest MYODBCIns/MYODBCInsLib MYODBCIns/M... | pharvey | 6 May |
