Modified:
trunk/
trunk/Driver/Driver/Library/SQLGetFunctions.cpp
trunk/Driver/Driver/Tests/MYODBCDriverTest.h
trunk/Driver/Driver/Tests/TSTAllocHandleDbc.c
trunk/Driver/Driver/Tests/TSTAllocHandleEnv.c
trunk/Driver/Driver/Tests/TSTAllocHandleStm.c
trunk/Driver/Driver/Tests/TSTColumns.c
trunk/Driver/Driver/Tests/TSTConnect.c
trunk/Driver/Driver/Tests/TSTCreateTable.c
trunk/Driver/Driver/Tests/TSTDelete.c
trunk/Driver/Driver/Tests/TSTDisconnect.c
trunk/Driver/Driver/Tests/TSTDriverConnect.c
trunk/Driver/Driver/Tests/TSTDropTable.c
trunk/Driver/Driver/Tests/TSTExecute.c
trunk/Driver/Driver/Tests/TSTFetch.c
trunk/Driver/Driver/Tests/TSTFiniStm.c
trunk/Driver/Driver/Tests/TSTForeignKeys.c
trunk/Driver/Driver/Tests/TSTFreeHandleDbc.c
trunk/Driver/Driver/Tests/TSTFreeHandleEnv.c
trunk/Driver/Driver/Tests/TSTFreeHandleStm.c
trunk/Driver/Driver/Tests/TSTGetData.c
trunk/Driver/Driver/Tests/TSTGetTypeInfo.c
trunk/Driver/Driver/Tests/TSTInitStm.c
trunk/Driver/Driver/Tests/TSTInsert.c
trunk/Driver/Driver/Tests/TSTNumResultCols.c
trunk/Driver/Driver/Tests/TSTPrepare.c
trunk/Driver/Driver/Tests/TSTPrimaryKeys.c
trunk/Driver/Driver/Tests/TSTSelect.c
trunk/Driver/Driver/Tests/TSTSetEnvAttr.c
trunk/Driver/Driver/Tests/TSTSpecialColumns.c
trunk/Driver/Driver/Tests/TSTStatistics.c
trunk/Driver/Driver/Tests/TSTTables.c
trunk/Driver/Driver/Tests/TSTUpdate.c
trunk/SDK/C/Library/MYODBCC.cpp
trunk/SDK/C/include/MYODBCC.h
trunk/SDK/Installer/Library/MYODBCIns.cpp
trunk/SDK/Installer/Library/MYODBCInsDataSource.cpp
trunk/SDK/Installer/Library/MYODBCInsDriver.cpp
trunk/SDK/Installer/Library/MYODBCInsDriverConnect.cpp
trunk/SDK/Installer/include/MYODBCIns.h
trunk/SDK/Installer/include/MYODBCInsDataSource.h
trunk/SDK/Installer/include/MYODBCInsDriver.h
trunk/SDK/Installer/include/MYODBCInsDriverConnect.h
trunk/SDK/MYSQLPlus/Library/MCommand.cpp
trunk/SDK/MYSQLPlus/Library/MCommand.h
trunk/SDK/MYSQLPlus/Library/MCommands.cpp
trunk/SDK/MYSQLPlus/Library/MCommands.h
trunk/SDK/MYSQLPlus/Library/MConnection.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.h
trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp
trunk/SDK/MYSQLPlus/Library/MResult.cpp
trunk/SDK/MYSQLPlus/Library/MResult.h
trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
trunk/SDK/MYSQLPlus/Library/MResultPlus.h
trunk/SDK/MYSQLPlus/Library/MResultRes.cpp
trunk/SDK/MYSQLPlus/Library/MResultRes.h
trunk/SDK/MYSQLPlus/Library/MStatement.cpp
trunk/SDK/MYSQLPlus/include/MConnection.h
trunk/SDK/MYSQLPlus/include/MDescriptor.h
trunk/SDK/MYSQLPlus/include/MStatement.h
trunk/SDK/Tst/include/MYODBCTst.h
Log:
r806@cheng: jbalint | 2006-10-13 20:56:32 -0400
Re: UNIX port -> BOOLEAN to BOOL type conversion (UNIX doesn't have BOOLEAN type)
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
+ 23770081-651f-0410-8754-a6a0be119b88:/work/c-odbc:806
Modified: trunk/Driver/Driver/Library/SQLGetFunctions.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetFunctions.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Library/SQLGetFunctions.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -225,7 +225,7 @@
SQL_TRUE if the specified function is supported by the driver, and SQL_FALSE if
it is not supported.
*/
{
- BOOLEAN bFound = false;
+ BOOL bFound = false;
*pnSupported = SQL_FALSE;
for ( nIndex = 0; nIndex < MYODBCDrvSupportedFunctionsSize; nIndex++ )
Modified: trunk/Driver/Driver/Tests/MYODBCDriverTest.h
===================================================================
--- trunk/Driver/Driver/Tests/MYODBCDriverTest.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/MYODBCDriverTest.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -95,36 +95,36 @@
extern SQLHSTMT hStm;
extern SQLSMALLINT nCols;
-BOOLEAN TSTAllocHandleDbc();
-BOOLEAN TSTAllocHandleEnv();
-BOOLEAN TSTAllocHandleStm();
-BOOLEAN TSTColumns();
-BOOLEAN TSTCreateTable();
-BOOLEAN TSTDelete();
-BOOLEAN TSTDisconnect();
-BOOLEAN TSTConnect();
-BOOLEAN TSTDriverConnect();
-BOOLEAN TSTDropTable();
-BOOLEAN TSTExecute();
-BOOLEAN TSTFetch();
-BOOLEAN TSTFiniStm();
-BOOLEAN TSTForeignKeys();
-BOOLEAN TSTFreeHandleDbc();
-BOOLEAN TSTFreeHandleEnv();
-BOOLEAN TSTFreeHandleStm();
-BOOLEAN TSTGetData();
-BOOLEAN TSTGetTypeInfo();
-BOOLEAN TSTInitStm();
-BOOLEAN TSTInsert();
-BOOLEAN TSTNumResultCols();
-BOOLEAN TSTPrepare();
-BOOLEAN TSTPrimaryKeys();
-BOOLEAN TSTSelect();
-BOOLEAN TSTSetEnvAttr();
-BOOLEAN TSTSpecialColumns();
-BOOLEAN TSTStatistics();
-BOOLEAN TSTTables();
-BOOLEAN TSTUpdate();
+BOOL TSTAllocHandleDbc();
+BOOL TSTAllocHandleEnv();
+BOOL TSTAllocHandleStm();
+BOOL TSTColumns();
+BOOL TSTCreateTable();
+BOOL TSTDelete();
+BOOL TSTDisconnect();
+BOOL TSTConnect();
+BOOL TSTDriverConnect();
+BOOL TSTDropTable();
+BOOL TSTExecute();
+BOOL TSTFetch();
+BOOL TSTFiniStm();
+BOOL TSTForeignKeys();
+BOOL TSTFreeHandleDbc();
+BOOL TSTFreeHandleEnv();
+BOOL TSTFreeHandleStm();
+BOOL TSTGetData();
+BOOL TSTGetTypeInfo();
+BOOL TSTInitStm();
+BOOL TSTInsert();
+BOOL TSTNumResultCols();
+BOOL TSTPrepare();
+BOOL TSTPrimaryKeys();
+BOOL TSTSelect();
+BOOL TSTSetEnvAttr();
+BOOL TSTSpecialColumns();
+BOOL TSTStatistics();
+BOOL TSTTables();
+BOOL TSTUpdate();
#endif
Modified: trunk/Driver/Driver/Tests/TSTAllocHandleDbc.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTAllocHandleDbc.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTAllocHandleDbc.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTAllocHandleDbc()
+BOOL TSTAllocHandleDbc()
{
if ( !SQL_SUCCEEDED( MYODBCTstAllocHandle( SQL_HANDLE_DBC, hEnv, &hDbc ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTAllocHandleEnv.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTAllocHandleEnv.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTAllocHandleEnv.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTAllocHandleEnv()
+BOOL TSTAllocHandleEnv()
{
if ( !SQL_SUCCEEDED( MYODBCTstAllocHandle( SQL_HANDLE_ENV, NULL, &hEnv ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTAllocHandleStm.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTAllocHandleStm.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTAllocHandleStm.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTAllocHandleStm()
+BOOL TSTAllocHandleStm()
{
if ( !SQL_SUCCEEDED( MYODBCTstAllocHandle( SQL_HANDLE_STMT, hDbc, &hStm ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTColumns.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTColumns.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTColumns.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTColumns()
+BOOL TSTColumns()
{
SQLTCHAR * pszCatalog = NULL;
SQLTCHAR * pszSchema = NULL;
Modified: trunk/Driver/Driver/Tests/TSTConnect.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTConnect.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTConnect.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -29,7 +29,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTConnect()
+BOOL TSTConnect()
{
if ( !SQL_SUCCEEDED( MYODBCTstConnect( hDbc, MYODBC_DRV_TST_SERVERNAME, SQL_NTS,
MYODBC_DRV_TST_USERNAME, SQL_NTS, MYODBC_DRV_TST_AUTHENTICATION, SQL_NTS ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTCreateTable.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTCreateTable.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTCreateTable.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTCreateTable()
+BOOL TSTCreateTable()
{
if ( !TSTDropTable() )
return FALSE;
Modified: trunk/Driver/Driver/Tests/TSTDelete.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTDelete.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTDelete.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTDelete()
+BOOL TSTDelete()
{
if ( !SQL_SUCCEEDED( MYODBCTstExecDirect( hStm, MYODBC_DRV_TST_DELETE, SQL_NTS ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTDisconnect.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTDisconnect.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTDisconnect.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTDisconnect()
+BOOL TSTDisconnect()
{
if ( !SQL_SUCCEEDED( MYODBCTstDisconnect( hDbc ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTDriverConnect.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTDriverConnect.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTDriverConnect.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -29,7 +29,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTDriverConnect()
+BOOL TSTDriverConnect()
{
/*
We do not have a SQLHWND (window handle) so pass in a NULL. The result
Modified: trunk/Driver/Driver/Tests/TSTDropTable.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTDropTable.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTDropTable.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTDropTable()
+BOOL TSTDropTable()
{
if ( !SQL_SUCCEEDED( MYODBCTstExecDirect( hStm, MYODBC_DRV_TST_DROP_TABLE, SQL_NTS )
) )
{
Modified: trunk/Driver/Driver/Tests/TSTExecute.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTExecute.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTExecute.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTExecute()
+BOOL TSTExecute()
{
/* mysql SQLCHAR * pszSQL = "SELECT now() AS DueDate"; */
SQLTCHAR * pszSQL = TEXT("SELECT 1");
Modified: trunk/Driver/Driver/Tests/TSTFetch.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTFetch.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTFetch.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTFetch()
+BOOL TSTFetch()
{
if ( !SQL_SUCCEEDED( MYODBCTstFetch( hStm ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTFiniStm.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTFiniStm.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTFiniStm.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTFiniStm()
+BOOL TSTFiniStm()
{
if ( !TSTFreeHandleStm() )
return FALSE;
Modified: trunk/Driver/Driver/Tests/TSTForeignKeys.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTForeignKeys.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTForeignKeys.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTForeignKeys()
+BOOL TSTForeignKeys()
{
if ( !SQL_SUCCEEDED( MYODBCTstForeignKeys( hStm,
TEXT(""),
Modified: trunk/Driver/Driver/Tests/TSTFreeHandleDbc.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTFreeHandleDbc.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTFreeHandleDbc.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTFreeHandleDbc()
+BOOL TSTFreeHandleDbc()
{
if ( !SQL_SUCCEEDED( MYODBCTstFreeHandle( SQL_HANDLE_DBC, hDbc ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTFreeHandleEnv.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTFreeHandleEnv.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTFreeHandleEnv.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTFreeHandleEnv()
+BOOL TSTFreeHandleEnv()
{
if ( !SQL_SUCCEEDED( MYODBCTstFreeHandle( SQL_HANDLE_ENV, hEnv ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTFreeHandleStm.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTFreeHandleStm.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTFreeHandleStm.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTFreeHandleStm()
+BOOL TSTFreeHandleStm()
{
if ( !SQL_SUCCEEDED( MYODBCTstFreeHandle( SQL_HANDLE_STMT, hStm ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTGetData.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTGetData.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTGetData.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTGetData()
+BOOL TSTGetData()
{
SQLINTEGER nRowsExpected = 51;
SQLSMALLINT nCol = 0;
Modified: trunk/Driver/Driver/Tests/TSTGetTypeInfo.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTGetTypeInfo.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTGetTypeInfo.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTGetTypeInfo()
+BOOL TSTGetTypeInfo()
{
if ( !SQL_SUCCEEDED( MYODBCTstGetTypeInfo( hStm, SQL_ALL_TYPES ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTInitStm.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTInitStm.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTInitStm.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTInitStm()
+BOOL TSTInitStm()
{
if ( !TSTAllocHandleEnv() )
return FALSE;
Modified: trunk/Driver/Driver/Tests/TSTInsert.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTInsert.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTInsert.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTInsert()
+BOOL TSTInsert()
{
if ( !SQL_SUCCEEDED( MYODBCTstExecDirect( hStm, MYODBC_DRV_TST_INSERT1, SQL_NTS ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTNumResultCols.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTNumResultCols.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTNumResultCols.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTNumResultCols()
+BOOL TSTNumResultCols()
{
SQLSMALLINT nColsExpected = 19; /* 19 = columns in resultset from SQLGetTypeInfo() */
Modified: trunk/Driver/Driver/Tests/TSTPrepare.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTPrepare.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTPrepare.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTPrepare()
+BOOL TSTPrepare()
{
/* mysql SQLCHAR *pszSQL = "SELECT now() AS DueDate"; */
SQLTCHAR *pszSQL = TEXT("SELECT 1");
Modified: trunk/Driver/Driver/Tests/TSTPrimaryKeys.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTPrimaryKeys.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTPrimaryKeys.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTPrimaryKeys()
+BOOL TSTPrimaryKeys()
{
SQLTCHAR * pszCatalog = NULL;
SQLTCHAR * pszSchema = NULL;
Modified: trunk/Driver/Driver/Tests/TSTSelect.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTSelect.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTSelect.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTSelect()
+BOOL TSTSelect()
{
if ( !SQL_SUCCEEDED( MYODBCTstExecDirect( hStm, MYODBC_DRV_TST_SELECT, SQL_NTS ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTSetEnvAttr.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTSetEnvAttr.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTSetEnvAttr.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTSetEnvAttr()
+BOOL TSTSetEnvAttr()
{
if ( !SQL_SUCCEEDED( MYODBCTstSetEnvAttr( hEnv, SQL_ATTR_ODBC_VERSION,
(SQLPOINTER)SQL_OV_ODBC3, 0 ) ) )
{
Modified: trunk/Driver/Driver/Tests/TSTSpecialColumns.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTSpecialColumns.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTSpecialColumns.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTSpecialColumns()
+BOOL TSTSpecialColumns()
{
SQLUSMALLINT nColType = SQL_ROWVER;
SQLTCHAR * pszCatalog = NULL;
Modified: trunk/Driver/Driver/Tests/TSTStatistics.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTStatistics.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTStatistics.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTStatistics()
+BOOL TSTStatistics()
{
SQLTCHAR * pszCatalog = NULL;
SQLTCHAR * pszSchema = NULL;
Modified: trunk/Driver/Driver/Tests/TSTTables.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTTables.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTTables.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTTables()
+BOOL TSTTables()
{
SQLTCHAR * pszCatalog = NULL;
SQLTCHAR * pszSchema = NULL;
Modified: trunk/Driver/Driver/Tests/TSTUpdate.c
===================================================================
--- trunk/Driver/Driver/Tests/TSTUpdate.c 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/Driver/Driver/Tests/TSTUpdate.c 2006-10-23 04:43:51 UTC (rev 610)
@@ -27,7 +27,7 @@
*/
#include "MYODBCDriverTest.h"
-BOOLEAN TSTUpdate()
+BOOL TSTUpdate()
{
SQLCHAR szOld[100];
SQLCHAR szNew[100];
Modified: trunk/SDK/C/Library/MYODBCC.cpp
===================================================================
--- trunk/SDK/C/Library/MYODBCC.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/C/Library/MYODBCC.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -2109,12 +2109,12 @@
1. the dest string is always null terminated (unless buffer is not
provided)
2. considers truncation
- \return BOOLEAN
+ \return BOOL
\retval true Copy completed with no warnings/errors
false Copy completed but result was truncated due to lack of space in
dest buffer
*/
-BOOLEAN MYODBCC::doStringCopyOut( SQLCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLCHAR
*pszSrc )
+BOOL MYODBCC::doStringCopyOut( SQLCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLCHAR
*pszSrc )
{
SQLINTEGER nIndex = 0;
@@ -2161,12 +2161,12 @@
\param pszSrc The source string. This must be null terminated.
\param pnSrcLenCharsPtr Optional buffer to return the string length (in
chars) of pszSrc.
- \return BOOLEAN
+ \return BOOL
\retval true Copy completed with no warnings/errors
false Copy completed but result was truncated due to lack of space in
dest buffer
*/
-BOOLEAN MYODBCC::doStringCopyOut( SQLWCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLWCHAR
*pszSrc, SQLINTEGER *pnSrcLenCharsPtr )
+BOOL MYODBCC::doStringCopyOut( SQLWCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLWCHAR
*pszSrc, SQLINTEGER *pnSrcLenCharsPtr )
{
SQLINTEGER nSrcLenChars = 0;
SQLINTEGER *pnSrcLenChars = pnSrcLenCharsPtr;
@@ -2208,7 +2208,7 @@
free( p );
}
-BOOLEAN MYODBCC::isQuoteNeededSQL( SQLSMALLINT nType )
+BOOL MYODBCC::isQuoteNeededSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2233,7 +2233,7 @@
return false;
}
-BOOLEAN MYODBCC::isConnectAttr( SQLINTEGER nAttribute )
+BOOL MYODBCC::isConnectAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -2260,7 +2260,7 @@
return false;
}
-BOOLEAN MYODBCC::isConnectOption( SQLUSMALLINT nOption )
+BOOL MYODBCC::isConnectOption( SQLUSMALLINT nOption )
{
switch ( nOption )
{
@@ -2282,7 +2282,7 @@
return false;
}
-BOOLEAN MYODBCC::isDiagField( SQLSMALLINT nDiagField )
+BOOL MYODBCC::isDiagField( SQLSMALLINT nDiagField )
{
switch ( nDiagField )
{
@@ -2307,7 +2307,7 @@
return false;
}
-BOOLEAN MYODBCC::isEnvAttr( SQLINTEGER nAttribute )
+BOOL MYODBCC::isEnvAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -2321,7 +2321,7 @@
return false;
}
-BOOLEAN MYODBCC::isFunctions( SQLUSMALLINT nFunction )
+BOOL MYODBCC::isFunctions( SQLUSMALLINT nFunction )
{
switch ( nFunction )
{
@@ -2411,7 +2411,7 @@
return false;
}
-BOOLEAN MYODBCC::isHandleType( SQLSMALLINT nHandleType )
+BOOL MYODBCC::isHandleType( SQLSMALLINT nHandleType )
{
switch ( nHandleType )
{
@@ -2425,7 +2425,7 @@
return false;
}
-BOOLEAN MYODBCC::isInfoType( SQLUSMALLINT nInfoType )
+BOOL MYODBCC::isInfoType( SQLUSMALLINT nInfoType )
{
switch ( nInfoType )
{
@@ -2608,7 +2608,7 @@
return false;
}
-BOOLEAN MYODBCC::isReturn( SQLRETURN nReturn )
+BOOL MYODBCC::isReturn( SQLRETURN nReturn )
{
switch ( nReturn )
{
@@ -2627,7 +2627,7 @@
return false;
}
-BOOLEAN MYODBCC::isStmtAttr( SQLINTEGER nAttribute )
+BOOL MYODBCC::isStmtAttr( SQLINTEGER nAttribute )
{
switch ( nAttribute )
{
@@ -2670,7 +2670,7 @@
return false;
}
-BOOLEAN MYODBCC::isStmtOption( SQLUSMALLINT nOption )
+BOOL MYODBCC::isStmtOption( SQLUSMALLINT nOption )
{
switch ( nOption )
{
@@ -2695,7 +2695,7 @@
return false;
}
-BOOLEAN MYODBCC::isTypeC( SQLSMALLINT nType )
+BOOL MYODBCC::isTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2725,7 +2725,7 @@
return false;
}
-BOOLEAN MYODBCC::isTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCC::isTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2757,7 +2757,7 @@
return false;
}
-BOOLEAN MYODBCC::isConciseTypeC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYODBCC::isConciseTypeC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
{
/*!
\internal ODBC RULE
@@ -2836,7 +2836,7 @@
return false;
}
-BOOLEAN MYODBCC::isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYODBCC::isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
{
/*!
\internal ODBC RULE
@@ -2916,7 +2916,7 @@
return false;
}
-BOOLEAN MYODBCC::isIntervalConciseTypeC( SQLSMALLINT nType )
+BOOL MYODBCC::isIntervalConciseTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2939,7 +2939,7 @@
return false;
}
-BOOLEAN MYODBCC::isIntervalConciseTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCC::isIntervalConciseTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -2962,7 +2962,7 @@
return false;
}
-BOOLEAN MYODBCC::isDateTimeCode( SQLSMALLINT nCode )
+BOOL MYODBCC::isDateTimeCode( SQLSMALLINT nCode )
{
switch ( nCode )
{
@@ -2975,7 +2975,7 @@
return false;
}
-BOOLEAN MYODBCC::isIntervalCode( SQLSMALLINT nCode )
+BOOL MYODBCC::isIntervalCode( SQLSMALLINT nCode )
{
switch ( nCode )
{
@@ -2998,7 +2998,7 @@
return false;
}
-BOOLEAN MYODBCC::isCharTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCC::isCharTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3014,7 +3014,7 @@
return false;
}
-BOOLEAN MYODBCC::isBinTypeSQL( SQLSMALLINT nType )
+BOOL MYODBCC::isBinTypeSQL( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3027,7 +3027,7 @@
return false;
}
-BOOLEAN MYODBCC::isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+BOOL MYODBCC::isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
{
/*!
\internal ODBC RULE
@@ -3069,7 +3069,7 @@
}
-BOOLEAN MYODBCC::isCharTypeC( SQLSMALLINT nType )
+BOOL MYODBCC::isCharTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3080,7 +3080,7 @@
return false;
}
-BOOLEAN MYODBCC::isBinTypeC( SQLSMALLINT nType )
+BOOL MYODBCC::isBinTypeC( SQLSMALLINT nType )
{
switch ( nType )
{
@@ -3091,7 +3091,7 @@
return false;
}
-BOOLEAN MYODBCC::isBooleanValue( SQLINTEGER nValue )
+BOOL MYODBCC::isBooleanValue( SQLINTEGER nValue )
{
switch ( nValue )
{
@@ -3103,7 +3103,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescField( SQLSMALLINT nField )
+BOOL MYODBCC::isDescField( SQLSMALLINT nField )
{
switch ( nField )
{
@@ -3155,7 +3155,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescAllocType( SQLSMALLINT nAllocType )
+BOOL MYODBCC::isDescAllocType( SQLSMALLINT nAllocType )
{
switch ( nAllocType )
{
@@ -3167,7 +3167,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescBindType( SQLINTEGER nBindType )
+BOOL MYODBCC::isDescBindType( SQLINTEGER nBindType )
{
switch ( nBindType )
{
@@ -3180,7 +3180,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescNullable( SQLSMALLINT nNullable )
+BOOL MYODBCC::isDescNullable( SQLSMALLINT nNullable )
{
switch ( nNullable )
{
@@ -3193,7 +3193,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescParameterType( SQLSMALLINT nParameterType )
+BOOL MYODBCC::isDescParameterType( SQLSMALLINT nParameterType )
{
switch ( nParameterType )
{
@@ -3206,7 +3206,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescSearchable( SQLSMALLINT nSearchable )
+BOOL MYODBCC::isDescSearchable( SQLSMALLINT nSearchable )
{
switch ( nSearchable )
{
@@ -3220,7 +3220,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescUnnamed( SQLSMALLINT nUnnamed )
+BOOL MYODBCC::isDescUnnamed( SQLSMALLINT nUnnamed )
{
switch ( nUnnamed )
{
@@ -3232,7 +3232,7 @@
return false;
}
-BOOLEAN MYODBCC::isDescUpdatable( SQLSMALLINT nUpdatable )
+BOOL MYODBCC::isDescUpdatable( SQLSMALLINT nUpdatable )
{
switch ( nUpdatable )
{
Modified: trunk/SDK/C/include/MYODBCC.h
===================================================================
--- trunk/SDK/C/include/MYODBCC.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/C/include/MYODBCC.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -552,11 +552,11 @@
static QList<QObject*> getChildren( const QObject *pObject, const QString
&stringObjectName, bool bStartsWith = false );
static void * doMemCpy( void *pDest, const void *pSrc, size_t nBytes );
- static BOOLEAN doStringCopyOut( SQLCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLCHAR
*pszSrc );
- static BOOLEAN doStringCopyOut( SQLWCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLWCHAR
*pszSrc, SQLINTEGER *pnSrcLenChars = NULL );
+ static BOOL doStringCopyOut( SQLCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLCHAR
*pszSrc );
+ static BOOL doStringCopyOut( SQLWCHAR *pszDest, SQLINTEGER nDestMaxChars, SQLWCHAR
*pszSrc, SQLINTEGER *pnSrcLenChars = NULL );
static void doFree( void *p );
- static BOOLEAN isQuoteNeededSQL( SQLSMALLINT nType );
+ static BOOL isQuoteNeededSQL( SQLSMALLINT nType );
/*!
\name Method argument/attribute value validators.
@@ -572,38 +572,38 @@
a need to call these.
*/
/*@{*/
- 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, SQLINTEGER nODBCVersion =
SQL_OV_ODBC3 );
- static BOOLEAN isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion =
SQL_OV_ODBC3 );
- static BOOLEAN isIntervalConciseTypeC( SQLSMALLINT nType );
- static BOOLEAN isIntervalConciseTypeSQL( SQLSMALLINT nType );
- static BOOLEAN isDateTimeCode( SQLSMALLINT nCode );
- static BOOLEAN isIntervalCode( SQLSMALLINT nCode );
- static BOOLEAN isCharTypeSQL( SQLSMALLINT nType );
- static BOOLEAN isBinTypeSQL( SQLSMALLINT nType );
- static BOOLEAN isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion =
SQL_OV_ODBC3 );
- static BOOLEAN isCharTypeC( SQLSMALLINT nType );
- static BOOLEAN isBinTypeC( SQLSMALLINT nType );
- static BOOLEAN isBooleanValue( SQLINTEGER nValue );
- static BOOLEAN isDescField( SQLSMALLINT nField );
- static BOOLEAN isDescAllocType( SQLSMALLINT nAllocType );
- static BOOLEAN isDescBindType( SQLINTEGER nBindType );
- static BOOLEAN isDescNullable( SQLSMALLINT nNullable );
- static BOOLEAN isDescParameterType( SQLSMALLINT nParameterType );
- static BOOLEAN isDescSearchable( SQLSMALLINT nSearchable );
- static BOOLEAN isDescUnnamed( SQLSMALLINT nUnnamed );
- static BOOLEAN isDescUpdatable( SQLSMALLINT nUpdatable );
+ 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, SQLINTEGER nODBCVersion = SQL_OV_ODBC3
);
+ static BOOL isConciseTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion =
SQL_OV_ODBC3 );
+ static BOOL isIntervalConciseTypeC( SQLSMALLINT nType );
+ static BOOL isIntervalConciseTypeSQL( SQLSMALLINT nType );
+ static BOOL isDateTimeCode( SQLSMALLINT nCode );
+ static BOOL isIntervalCode( SQLSMALLINT nCode );
+ static BOOL isCharTypeSQL( SQLSMALLINT nType );
+ static BOOL isBinTypeSQL( SQLSMALLINT nType );
+ static BOOL isDateTimeTypeSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion =
SQL_OV_ODBC3 );
+ static BOOL isCharTypeC( SQLSMALLINT nType );
+ static BOOL isBinTypeC( SQLSMALLINT nType );
+ static BOOL isBooleanValue( SQLINTEGER nValue );
+ static BOOL isDescField( SQLSMALLINT nField );
+ static BOOL isDescAllocType( SQLSMALLINT nAllocType );
+ static BOOL isDescBindType( SQLINTEGER nBindType );
+ static BOOL isDescNullable( SQLSMALLINT nNullable );
+ static BOOL isDescParameterType( SQLSMALLINT nParameterType );
+ static BOOL isDescSearchable( SQLSMALLINT nSearchable );
+ static BOOL isDescUnnamed( SQLSMALLINT nUnnamed );
+ static BOOL isDescUpdatable( SQLSMALLINT nUpdatable );
/*@}*/
};
Modified: trunk/SDK/Installer/Library/MYODBCIns.cpp
===================================================================
--- trunk/SDK/Installer/Library/MYODBCIns.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Installer/Library/MYODBCIns.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCInsInternal.h"
-BOOLEAN MYODBCIns::setError( const QString &stringError, DWORD nError )
+BOOL MYODBCIns::setError( const QString &stringError, DWORD nError )
{
MYODBCDbgEnter();
@@ -153,7 +153,7 @@
MYODBCDbgReturn1( stringDefaultInstallLocation );
}
-BOOLEAN MYODBCIns::getKeywordValues( QHash<QString,QString> *phashKeywordValues,
const QString &stringKeywordValues, DELIM nDelim )
+BOOL MYODBCIns::getKeywordValues( QHash<QString,QString> *phashKeywordValues, const
QString &stringKeywordValues, DELIM nDelim )
{
MYODBCDbgEnter();
@@ -341,7 +341,7 @@
MYODBCDbgReturn3( "%p", stringlistErrors );
}
-BOOLEAN MYODBCIns::doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount )
+BOOL MYODBCIns::doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount )
{
MYODBCDbgEnter();
@@ -382,7 +382,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCIns::doDeregisterDriver( const QString &stringName, BOOLEAN
bRemoveDSNs, DWORD *pnUsageCount )
+BOOL MYODBCIns::doDeregisterDriver( const QString &stringName, BOOL bRemoveDSNs,
DWORD *pnUsageCount )
{
MYODBCDbgEnter();
@@ -403,7 +403,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCIns::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOL MYODBCIns::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -437,7 +437,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCIns::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOL MYODBCIns::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -446,7 +446,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCIns::doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOL MYODBCIns::doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -456,27 +456,27 @@
Implement Scope.
*/
- BOOLEAN b = MYODBCInsDataSource::doDelete( stringName );
+ BOOL b = MYODBCInsDataSource::doDelete( stringName );
MYODBCDbgReturn3( "%d", b );
}
-BOOLEAN MYODBCIns::isError()
+BOOL MYODBCIns::isError()
{
MYODBCDbgEnter();
- BOOLEAN bReturn = SQL_SUCCEEDED( SQLInstallerError( 0, NULL, NULL, 0, NULL ) );
+ BOOL bReturn = SQL_SUCCEEDED( SQLInstallerError( 0, NULL, NULL, 0, NULL ) );
MYODBCDbgReturn3( "%d", bReturn );
}
-BOOLEAN MYODBCIns::isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
+BOOL MYODBCIns::isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
SQLWCHAR szSectionNames[SQL_MAX_DSN_LENGTH * MYODBC_INS_MAX_DSN_NAMES];
SQLWCHAR * pszSectionName;
- BOOLEAN bReturn = false;
+ BOOL bReturn = false;
UWORD nScopeToRestore = ODBC_BOTH_DSN;
if ( !SQLGetConfigMode( &nScopeToRestore ) )
@@ -536,7 +536,7 @@
}
-BOOLEAN MYODBCIns::isDelim( const QString &stringKeywordValues, int nScanChar, DELIM
*pnDelim )
+BOOL MYODBCIns::isDelim( const QString &stringKeywordValues, int nScanChar, DELIM
*pnDelim )
{
MYODBCDbgEnter();
@@ -546,7 +546,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MYODBCIns::isDelimKeywordValue( const QChar &charChar, DELIM *pnDelim )
+BOOL MYODBCIns::isDelimKeywordValue( const QChar &charChar, DELIM *pnDelim )
{
MYODBCDbgEnter();
@@ -598,7 +598,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MYODBCIns::isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim )
+BOOL MYODBCIns::isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim )
{
MYODBCDbgEnter();
Modified: trunk/SDK/Installer/Library/MYODBCInsDataSource.cpp
===================================================================
--- trunk/SDK/Installer/Library/MYODBCInsDataSource.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Installer/Library/MYODBCInsDataSource.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -47,7 +47,7 @@
MYODBCDbgReturn2();
}
-BOOLEAN MYODBCInsDataSource::setAttributes( const QHash<QString,QString>
&hashAttributes, BOOLEAN bReplace, BOOLEAN bStrict )
+BOOL MYODBCInsDataSource::setAttributes( const QHash<QString,QString>
&hashAttributes, BOOL bReplace, BOOL bStrict )
{
MYODBCDbgEnter();
@@ -70,7 +70,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setName( const QString &stringName )
+BOOL MYODBCInsDataSource::setName( const QString &stringName )
{
MYODBCDbgEnter();
@@ -79,7 +79,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setDRIVER( const QString &stringDRIVER )
+BOOL MYODBCInsDataSource::setDRIVER( const QString &stringDRIVER )
{
MYODBCDbgEnter();
@@ -88,7 +88,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setDESCRIPTION( const QString &stringDESCRIPTION )
+BOOL MYODBCInsDataSource::setDESCRIPTION( const QString &stringDESCRIPTION )
{
MYODBCDbgEnter();
@@ -97,7 +97,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setSERVER( const QString &stringSERVER )
+BOOL MYODBCInsDataSource::setSERVER( const QString &stringSERVER )
{
MYODBCDbgEnter();
@@ -106,7 +106,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setUID( const QString &stringUID )
+BOOL MYODBCInsDataSource::setUID( const QString &stringUID )
{
MYODBCDbgEnter();
@@ -115,7 +115,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setPWD( const QString &stringPWD )
+BOOL MYODBCInsDataSource::setPWD( const QString &stringPWD )
{
MYODBCDbgEnter();
@@ -124,7 +124,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setDATABASE( const QString &stringDATABASE )
+BOOL MYODBCInsDataSource::setDATABASE( const QString &stringDATABASE )
{
MYODBCDbgEnter();
@@ -133,7 +133,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setPORT( const QString &stringPORT )
+BOOL MYODBCInsDataSource::setPORT( const QString &stringPORT )
{
MYODBCDbgEnter();
@@ -142,7 +142,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setSOCKET( const QString &stringSOCKET )
+BOOL MYODBCInsDataSource::setSOCKET( const QString &stringSOCKET )
{
MYODBCDbgEnter();
@@ -151,7 +151,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setSTMT( const QString &stringSTMT )
+BOOL MYODBCInsDataSource::setSTMT( const QString &stringSTMT )
{
MYODBCDbgEnter();
@@ -160,7 +160,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setOPTION( const QString &stringOPTION )
+BOOL MYODBCInsDataSource::setOPTION( const QString &stringOPTION )
{
MYODBCDbgEnter();
@@ -169,7 +169,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setMode( DATASOURCE_MODE nMode )
+BOOL MYODBCInsDataSource::setMode( DATASOURCE_MODE nMode )
{
MYODBCDbgEnter();
@@ -178,7 +178,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDataSource::setScope( DATASOURCE_SCOPE nScope )
+BOOL MYODBCInsDataSource::setScope( DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -287,7 +287,7 @@
MYODBCDbgReturn3( "%d", nScope );
}
-BOOLEAN MYODBCInsDataSource::doRead( const QString &stringDataSourceName,
DATASOURCE_SCOPE nScope )
+BOOL MYODBCInsDataSource::doRead( const QString &stringDataSourceName,
DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -296,7 +296,7 @@
SQLWCHAR sValue[4096];
int nChars = 0;
UWORD nScopeToRestore = ODBC_BOTH_DSN;
- BOOLEAN bReturn = false;
+ BOOL bReturn = false;
if ( stringDataSourceName.isEmpty() )
MYODBCDbgReturn3( "%d", false )
@@ -397,29 +397,29 @@
MYODBCDbgReturn3( "%d", bReturn );
}
-BOOLEAN MYODBCInsDataSource::doRead( const QString &stringDataSourceName )
+BOOL MYODBCInsDataSource::doRead( const QString &stringDataSourceName )
{
MYODBCDbgEnter();
- BOOLEAN bReturn = doRead( stringDataSourceName, nScope );
+ BOOL bReturn = doRead( stringDataSourceName, nScope );
MYODBCDbgReturn3( "%d", bReturn );
}
-BOOLEAN MYODBCInsDataSource::doRead()
+BOOL MYODBCInsDataSource::doRead()
{
MYODBCDbgEnter();
- BOOLEAN bReturn = doRead( stringName, nScope );
+ BOOL bReturn = doRead( stringName, nScope );
MYODBCDbgReturn3( "%d", bReturn );
}
-BOOLEAN MYODBCInsDataSource::doWrite( DATASOURCE_SCOPE nScope )
+BOOL MYODBCInsDataSource::doWrite( DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
- BOOLEAN bReturn = false;
+ BOOL bReturn = false;
UWORD nScopeToRestore = ODBC_BOTH_DSN;
if ( !SQLGetConfigMode( &nScopeToRestore ) )
@@ -477,11 +477,11 @@
MYODBCDbgReturn3( "%d", bReturn );
}
-BOOLEAN MYODBCInsDataSource::doWrite()
+BOOL MYODBCInsDataSource::doWrite()
{
MYODBCDbgEnter();
- BOOLEAN bReturn = doWrite( nScope );
+ BOOL bReturn = doWrite( nScope );
MYODBCDbgReturn3( "%d", bReturn );
}
@@ -510,16 +510,16 @@
MYODBCDbgReturn2();
}
-BOOLEAN MYODBCInsDataSource::doDelete( const QString &stringDataSourceName )
+BOOL MYODBCInsDataSource::doDelete( const QString &stringDataSourceName )
{
MYODBCDbgEnter();
- BOOLEAN bReturn = SQLRemoveDSNFromIni( stringDataSourceName.utf16() );
+ BOOL bReturn = SQLRemoveDSNFromIni( stringDataSourceName.utf16() );
MYODBCDbgReturn3( "%d", bReturn );
}
-BOOLEAN MYODBCInsDataSource::isValidAttributes( const QHash<QString,QString>
&hashAttributes, BOOLEAN bStrict )
+BOOL MYODBCInsDataSource::isValidAttributes( const QHash<QString,QString>
&hashAttributes, BOOL bStrict )
{
MYODBCDbgEnter();
Modified: trunk/SDK/Installer/Library/MYODBCInsDriver.cpp
===================================================================
--- trunk/SDK/Installer/Library/MYODBCInsDriver.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Installer/Library/MYODBCInsDriver.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -28,7 +28,7 @@
*/
#include "MYODBCInsInternal.h"
-BOOLEAN MYODBCInsDriver::setFriendlyName( const QString &stringFriendlyName )
+BOOL MYODBCInsDriver::setFriendlyName( const QString &stringFriendlyName )
{
MYODBCDbgEnter();
@@ -37,7 +37,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCInsDriver::setDRIVER( const QString &stringDriverFileName )
+BOOL MYODBCInsDriver::setDRIVER( const QString &stringDriverFileName )
{
MYODBCDbgEnter();
@@ -46,7 +46,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCInsDriver::setSETUP( const QString &stringSetupFileName )
+BOOL MYODBCInsDriver::setSETUP( const QString &stringSetupFileName )
{
MYODBCDbgEnter();
@@ -119,7 +119,7 @@
MYODBCDbgReturn3( "%s", psz );
}
-BOOLEAN MYODBCInsDriver::doRead( const QString &stringFriendlyName )
+BOOL MYODBCInsDriver::doRead( const QString &stringFriendlyName )
{
MYODBCDbgEnter();
@@ -178,7 +178,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCInsDriver::doWrite()
+BOOL MYODBCInsDriver::doWrite()
{
MYODBCDbgEnter();
@@ -204,11 +204,11 @@
MYODBCDbgReturn2();
}
-BOOLEAN MYODBCInsDriver::doDelete( const QString &stringDriverName, BOOLEAN
bRemoveDataSourceNames, LPDWORD pnUsageCount )
+BOOL MYODBCInsDriver::doDelete( const QString &stringDriverName, BOOL
bRemoveDataSourceNames, LPDWORD pnUsageCount )
{
MYODBCDbgEnter();
- BOOLEAN b = SQLRemoveDriver( stringDriverName.utf16(), bRemoveDataSourceNames,
pnUsageCount );
+ BOOL b = SQLRemoveDriver( stringDriverName.utf16(), bRemoveDataSourceNames,
pnUsageCount );
MYODBCDbgReturn3( "%d", b );
}
Modified: trunk/SDK/Installer/Library/MYODBCInsDriverConnect.cpp
===================================================================
--- trunk/SDK/Installer/Library/MYODBCInsDriverConnect.cpp 2006-10-22 19:44:27 UTC (rev
609)
+++ trunk/SDK/Installer/Library/MYODBCInsDriverConnect.cpp 2006-10-23 04:43:51 UTC (rev
610)
@@ -60,7 +60,7 @@
MYODBCDbgReturn2();
}
-BOOLEAN MYODBCInsDriverConnect::setAttributes( const QString &stringAttributes )
+BOOL MYODBCInsDriverConnect::setAttributes( const QString &stringAttributes )
{
MYODBCDbgEnter();
@@ -123,7 +123,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MYODBCInsDriverConnect::setDSN( const QString &stringDSN )
+BOOL MYODBCInsDriverConnect::setDSN( const QString &stringDSN )
{
MYODBCDbgEnter();
@@ -132,7 +132,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setDRIVER( const QString &stringDRIVER )
+BOOL MYODBCInsDriverConnect::setDRIVER( const QString &stringDRIVER )
{
MYODBCDbgEnter();
@@ -141,7 +141,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setDESCRIPTION( const QString &stringDESCRIPTION )
+BOOL MYODBCInsDriverConnect::setDESCRIPTION( const QString &stringDESCRIPTION )
{
MYODBCDbgEnter();
@@ -150,7 +150,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setSERVER( const QString &stringSERVER )
+BOOL MYODBCInsDriverConnect::setSERVER( const QString &stringSERVER )
{
MYODBCDbgEnter();
@@ -159,7 +159,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setUID( const QString &stringUID )
+BOOL MYODBCInsDriverConnect::setUID( const QString &stringUID )
{
MYODBCDbgEnter();
@@ -168,7 +168,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setPWD( const QString &stringPWD )
+BOOL MYODBCInsDriverConnect::setPWD( const QString &stringPWD )
{
MYODBCDbgEnter();
@@ -177,7 +177,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setDATABASE( const QString &stringDATABASE )
+BOOL MYODBCInsDriverConnect::setDATABASE( const QString &stringDATABASE )
{
MYODBCDbgEnter();
@@ -186,7 +186,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setPORT( const QString &stringPORT )
+BOOL MYODBCInsDriverConnect::setPORT( const QString &stringPORT )
{
MYODBCDbgEnter();
@@ -195,7 +195,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setSOCKET( const QString &stringSOCKET )
+BOOL MYODBCInsDriverConnect::setSOCKET( const QString &stringSOCKET )
{
MYODBCDbgEnter();
@@ -204,7 +204,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setSTMT( const QString &stringSTMT )
+BOOL MYODBCInsDriverConnect::setSTMT( const QString &stringSTMT )
{
MYODBCDbgEnter();
@@ -213,7 +213,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setOPTION( const QString &stringOPTION )
+BOOL MYODBCInsDriverConnect::setOPTION( const QString &stringOPTION )
{
MYODBCDbgEnter();
@@ -222,7 +222,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setSETUP( const QString &stringSETUP )
+BOOL MYODBCInsDriverConnect::setSETUP( const QString &stringSETUP )
{
MYODBCDbgEnter();
@@ -231,7 +231,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setMethod( DRIVERCONNECT_METHOD nMethod )
+BOOL MYODBCInsDriverConnect::setMethod( DRIVERCONNECT_METHOD nMethod )
{
MYODBCDbgEnter();
@@ -240,7 +240,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setPrompt( DRIVERCONNECT_PROMPT nPrompt )
+BOOL MYODBCInsDriverConnect::setPrompt( DRIVERCONNECT_PROMPT nPrompt )
{
MYODBCDbgEnter();
@@ -249,7 +249,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setFILEDSN( const QString &stringFILEDSN )
+BOOL MYODBCInsDriverConnect::setFILEDSN( const QString &stringFILEDSN )
{
MYODBCDbgEnter();
@@ -258,7 +258,7 @@
MYODBCDbgReturn3( "%d", true )
}
-BOOLEAN MYODBCInsDriverConnect::setSAVEFILE( const QString &stringSAVEFILE )
+BOOL MYODBCInsDriverConnect::setSAVEFILE( const QString &stringSAVEFILE )
{
MYODBCDbgEnter();
@@ -489,7 +489,7 @@
add missing/unset attributes - attributes we already have are NOT
replaced.
*/
-BOOLEAN MYODBCInsDriverConnect::doRead()
+BOOL MYODBCInsDriverConnect::doRead()
{
MYODBCDbgEnter();
Modified: trunk/SDK/Installer/include/MYODBCIns.h
===================================================================
--- trunk/SDK/Installer/include/MYODBCIns.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Installer/include/MYODBCIns.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -86,7 +86,7 @@
This uses SQLPostInstallerError().
*/
- static BOOLEAN setError( const QString &stringMessage, DWORD nErrorCode =
ODBC_ERROR_GENERAL_ERR );
+ static BOOL 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 BOOLEAN MYODBCIns::getKeywordValues( QHash<QString,QString>
*phashKeywordValues, const QString &stringKeywordValues, DELIM nDelim = DELIM_BOTH );
+ static BOOL 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 BOOLEAN doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount = NULL );
+ static BOOL doRegisterDriver( const QString &stringName, const QString
&stringAttributes, DWORD *pnUsageCount = NULL );
/*!
\brief Deregisters a driver.
@@ -179,39 +179,39 @@
This uses SQLRemoveDriver().
*/
- static BOOLEAN doDeregisterDriver( const QString &stringName, BOOLEAN bRemoveDSNs
= false, DWORD *pnUsageCount = NULL );
+ static BOOL doDeregisterDriver( const QString &stringName, BOOL bRemoveDSNs =
false, DWORD *pnUsageCount = NULL );
/*!
\brief Inserts a new data source into the ODBC sys info.
*/
- static BOOLEAN doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOL doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
/*!
\brief Updates an existing data source in the ODBC sys info.
*/
- static BOOLEAN doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOL doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
/*!
\brief Deletes an existing data source from the ODBC sys info.
*/
- static BOOLEAN doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOL doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
/*!
\brief Use this to check if there are installer errors.
*/
- static BOOLEAN isError();
+ static BOOL isError();
/*!
\brief Use this to check if a data source name exists in the ODBC sys info.
*/
- static BOOLEAN isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope );
+ static BOOL 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 BOOLEAN isDelim( const QString &stringKeywordValues, int nScanChar, DELIM
*pnDelim );
+ static BOOL 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 BOOLEAN isDelimKeywordValue( const QChar &charChar, DELIM *pnDelim );
+ static BOOL 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 BOOLEAN isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim );
+ static BOOL isDelimKeywordValues( const QString &stringKeywordValues, int
nScanChar, DELIM nDelim );
};
#endif
Modified: trunk/SDK/Installer/include/MYODBCInsDataSource.h
===================================================================
--- trunk/SDK/Installer/include/MYODBCInsDataSource.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Installer/include/MYODBCInsDataSource.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -92,20 +92,20 @@
MYODBCInsDataSource();
- BOOLEAN setAttributes( const QHash<QString,QString> &hashAttributes,
BOOLEAN bReplace = true, BOOLEAN bStrict = 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 );
+ BOOL setAttributes( const QHash<QString,QString> &hashAttributes, BOOL
bReplace = true, BOOL bStrict = 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 );
QString getName();
QString getDRIVER();
@@ -121,15 +121,15 @@
DATASOURCE_MODE getMode();
DATASOURCE_SCOPE getScope();
- BOOLEAN doRead( const QString &stringDataSourceName, DATASOURCE_SCOPE nScope );
- BOOLEAN doRead( const QString &stringDataSourceName );
- BOOLEAN doRead();
- BOOLEAN doWrite( DATASOURCE_SCOPE nScope );
- BOOLEAN doWrite();
+ BOOL doRead( const QString &stringDataSourceName, DATASOURCE_SCOPE nScope );
+ BOOL doRead( const QString &stringDataSourceName );
+ BOOL doRead();
+ BOOL doWrite( DATASOURCE_SCOPE nScope );
+ BOOL doWrite();
void doClear();
- static BOOLEAN doDelete( const QString &stringDataSourceName );
+ static BOOL doDelete( const QString &stringDataSourceName );
- BOOLEAN isValidAttributes( const QHash<QString,QString> &hashAttributes,
BOOLEAN bStrict = true );
+ BOOL isValidAttributes( const QHash<QString,QString> &hashAttributes, BOOL
bStrict = true );
MYODBCInsDataSource operator=( MYODBCInsDataSource rval );
friend QTextStream &operator<<( QTextStream &stream, const
MYODBCInsDataSource &rval );
Modified: trunk/SDK/Installer/include/MYODBCInsDriver.h
===================================================================
--- trunk/SDK/Installer/include/MYODBCInsDriver.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Installer/include/MYODBCInsDriver.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -61,9 +61,9 @@
class MYODBCInsDriver
{
public:
- BOOLEAN setFriendlyName( const QString &stringFriendlyName );
- BOOLEAN setDRIVER( const QString &stringDriverFileName );
- BOOLEAN setSETUP( const QString &stringSetupFileName );
+ BOOL setFriendlyName( const QString &stringFriendlyName );
+ BOOL setDRIVER( const QString &stringDriverFileName );
+ BOOL 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();
- BOOLEAN doRead( const QString &stringFriendlyName );
- BOOLEAN doWrite();
+ BOOL doRead( const QString &stringFriendlyName );
+ BOOL doWrite();
void doClear();
- static BOOLEAN doDelete( const QString &stringDriverName, BOOLEAN
bRemoveDataSourceNames, LPDWORD pnUsageCount );
+ static BOOL doDelete( const QString &stringDriverName, BOOL
bRemoveDataSourceNames, LPDWORD pnUsageCount );
MYODBCInsDriver operator=( MYODBCInsDriver rval );
friend QTextStream &operator<<( QTextStream &stream, const
MYODBCInsDriver &rval );
Modified: trunk/SDK/Installer/include/MYODBCInsDriverConnect.h
===================================================================
--- trunk/SDK/Installer/include/MYODBCInsDriverConnect.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Installer/include/MYODBCInsDriverConnect.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -68,23 +68,23 @@
MYODBCInsDriverConnect( DRIVERCONNECT_PROMPT nPrompt = DRIVERCONNECT_PROMPT_NOPROMPT
);
- BOOLEAN setAttributes( const QString &stringAttributes ); /*!< Parses and
stores a comma delimited set of key=value attributes. */
- BOOLEAN setDSN( const QString &stringDSN );
- 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 setSETUP( const QString &stringSETUP );
- BOOLEAN setMethod( DRIVERCONNECT_METHOD nMethod );
- BOOLEAN setPrompt( DRIVERCONNECT_PROMPT nPrompt );
- BOOLEAN setFILEDSN( const QString &stringFILEDSN );
- BOOLEAN setSAVEFILE( const QString &stringSAVEFILE );
+ BOOL setAttributes( const QString &stringAttributes ); /*!< Parses and
stores a comma delimited set of key=value attributes. */
+ BOOL setDSN( const QString &stringDSN );
+ 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 setSETUP( const QString &stringSETUP );
+ BOOL setMethod( DRIVERCONNECT_METHOD nMethod );
+ BOOL setPrompt( DRIVERCONNECT_PROMPT nPrompt );
+ BOOL setFILEDSN( const QString &stringFILEDSN );
+ BOOL setSAVEFILE( const QString &stringSAVEFILE );
QString getAttributes(); /*!< Returns a comma delimited set of
key=value attributes. */
QString getDSN();
@@ -106,7 +106,7 @@
static QString getSETUP( const QString &stringDRIVER );
void doClear(); /*!< Sets all attributes to QString::null
- does not change Method nor Prompt. */
- BOOLEAN doRead();
+ BOOL doRead();
protected:
QHash<QString,QString> hashAttributes; /*!< Attributes. Use hash to
avoid many "if key". We use "contains()" instead. */
Modified: trunk/SDK/MYSQLPlus/Library/MCommand.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MCommand.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MCommand.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -66,7 +66,7 @@
QChar cBraceOpen( '{' );
QChar cBraceClose( '}' );
int nBraceNest = 0;
- BOOLEAN bBraceCheck = true;
+ BOOL bBraceCheck = true;
QString stringQuotes = "\"'";
int nCharsSkipped = 0;
QString stringSegment;
@@ -78,7 +78,7 @@
for ( int nChar = 0; nChar < stringCommand.length(); nChar++ )
{
QChar cChar = stringCommand.at( nChar );
- BOOLEAN bLastChar = ( nChar == (stringCommand.length() - 1) );
+ BOOL bLastChar = ( nChar == (stringCommand.length() - 1) );
/* catch some last char problems */
if ( bLastChar )
@@ -324,7 +324,7 @@
MYODBCDbgReturn2();
}
-BOOLEAN MCommand::isDataManipulationLanguage()
+BOOL MCommand::isDataManipulationLanguage()
{
MYODBCDbgEnter();
@@ -354,7 +354,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MCommand::isDataDefinitionLanguage()
+BOOL MCommand::isDataDefinitionLanguage()
{
MYODBCDbgEnter();
@@ -399,12 +399,12 @@
- whether or not the driver has been told to use transactions
- whether or not database objects (tables) referenced support transactions
- \return BOOLEAN
+ \return BOOL
\retval true If command will honour a transaction.
\retval false If command will not honour a transaction.
*/
-BOOLEAN MCommand::isTransactionPossible()
+BOOL MCommand::isTransactionPossible()
{
MYODBCDbgEnter();
@@ -430,12 +430,12 @@
\note In this context; returning only an 'affected rows' count is not considered to
be a result-set. In other
words - the result-set may or may not be empty but it must have at least one
column.
- \return BOOLEAN
+ \return BOOL
\retval true If command will create a result-set.
\retval false If command will not create a result-set.
*/
-BOOLEAN MCommand::isResultSetPossible()
+BOOL MCommand::isResultSetPossible()
{
MYODBCDbgEnter();
@@ -472,12 +472,12 @@
to obtain the row count. But note that even this scenario would depend upon
the absence of
any parameter markers.
- \return BOOLEAN
+ \return BOOL
\retval true If command may modify data.
\retval false If command will not modify data.
*/
-BOOLEAN MCommand::isDataModificationPossible()
+BOOL MCommand::isDataModificationPossible()
{
MYODBCDbgEnter();
@@ -507,7 +507,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MCommand::isServerSidePreparePossible()
+BOOL MCommand::isServerSidePreparePossible()
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MCommand.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MCommand.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MCommand.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -68,12 +68,12 @@
void doClear(); /*!< Clear command (reinit ourself).
*/
/* isers */
- BOOLEAN isDataManipulationLanguage(); /*!< Returns true if command is DML
("INSERT" etc). */
- BOOLEAN isDataDefinitionLanguage(); /*!< Returns true if command is DDL
("CREATE TABLE" etc). */
- BOOLEAN isTransactionPossible(); /*!< Returns true if transaction
supported by commands. */
- BOOLEAN isResultSetPossible(); /*!< Returns true if command will
create resultset. */
- BOOLEAN isDataModificationPossible(); /*!< Returns true if command may
modify data. */
- BOOLEAN isServerSidePreparePossible(); /*!< Returns true if server-side
prepare can be used. */
+ BOOL isDataManipulationLanguage(); /*!< Returns true if command is DML
("INSERT" etc). */
+ BOOL isDataDefinitionLanguage(); /*!< Returns true if command is DDL
("CREATE TABLE" etc). */
+ BOOL isTransactionPossible(); /*!< Returns true if transaction
supported by commands. */
+ BOOL isResultSetPossible(); /*!< Returns true if command will create
resultset. */
+ BOOL isDataModificationPossible(); /*!< Returns true if command may modify
data. */
+ BOOL isServerSidePreparePossible(); /*!< Returns true if server-side prepare
can be used. */
MCommand &operator=( const MCommand &rval );
Modified: trunk/SDK/MYSQLPlus/Library/MCommands.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MCommands.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MCommands.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -60,7 +60,7 @@
for ( int nChar = 0; nChar < stringCommands.length(); nChar++ )
{
QChar cChar = stringCommands.at( nChar );
- BOOLEAN bLastChar = ( nChar == (stringCommands.length() - 1) );
+ BOOL bLastChar = ( nChar == (stringCommands.length() - 1) );
// printf( "[PAH][%s][%d] bLastChar=%d (%c)\n", __FILE__, __LINE__, bLastChar,
cChar.toAscii() );
@@ -246,7 +246,7 @@
MYODBCDbgReturn3( "%p", pCommand );
}
-BOOLEAN MCommands::doClear()
+BOOL MCommands::doClear()
{
MYODBCDbgEnter();
@@ -262,26 +262,26 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MCommands::doFirst()
+BOOL MCommands::doFirst()
{
MYODBCDbgEnter();
- BOOLEAN b = setPos( 0 );
+ BOOL b = setPos( 0 );
MYODBCDbgReturn3( "%d", b );
}
-BOOLEAN MCommands::doNext()
+BOOL MCommands::doNext()
{
MYODBCDbgEnter();
nPos++;
- BOOLEAN b = setPos( nPos );
+ BOOL b = setPos( nPos );
MYODBCDbgReturn3( "%d", b );
}
-BOOLEAN MCommands::isEndOfList()
+BOOL MCommands::isEndOfList()
{
MYODBCDbgEnter();
@@ -294,12 +294,12 @@
This may be used to enforce ODBC rules during a prepare.
- \return BOOLEAN
+ \return BOOL
\retval true If all commands will honour a transaction.
\retval false One or more commands will not honour a transaction.
*/
-BOOLEAN MCommands::isTransactionPossible()
+BOOL MCommands::isTransactionPossible()
{
MYODBCDbgEnter();
@@ -322,12 +322,12 @@
This may be used to determine what state to put a MStatement into after a
prepare and when
rolling back its state.
- \return BOOLEAN
+ \return BOOL
\retval true If any of the commands will create a result-set.
\retval false None of the commands will create a result-set.
*/
-BOOLEAN MCommands::isResultSetPossible()
+BOOL MCommands::isResultSetPossible()
{
MYODBCDbgEnter();
@@ -351,12 +351,12 @@
to obtain the row count. But note that even this scenario would depend upon
the absence of
any parameter markers.
- \return BOOLEAN
+ \return BOOL
\retval true If any of the commands may modify data.
\retval false None of the commands will modify data.
*/
-BOOLEAN MCommands::isDataModificationPossible()
+BOOL MCommands::isDataModificationPossible()
{
MYODBCDbgEnter();
@@ -372,7 +372,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MCommands::setPos( int nPos )
+BOOL MCommands::setPos( int nPos )
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MCommands.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MCommands.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MCommands.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -62,19 +62,19 @@
MCommand * getCommand(); /*!< Return current command object.
*/
/* doers */
- BOOLEAN doClear(); /*!< Clear commands (reinit ourself).
*/
- BOOLEAN doFirst(); /*!< Make first command current.
*/
- BOOLEAN doNext(); /*!< Make next command current.
*/
+ BOOL doClear(); /*!< Clear commands (reinit ourself).
*/
+ BOOL doFirst(); /*!< Make first command current.
*/
+ BOOL doNext(); /*!< Make next command current.
*/
/* isers */
- BOOLEAN isEndOfList(); /*!< Returns true if EndOfList.
*/
- BOOLEAN isTransactionPossible(); /*!< Returns true if transaction supported
by all commands. */
- BOOLEAN isResultSetPossible(); /*!< Returns true if any of the commands
will create resultset. */
- BOOLEAN isDataModificationPossible(); /*!< Returns true if any of the commands
may modify data. */
+ BOOL isEndOfList(); /*!< Returns true if EndOfList.
*/
+ BOOL isTransactionPossible(); /*!< Returns true if transaction supported by
all commands. */
+ BOOL isResultSetPossible(); /*!< Returns true if any of the commands will
create resultset. */
+ BOOL isDataModificationPossible(); /*!< Returns true if any of the commands may
modify data. */
protected:
/* setters */
- BOOLEAN setPos( int nPos ); /*!< Set current command (0 based).
*/
+ BOOL setPos( int nPos ); /*!< Set current command (0 based).
*/
/* getters */
MConnection * getConnection();
Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -349,7 +349,7 @@
MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCC::getConnectAttrString( nAttribute ) ) );
#endif
- BOOLEAN bCopyOk;
+ BOOL bCopyOk;
/* handle case where we are not provided viable pnStringLength */
SQLINTEGER nLen = 0;
@@ -572,7 +572,7 @@
SQLSMALLINT nStringLengthBytes;
SQLSMALLINT * pnStringLengthBytes = pnStringLengthBytesPtr;
SQLINTEGER nStringLengthChars;
- BOOLEAN bCopyOk;
+ BOOL bCopyOk;
/*!
\internal ODBC RULE
@@ -2040,7 +2040,7 @@
MYODBCInsDriverConnect driverconnect;
QString stringInConnectionString;
SQLRETURN nReturn = SQL_SUCCESS;
- BOOLEAN bPrompt = false;
+ BOOL bPrompt = false;
#if MYODBC_DBG > 1
MYODBCDbgInfo( QString("nDriverCompletion=%1=%2").arg( nDriverCompletion ).arg(
MYODBCC::getDriverCompletionString( nDriverCompletion ) ) );
@@ -2504,7 +2504,7 @@
/* return the server friendly version of the statement text */
SQLINTEGER nCharsOut = 0;
SQLINTEGER nCharsMaxOut = nBufferLength / sizeof(SQLWCHAR);
- BOOLEAN bTruncated = false;
+ BOOL bTruncated = false;
bTruncated = !MYODBCC::doStringCopyOut( psOutStatementText, nCharsMaxOut,
(SQLWCHAR*)stringText.utf16(), &nCharsOut );
@@ -2532,11 +2532,11 @@
\param pDiagnostic The diagnostic handle we should send diagnostic information to.
This
should be NULL to reset the diagnostic to the default.
- \return BOOLEAN
+ \return BOOL
\sa getDiagnostic
*/
-BOOLEAN MConnection::setDiagnostic( MDiagnostic *pDiagnostic )
+BOOL MConnection::setDiagnostic( MDiagnostic *pDiagnostic )
{
MYODBCDbgEnter();
@@ -2545,7 +2545,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MConnection::setState( STATE nState )
+BOOL MConnection::setState( STATE nState )
{
MYODBCDbgEnter();
@@ -2554,7 +2554,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MConnection::setServerAliveSanityCheckInterval( int nMilliseconds )
+BOOL MConnection::setServerAliveSanityCheckInterval( int nMilliseconds )
{
MYODBCDbgEnter();
@@ -2563,7 +2563,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MConnection::setDataSourceName( const QString &stringDataSourceName )
+BOOL MConnection::setDataSourceName( const QString &stringDataSourceName )
{
MYODBCDbgEnter();
@@ -2572,7 +2572,7 @@
MYODBCDbgReturn3( "%d", true );
}
-BOOLEAN MConnection::setUserIdentifier( const QString &stringUserIdentifier )
+BOOL MConnection::setUserIdentifier( const QString &stringUserIdentifier )
{
MYODBCDbgEnter();
@@ -2603,7 +2603,7 @@
{
MYODBCDbgEnter();
- BOOLEAN bWarning = false;
+ BOOL bWarning = false;
SQLRETURN nReturn = SQL_SUCCESS;
/* try to adopt the value for future statements */
@@ -5404,7 +5404,7 @@
MYODBCDbgReturn( SQL_SUCCESS );
}
-BOOLEAN MConnection::doServerAliveSanityCheck()
+BOOL MConnection::doServerAliveSanityCheck()
{
if ( timeLastQuery.restart() >= getServerAliveSanityCheckInterval() )
{
@@ -5664,7 +5664,7 @@
This does not check if the connection is alive, it simply reports the
state without verification.
- \return BOOLEAN
+ \return BOOL
\retval true We are in a connected state.
\retval false We are in a disconnected state.
@@ -5672,7 +5672,7 @@
\sa doServerAliveSanityCheck
getConnectionDead
*/
-BOOLEAN MConnection::isConnected()
+BOOL MConnection::isConnected()
{
MYODBCDbgEnter();
@@ -5688,14 +5688,14 @@
This is a convenience method which, hopefully, makes the calling code
a little easier to understand.
- \return BOOLEAN
+ \return BOOL
\retval true We are in a transaction.
\retval false We are not in a transaction.
\sa
*/
-BOOLEAN MConnection::isTransaction()
+BOOL MConnection::isTransaction()
{
MYODBCDbgEnter();
@@ -5705,7 +5705,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MConnection::isAsyncInProgress()
+BOOL MConnection::isAsyncInProgress()
{
MYODBCDbgEnter();
@@ -5720,7 +5720,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MConnection::isStatementActive()
+BOOL MConnection::isStatementActive()
{
MYODBCDbgEnter();
@@ -5735,7 +5735,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MConnection::isDataNeeded()
+BOOL MConnection::isDataNeeded()
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -297,11 +297,11 @@
\param pDiagnostic The diagnostic handle we should send diagnostic information to.
This
should be NULL to reset the diagnostic to the default.
- \return BOOLEAN
+ \return BOOL
\sa getDiagnostic
*/
-BOOLEAN MDescriptor::setDiagnostic( MDiagnostic *pDiagnostic )
+BOOL MDescriptor::setDiagnostic( MDiagnostic *pDiagnostic )
{
MYODBCDbgEnter();
@@ -367,7 +367,7 @@
SQL_DESC_COUNT)
\retval MYODBC_C_FALSE failed
*/
-SQLRETURN MDescriptor::setCount( SQLSMALLINT nCount, BOOLEAN bUnbind )
+SQLRETURN MDescriptor::setCount( SQLSMALLINT nCount, BOOL bUnbind )
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -53,7 +53,7 @@
SQLRETURN MDescriptorRecord::setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType,
SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr,
SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr )
{
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
SQLRETURN nReturn = SQL_SUCCESS;
MYODBCDbgEnter();
@@ -560,7 +560,7 @@
APD: R/W
*/
{
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
SQLRETURN nReturn = setDataPtr( pValuePtr );
if ( nReturn == SQL_SUCCESS_WITH_INFO )
@@ -887,7 +887,7 @@
SQLRETURN MDescriptorRecord::getDescRec( SQLWCHAR *pszName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT *pnSubTypePtr,
SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr,
SQLSMALLINT *pnNullablePtr )
{
SQLRETURN nReturn;
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
SQLINTEGER nStringLength;
MYODBCDbgEnter();
@@ -1475,7 +1475,7 @@
MYODBCDbgReturn( SQL_SUCCESS );
}
-BOOLEAN MDescriptorRecord::isBound()
+BOOL MDescriptorRecord::isBound()
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -152,7 +152,7 @@
virtual SQLRETURN doConsistencyCheck();
/* isers */
- virtual BOOLEAN isBound();
+ virtual BOOL isBound();
private:
/* some of these 'fields' will be calculated and not stored in the future */
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -91,7 +91,7 @@
APD: R/W
*/
{
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
SQLRETURN nReturn = setDataPtr( pValuePtr );
if ( nReturn == SQL_SUCCESS_WITH_INFO )
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -91,7 +91,7 @@
ARD: R/W
*/
{
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
SQLRETURN nReturn = setDataPtr( pValuePtr );
if ( nReturn == SQL_SUCCESS_WITH_INFO )
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -87,7 +87,7 @@
IPD: R/W
*/
{
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
SQLRETURN nReturn = setDataPtr( pValuePtr );
if ( nReturn == SQL_SUCCESS_WITH_INFO )
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -41,7 +41,7 @@
MYODBCDbgReturn( getColumnSizeSQL( pnColumnSize, pnDecimalDigits ) );
}
-BOOLEAN MDescriptorRecordIRD::isVariableLength( SQLSMALLINT nConciseType )
+BOOL MDescriptorRecordIRD::isVariableLength( SQLSMALLINT nConciseType )
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIRD.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -17,7 +17,7 @@
SQLRETURN getColumnSize( SQLUINTEGER *pnColumnSize, SQLSMALLINT *pnDecimalDigits );
/* isers */
- static BOOLEAN isVariableLength( SQLSMALLINT nConciseType );
+ static BOOL isVariableLength( SQLSMALLINT nConciseType );
protected:
/* setters */
Modified: trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -100,7 +100,7 @@
SQLRETURN MDiagnosticRecord::getDiagRec( SQLWCHAR *psSqlstate, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *pszMessageText, SQLSMALLINT nBufferCharLength, SQLSMALLINT
*pnTextByteLength )
{
SQLRETURN nReturn;
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
SQLSMALLINT nByteLength;
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MResult.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MResult.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -56,7 +56,7 @@
MYODBCDbgReturn2();
}
-BOOLEAN MResultGetData::isChunkingRequest( SQLUINTEGER nRow, SQLUSMALLINT nColumn )
+BOOL MResultGetData::isChunkingRequest( SQLUINTEGER nRow, SQLUSMALLINT nColumn )
{
MYODBCDbgEnter();
@@ -784,7 +784,7 @@
SQL_NO_DATA - ResultSet is empty.
SQL_ERROR - State < STATE_EXECUTED
*/
-SQLRETURN MResult::doFirst( BOOLEAN bRefresh )
+SQLRETURN MResult::doFirst( BOOL bRefresh )
{
MYODBCDbgEnter();
@@ -842,7 +842,7 @@
SQL_NO_DATA - ResultSet is empty.
SQL_ERROR - State < STATE_EXECUTED
*/
-SQLRETURN MResult::doLast( BOOLEAN bRefresh )
+SQLRETURN MResult::doLast( BOOL bRefresh )
{
MYODBCDbgEnter();
@@ -931,7 +931,7 @@
SQL_NO_DATA - ResultSet is empty.
SQL_ERROR - State < STATE_EXECUTED
*/
-SQLRETURN MResult::doNext( BOOLEAN bRefresh )
+SQLRETURN MResult::doNext( BOOL bRefresh )
{
MYODBCDbgEnter();
@@ -1073,7 +1073,7 @@
SQL_NO_DATA - ResultSet is empty.
SQL_ERROR - State < STATE_EXECUTED
*/
-SQLRETURN MResult::doPrev( BOOLEAN bRefresh )
+SQLRETURN MResult::doPrev( BOOL bRefresh )
{
MYODBCDbgEnter();
@@ -1227,7 +1227,7 @@
SQL_NO_DATA - ResultSet is empty.
SQL_ERROR - State < STATE_EXECUTED
*/
-SQLRETURN MResult::doSkip( qlonglong nRows, BOOLEAN bRefresh )
+SQLRETURN MResult::doSkip( qlonglong nRows, BOOL bRefresh )
{
MYODBCDbgEnter();
@@ -1393,7 +1393,7 @@
SQL_NO_DATA - ResultSet is empty.
SQL_ERROR - State < STATE_EXECUTED
*/
-SQLRETURN MResult::doGoto( qlonglong nRow, BOOLEAN bRefresh )
+SQLRETURN MResult::doGoto( qlonglong nRow, BOOL bRefresh )
{
MYODBCDbgEnter();
@@ -1521,48 +1521,48 @@
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY000, 0,
tr("Unknown condition in doGoto().") ) );
}
-BOOLEAN MResult::isBeforeStart()
+BOOL MResult::isBeforeStart()
{
MYODBCDbgEnter();
MYODBCDbgReturn3( "%d", (nResultSetRow == 0) );
}
-BOOLEAN MResult::isAfterEnd()
+BOOL MResult::isAfterEnd()
{
MYODBCDbgEnter();
MYODBCDbgReturn3( "%d", (nResultSetRow > getResultSetRows()) );
}
-BOOLEAN MResult::isValidColumn( SQLUSMALLINT nColumn )
+BOOL MResult::isValidColumn( SQLUSMALLINT nColumn )
{
MYODBCDbgEnter();
- BOOLEAN b = ( nColumn <= (SQLUSMALLINT)getImpRowDesc()->getCount() );
+ BOOL b = ( nColumn <= (SQLUSMALLINT)getImpRowDesc()->getCount() );
MYODBCDbgReturn3( "%d", b );
}
-BOOLEAN MResult::isValidResultSetRow()
+BOOL MResult::isValidResultSetRow()
{
MYODBCDbgEnter();
- BOOLEAN b = !( isBeforeStart() || isAfterEnd() );
+ BOOL b = !( isBeforeStart() || isAfterEnd() );
MYODBCDbgReturn3( "%d", b );
}
-BOOLEAN MResult::isValidRowSetRow()
+BOOL MResult::isValidRowSetRow()
{
MYODBCDbgEnter();
- BOOLEAN b = isValidResultSetRow();
+ BOOL b = isValidResultSetRow();
if ( b )
b = ( getRowSetRow() > 0 && ( getRowSetRow() <= getRowSetRows() )
);
MYODBCDbgReturn3( "%d", b );
}
-BOOLEAN MResult::isResultSetRowsKnown()
+BOOL MResult::isResultSetRowsKnown()
{
MYODBCDbgEnter();
MYODBCDbgReturn3( "%d", bResultSetRowsKnown );
@@ -1835,7 +1835,7 @@
\param nResultSetRows
\param bResultSetRowsKnown
*/
-void MResult::setResultSetRows( qulonglong nResultSetRows, BOOLEAN bResultSetRowsKnown )
+void MResult::setResultSetRows( qulonglong nResultSetRows, BOOL bResultSetRowsKnown )
{
MYODBCDbgEnter();
@@ -3785,7 +3785,7 @@
stringPrecision = stringlistData[0];
/* check for truncation */
- BOOLEAN bFractionalTruncation = false;
+ BOOL bFractionalTruncation = false;
if ( stringPrecision.length() > pNumericTarget->precision )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_22003 ) );
Modified: trunk/SDK/MYSQLPlus/Library/MResult.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MResult.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -29,7 +29,7 @@
void doClear();
- BOOLEAN isChunkingRequest( SQLUINTEGER nRow, SQLUSMALLINT nColumn );
+ BOOL isChunkingRequest( SQLUINTEGER nRow, SQLUSMALLINT nColumn );
/* these are from last (or possibly current) getData call and reflect the calls args
*/
SQLUSMALLINT nColumn; /*!< column number as per
SQLGetData */
@@ -40,7 +40,7 @@
SQLINTEGER * pnIndicator; /*!< place to return nIndicator to
caller (mostly optional) */
/* these are additional fields which assist in maintaining our getData state */
- BOOLEAN bInUse; /*!< true if we hold a valid get
data state (false if just cleared) */
+ BOOL bInUse; /*!< true if we hold a valid get data
state (false if just cleared) */
SQLSMALLINT nTargetTypeAdjusted; /*!< is nTargetType, SQL_C_DEFAULT
derived, or ARD derived */
SQLINTEGER nBytesTotal; /*!< bytes of data available
(after conversion - before any truncation) */
SQLINTEGER nIndicator; /*!< value indicates whether or
not the cell is NULL as per SQLGetData */
@@ -297,24 +297,24 @@
virtual SQLRETURN doCommit() = 0;
virtual SQLRETURN doDelete() = 0; /*!<
Operates on RowSetRow. */
virtual SQLRETURN doExecute() = 0; /*!<
Execute the prepared command. */
- virtual SQLRETURN doFirst( BOOLEAN bRefresh = true ); /*!<
Moves cursor/rowset to start of resultset. */
- virtual SQLRETURN doGoto( qlonglong nRow, BOOLEAN bRefresh = true ); /*!<
Moves cursor/rowset relative to first row of resultset. */
+ virtual SQLRETURN doFirst( BOOL bRefresh = true ); /*!<
Moves cursor/rowset to start of resultset. */
+ virtual SQLRETURN doGoto( qlonglong nRow, BOOL bRefresh = true ); /*!<
Moves cursor/rowset relative to first row of resultset. */
virtual SQLRETURN doInsert() = 0; /*!<
Operates on RowSetRow. */
- virtual SQLRETURN doLast( BOOLEAN bRefresh = true ); /*!<
Moves cursor/rowset to end of resultset. */
- virtual SQLRETURN doNext( BOOLEAN bRefresh = true ); /*!<
Moves cursor/rowset forward by 1 rowset size. */
+ virtual SQLRETURN doLast( BOOL bRefresh = true ); /*!<
Moves cursor/rowset to end of resultset. */
+ virtual SQLRETURN doNext( BOOL bRefresh = true ); /*!<
Moves cursor/rowset forward by 1 rowset size. */
virtual SQLRETURN doPrepare( MCommand *pCommand ); /*!<
Prepare the given command. */
- virtual SQLRETURN doPrev( BOOLEAN bRefresh = true ); /*!<
Moves cursor/rowset back by 1 rowset size. */
+ virtual SQLRETURN doPrev( BOOL bRefresh = true ); /*!<
Moves cursor/rowset back by 1 rowset size. */
virtual SQLRETURN doRefresh(); /*!<
Load/refreshs bound buffers provided by application. */
- virtual SQLRETURN doSkip( qlonglong nRowSets, BOOLEAN bRefresh = true ); /*!<
Moves cursor/rowset relative to current row in resultset. */
+ virtual SQLRETURN doSkip( qlonglong nRowSets, BOOL bRefresh = true ); /*!<
Moves cursor/rowset relative to current row in resultset. */
/* isers */
- virtual BOOLEAN isAfterEnd();
- virtual BOOLEAN isBeforeStart();
- virtual BOOLEAN isResultSetRowsKnown();
- virtual BOOLEAN isResultSetPossible() = 0;
- virtual BOOLEAN isValidColumn( SQLUSMALLINT nColumn );
- virtual BOOLEAN isValidResultSetRow();
- virtual BOOLEAN isValidRowSetRow();
+ virtual BOOL isAfterEnd();
+ virtual BOOL isBeforeStart();
+ virtual BOOL isResultSetRowsKnown();
+ virtual BOOL isResultSetPossible() = 0;
+ virtual BOOL isValidColumn( SQLUSMALLINT nColumn );
+ virtual BOOL isValidResultSetRow();
+ virtual BOOL isValidRowSetRow();
protected:
MResultGetData resultGetData; /*!< to support getData() (in particular;
chunking) */
@@ -380,7 +380,7 @@
virtual SQLRETURN setBeforeStart();
virtual SQLRETURN setBuffered( BUFFERED bBuffered = BUFFERED_UNBUFFERED );
SQLRETURN setGetDataDefault(); // support for getData: this is called when
target C type is SQL_C_DEFAULT (derive type from IRD)
- void setResultSetRows( qulonglong nResultSetRows, BOOLEAN
bResultSetRowsKnown = false );
+ void setResultSetRows( qulonglong nResultSetRows, BOOL
bResultSetRowsKnown = false );
void setRowsAffected( qulonglong nRowsAffected );
void setRowSetRows( SQLUINTEGER nRowSetRows );
void setState( STATE nState );
@@ -534,7 +534,7 @@
/*@}*/
private:
- BOOLEAN bResultSetRowsKnown; /*!< True if we know real value. False if
we are working with highest ResultSetRows we know about & could be more. */
+ BOOL bResultSetRowsKnown; /*!< True if we know real value. False if we
are working with highest ResultSetRows we know about & could be more. */
BUFFERED nBuffered; /*!< where is ResultSet buffered - if at
all */
qulonglong nResultSetRows; /*!< \todo qulonglong may be bigger than
SQLUINTEGER but still - see about getting rid of this limitation. */
qulonglong nRowsAffected; /*!< number of rows affected by a
non-SELECT statement (catalog and SHOW statements count as SELECT in this case) */
Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -1092,7 +1092,7 @@
{
MYODBCDbgEnter();
- BOOLEAN b = false;
+ BOOL b = false;
if ( getConcurrency() != SQL_CONCUR_READ_ONLY )
{
@@ -1350,7 +1350,7 @@
}
/* this must NOT honour wildcards based upon how it is called */
-QStringList MResultPlus::getUniqueIndexs( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, BOOLEAN bExcludePrimary )
+QStringList MResultPlus::getUniqueIndexs( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, BOOL bExcludePrimary )
{
QString stringStatement;
QStringList stringlistIndexs;
@@ -1850,7 +1850,7 @@
QStringList stringlistCatalogs = getCatalogs( "%" );
- BOOLEAN bWildCard = ( getEnvironment()->getODBCVersion() != SQL_OV_ODBC2
&& getStatement()->getMetadataID() == SQL_FALSE );
+ BOOL bWildCard = ( getEnvironment()->getODBCVersion() != SQL_OV_ODBC2 &&
getStatement()->getMetadataID() == SQL_FALSE );
QString stringWildCard = stringCatalogFilter;
QRegExp regexWildCard;
regexWildCard.setPatternSyntax( QRegExp::Wildcard );
@@ -1860,7 +1860,7 @@
for ( int n = 0; n < stringlistCatalogs.count(); n++ )
{
- BOOLEAN bMatch;
+ BOOL bMatch;
if ( stringCatalogFilter.isNull() )
bMatch = true;
@@ -1894,7 +1894,7 @@
*/
QStringList stringlistSchemas = getSchemas( stringCatalog, "%" );
- BOOLEAN bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
+ BOOL bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
QString stringWildCard = stringSchemaFilter;
QRegExp regexWildCard;
regexWildCard.setPatternSyntax( QRegExp::Wildcard );
@@ -1904,7 +1904,7 @@
for ( int n = 0; n < stringlistSchemas.count(); n++ )
{
- BOOLEAN bMatch;
+ BOOL bMatch;
if ( stringSchemaFilter.isNull() )
bMatch = true;
@@ -1966,7 +1966,7 @@
*/
QStringList stringlistTables = getTables( stringCatalog, stringSchema, "%" );
- BOOLEAN bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
+ BOOL bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
QString stringWildCard = stringTableFilter;
QRegExp regexWildCard;
regexWildCard.setPatternSyntax( QRegExp::Wildcard );
@@ -1976,7 +1976,7 @@
for ( int n = 0; n < stringlistTables.count(); n++ )
{
- BOOLEAN bMatch;
+ BOOL bMatch;
if ( stringTableFilter.isNull() )
bMatch = true;
@@ -2016,7 +2016,7 @@
QStringList stringlistCatalogs = getCatalogs( "%" );
- BOOLEAN bWildCard = ( getEnvironment()->getODBCVersion() != SQL_OV_ODBC2
&& getStatement()->getMetadataID() == SQL_FALSE );
+ BOOL bWildCard = ( getEnvironment()->getODBCVersion() != SQL_OV_ODBC2 &&
getStatement()->getMetadataID() == SQL_FALSE );
QString stringWildCard = stringCatalogFilter;
QRegExp regexWildCard;
regexWildCard.setPatternSyntax( QRegExp::Wildcard );
@@ -2026,7 +2026,7 @@
for ( int n = 0; n < stringlistCatalogs.count(); n++ )
{
- BOOLEAN bMatch;
+ BOOL bMatch;
if ( stringCatalogFilter.isNull() )
bMatch = true;
@@ -2060,7 +2060,7 @@
*/
QStringList stringlistSchemas = getSchemas( stringCatalog, "%" );
- BOOLEAN bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
+ BOOL bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
QString stringWildCard = stringSchemaFilter;
QRegExp regexWildCard;
regexWildCard.setPatternSyntax( QRegExp::Wildcard );
@@ -2070,7 +2070,7 @@
for ( int n = 0; n < stringlistSchemas.count(); n++ )
{
- BOOLEAN bMatch;
+ BOOL bMatch;
if ( stringSchemaFilter.isNull() )
bMatch = true;
@@ -2106,7 +2106,7 @@
QStringList stringlistTables = getTables( stringCatalog, stringSchema, "%" );
/* setup regex as needed */
- BOOLEAN bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
+ BOOL bWildCard = ( getStatement()->getMetadataID() == SQL_FALSE );
QString stringWildCard = stringTableFilter;
QRegExp regexWildCard;
regexWildCard.setPatternSyntax( QRegExp::Wildcard );
@@ -2116,7 +2116,7 @@
for ( int n = 0; n < stringlistTables.count(); n++ )
{
- BOOLEAN bMatch;
+ BOOL bMatch;
if ( stringTableFilter.isNull() )
bMatch = true;
Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultPlus.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MResultPlus.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -76,7 +76,7 @@
/*@}*/
/* isers */
- BOOLEAN isResultSetPossible() { MYODBCDbgEnter(); MYODBCDbgReturn3( "%d", true ); }
+ BOOL isResultSetPossible() { MYODBCDbgEnter(); MYODBCDbgReturn3( "%d", true ); }
protected:
/* doers */
@@ -112,7 +112,7 @@
QStringList getPrimaryKeyColumns( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable );
QStringList getForeignKeys( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable );
QStringList getForeignKeyColumns( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, const QString
&stringForeignKeyName );
- QStringList getUniqueIndexs( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, BOOLEAN bExcludePrimary = true );
+ QStringList getUniqueIndexs( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, BOOL bExcludePrimary = true );
QStringList getUniqueIndexColumns( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, const QString &stringIndexName );
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MResultRes.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultRes.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MResultRes.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -442,7 +442,7 @@
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY000, 0,
tr("doInsert() not supported in this context") ) );
}
-BOOLEAN MResultRes::isResultSetPossible()
+BOOL MResultRes::isResultSetPossible()
{
MYODBCDbgEnter();
@@ -765,7 +765,7 @@
{
MYODBCDbgEnter();
- BOOLEAN b = false;
+ BOOL b = false;
/*!
\internal
Modified: trunk/SDK/MYSQLPlus/Library/MResultRes.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultRes.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MResultRes.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -38,7 +38,7 @@
SQLRETURN doInsert();
/* isers */
- BOOLEAN isResultSetPossible();
+ BOOL isResultSetPossible();
protected:
Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2006-10-23 04:43:51 UTC (rev 610)
@@ -1194,7 +1194,7 @@
#endif
SQLRETURN nReturn;
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
/*!
\internal
@@ -1418,7 +1418,7 @@
MYODBCDbgEnter();
SQLRETURN nReturn = SQL_SUCCESS;
- BOOLEAN bHasInfo = false;
+ BOOL bHasInfo = false;
/*!
\internal
@@ -2024,7 +2024,7 @@
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_IM001 ) );
}
-SQLRETURN MStatement::doCloseCursor( BOOLEAN bRelaxed )
+SQLRETURN MStatement::doCloseCursor( BOOL bRelaxed )
{
MYODBCDbgEnter();
@@ -5472,7 +5472,7 @@
MYODBCDbgReturn( nReturn );
}
-BOOLEAN MStatement::isPrepared()
+BOOL MStatement::isPrepared()
{
MYODBCDbgEnter();
@@ -5482,7 +5482,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MStatement::isExecuted()
+BOOL MStatement::isExecuted()
{
MYODBCDbgEnter();
@@ -5492,7 +5492,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MStatement::isDataNeeded()
+BOOL MStatement::isDataNeeded()
{
MYODBCDbgEnter();
@@ -5502,7 +5502,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MStatement::isAsyncInProgress()
+BOOL MStatement::isAsyncInProgress()
{
MYODBCDbgEnter();
@@ -5512,7 +5512,7 @@
MYODBCDbgReturn3( "%d", false );
}
-BOOLEAN MStatement::setState( STATE nState )
+BOOL MStatement::setState( STATE nState )
{
MYODBCDbgEnter();
@@ -5521,7 +5521,7 @@
MYODBCDbgReturn3( "%d", true );
}
-void MStatement::setImplicitPrepare( BOOLEAN b )
+void MStatement::setImplicitPrepare( BOOL b )
{
MYODBCDbgEnter();
@@ -6815,7 +6815,7 @@
MYODBCDbgReturn( nReturn );
}
-BOOLEAN MStatement::isImplicitPrepare()
+BOOL MStatement::isImplicitPrepare()
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/include/MConnection.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MConnection.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/include/MConnection.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -83,11 +83,11 @@
protected:
/* setters */
- BOOLEAN setDiagnostic( MDiagnostic *pDiagnostic );
- BOOLEAN setState( STATE nState );
- BOOLEAN setServerAliveSanityCheckInterval( int nMilliseconds );
- BOOLEAN setDataSourceName( const QString &stringDataSourceName );
- BOOLEAN setUserIdentifier( const QString &stringUserIdentifier );
+ BOOL setDiagnostic( MDiagnostic *pDiagnostic );
+ BOOL setState( STATE nState );
+ BOOL setServerAliveSanityCheckInterval( int nMilliseconds );
+ BOOL setDataSourceName( const QString &stringDataSourceName );
+ BOOL setUserIdentifier( const QString &stringUserIdentifier );
/*!
\internal
@@ -383,17 +383,17 @@
SQLRETURN doConnectInternal( MYODBCInsDataSource *pDataSource );
SQLRETURN doConnectInternal( MYODBCInsDriverConnect *pDriverConnect );
SQLRETURN doSubmitCommand( const QString &stringCommand );
- BOOLEAN doServerAliveSanityCheck();
+ BOOL doServerAliveSanityCheck();
SQLRETURN doTransactionStart();
SQLRETURN doTransactionCommit();
SQLRETURN doTransactionRollback();
/* iser */
- BOOLEAN isConnected();
- BOOLEAN isTransaction();
- BOOLEAN isAsyncInProgress();
- BOOLEAN isStatementActive();
- BOOLEAN isDataNeeded();
+ BOOL isConnected();
+ BOOL isTransaction();
+ BOOL isAsyncInProgress();
+ BOOL isStatementActive();
+ BOOL isDataNeeded();
private:
STATE nState; /*!< our current state
*/
Modified: trunk/SDK/MYSQLPlus/include/MDescriptor.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MDescriptor.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/include/MDescriptor.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -99,12 +99,12 @@
protected:
/* setters */
- BOOLEAN setDiagnostic( MDiagnostic *pDiagnostic );
+ BOOL setDiagnostic( MDiagnostic *pDiagnostic );
virtual SQLRETURN setArraySize( SQLUINTEGER nArraySize );
virtual SQLRETURN setArrayStatusPtr( SQLUSMALLINT *pnArrayStatusPtr );
virtual SQLRETURN setBindOffsetPtr( SQLINTEGER *pnBindOffsetPtr );
virtual SQLRETURN setBindType( SQLINTEGER nBindType );
- virtual SQLRETURN setCount( SQLSMALLINT nCount, BOOLEAN bUnbind = false );
+ virtual SQLRETURN setCount( SQLSMALLINT nCount, BOOL bUnbind = false );
virtual SQLRETURN setRowsProcessedPtr( SQLUINTEGER *pnRowsProcessedPtr );
/* getters */
Modified: trunk/SDK/MYSQLPlus/include/MStatement.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MStatement.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/MYSQLPlus/include/MStatement.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -64,7 +64,7 @@
SQLRETURN doBindParameter( SQLUSMALLINT nParameterNumber, SQLSMALLINT
nInputOutputType, SQLSMALLINT nValueType, SQLSMALLINT nParameterType, SQLUINTEGER
nColumnSize, SQLSMALLINT nDecimalDigits, SQLPOINTER pParameterValue, SQLINTEGER
nBufferLength, SQLINTEGER *pnStrLenOrInd );
SQLRETURN doBulkOperations( SQLSMALLINT nOperation );
SQLRETURN doCancel();
- SQLRETURN doCloseCursor( BOOLEAN bRelaxed = false );
+ SQLRETURN doCloseCursor( BOOL bRelaxed = false );
SQLRETURN doColAttribute( SQLUSMALLINT nColumnNumber, SQLUSMALLINT nFieldIdentifier,
SQLPOINTER psCharacterAttributePtr, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnStringLengthPtr, SQLPOINTER pnNumericAttributePtr );
SQLRETURN doColumnPrivileges( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT
nNameLength3, SQLWCHAR *psColumnName, SQLSMALLINT nNameLength4 );
SQLRETURN doColumns( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3,
SQLWCHAR *psColumnName, SQLSMALLINT nNameLength4 );
@@ -92,16 +92,16 @@
SQLRETURN doTables( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1, SQLWCHAR
*psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT nNameLength3,
SQLWCHAR *psTableType, SQLSMALLINT nNameLength4 );
/* isers */
- BOOLEAN isPrepared();
- BOOLEAN isExecuted();
- BOOLEAN isDataNeeded();
- BOOLEAN isAsyncInProgress();
+ BOOL isPrepared();
+ BOOL isExecuted();
+ BOOL isDataNeeded();
+ BOOL isAsyncInProgress();
protected:
/* setters */
- BOOLEAN setState( STATE nState );
- void setImplicitPrepare( BOOLEAN b );
+ BOOL setState( STATE nState );
+ void setImplicitPrepare( BOOL b );
SQLRETURN setCursorName( const QString &stringCursorName );
SQLRETURN setAppParamDesc( MDescriptor *pDescriptor ); /*!<
SQL_ATTR_APP_PARAM_DESC */
SQLRETURN setAppRowDesc( MDescriptor *pDescriptor ); /*!<
SQL_ATTR_APP_ROW_DESC */
@@ -185,7 +185,7 @@
SQLRETURN doPrepare( MCommand *pCommand );
/* is'ers */
- BOOLEAN isImplicitPrepare();
+ BOOL isImplicitPrepare();
private:
STATE nState; /*!< our current state
*/
@@ -193,7 +193,7 @@
MDescriptor * pAppParamDescOrig; /*!< Original app param desc.
*/
MDescriptor * pAppRowDescOrig; /*!< Original app row desc.
*/
QString stringCursorName; /*!< cursor name - used by pos
update/delete (WHERE CURRENT OF name)*/
- BOOLEAN bImplicitPrepare; /*!< true if prepare done implicitly ie
doExecDirect or doTables etc*/
+ BOOL bImplicitPrepare; /*!< true if prepare done implicitly ie
doExecDirect or doTables etc*/
MDescriptor * pAppParamDesc; /*!< SQL_ATTR_APP_PARAM_DESC
*/
MDescriptor * pAppRowDesc; /*!< SQL_ATTR_APP_ROW_DESC
*/
SQLUINTEGER nAsyncEnable; /*!< SQL_ATTR_ASYNC_ENABLE
*/
Modified: trunk/SDK/Tst/include/MYODBCTst.h
===================================================================
--- trunk/SDK/Tst/include/MYODBCTst.h 2006-10-22 19:44:27 UTC (rev 609)
+++ trunk/SDK/Tst/include/MYODBCTst.h 2006-10-23 04:43:51 UTC (rev 610)
@@ -76,7 +76,7 @@
typedef struct tMYODBC_TST
{
SQLCHAR * pszName;
- BOOLEAN (*pfunc)();
+ BOOL (*pfunc)();
} MYODBC_TST;
| Thread |
|---|
| • Connector/ODBC 5 commit: r610 - in trunk: . Driver/Driver/Library Driver/Driver/Tests SDK/C/Library SDK/C/include SDK/Installer/Library SDK/Installer/... | jbalint | 23 Oct |
