Modified:
MYODBCIns/MYODBCInsLib/MYODBCIns.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
MYODBCIns/MYODBCInsTest/MYODBCInsTest.cpp
Log:
Modified: MYODBCIns/MYODBCInsLib/MYODBCIns.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCIns.cpp 2006-04-21 23:33:57 UTC (rev 95)
+++ MYODBCIns/MYODBCInsLib/MYODBCIns.cpp 2006-04-21 23:54:34 UTC (rev 96)
@@ -111,13 +111,13 @@
switch ( nScope )
{
- case MYODBC_INS_DATASOURCE_SCOPE_BOTH:
+ case MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH:
nDirection = SQL_FETCH_FIRST;
break;
- case MYODBC_INS_DATASOURCE_SCOPE_SYSTEM:
+ case MYODBCInsDataSource::DATASOURCE_SCOPE_SYSTEM:
nDirection = SQL_FETCH_FIRST_SYSTEM;
break;
- case MYODBC_INS_DATASOURCE_SCOPE_USER:
+ case MYODBCInsDataSource::DATASOURCE_SCOPE_USER:
nDirection = SQL_FETCH_FIRST_USER;
break;
}
@@ -164,7 +164,7 @@
/* short circuit if we have not been given stuff to parse */
if ( stringKeywordValues.isEmpty() )
- MYODBCDbgReturn3( "%s", hashKeywordValues );
+ MYODBCDbgReturn3( "%d", true );
/* scan the input (we can not use QString::split() due to possible use of {} to
embrace values and type of delim) */
while ( 1 )
@@ -233,10 +233,10 @@
If the DSN and DRIVER keywords are included in the same connection
string,
the Driver Manager and the driver use whichever keyword appears
first.
*/
- if ( stringKeyword == "DSN" && !hashAttributes["DRIVER"].isNull()
)
+ if ( stringKeyword == "DSN" &&
!(*phashKeywordValues)["DRIVER"].isNull() )
break;
- if ( stringKeyword == "DRIVER" && !hashAttributes["DSN"].isNull()
)
+ if ( stringKeyword == "DRIVER" &&
!(*phashKeywordValues)["DSN"].isNull() )
break;
/*
@@ -257,7 +257,7 @@
}
/* terminated a name/value pair */
- if ( isDelimKeywordValue( stringKeywordValues[nScanChar], &nDelim )
+ if ( isDelimKeywordValue( stringKeywordValues[nScanChar], &nDelim ) )
nState = PARSE_STATE_NAME_START;
/* have we advanced to end of string */
@@ -386,7 +386,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCIns::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -409,7 +409,8 @@
}
//
- MYODBCInsDataSource datasource( MYODBC_INS_DATASOURCE_MODE_DSN_VIEW );
+ MYODBCInsDataSource datasource;
+ datasource.setMode( MYODBCInsDataSource::DATASOURCE_MODE_DSN_VIEW );
/*! \todo */
@@ -419,7 +420,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCIns::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -428,7 +429,7 @@
MYODBCDbgReturn3( "%d", true );
}
-bool MYODBCIns::doDeleteDataSource( const QString &stringName,
MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCIns::doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
@@ -446,7 +447,7 @@
MYODBCDbgReturn3( "%d", bReturn );
}
-bool MYODBCIns::isExistsDataSourceName( const QString &stringName,
MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCIns::isExistsDataSourceName( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
MYODBCDbgEnter();
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp 2006-04-21 23:33:57 UTC (rev 95)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp 2006-04-21 23:54:34 UTC (rev 96)
@@ -271,14 +271,14 @@
MYODBCDbgReturn3( "%s", hashAttributes["OPTION"] );
}
-DATASOURCE_MODE MYODBCInsDataSource::getMode()
+MYODBCInsDataSource::DATASOURCE_MODE MYODBCInsDataSource::getMode()
{
MYODBCDbgEnter();
MYODBCDbgReturn3( "%d", nMode );
}
-DATASOURCE_SCOPE MYODBCInsDataSource::getScope()
+MYODBCInsDataSource::DATASOURCE_SCOPE MYODBCInsDataSource::getScope()
{
MYODBCDbgEnter();
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp 2006-04-21 23:33:57 UTC (rev 95)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp 2006-04-21 23:54:34 UTC (rev 96)
@@ -29,10 +29,11 @@
#include "MYODBCInsInternal.h"
MYODBCInsDriverConnect::MYODBCInsDriverConnect( DRIVERCONNECT_METHOD nConnectMethod,
DRIVERCONNECT_PROMPT nPrompt )
- : MYODBCInsDataSource( DATASOURCE_MODE_CONNECT )
+ : MYODBCInsDataSource()
{
MYODBCDbgEnter();
+ setMode( MYODBCInsDataSource::DATASOURCE_MODE_CONNECT );
this->nConnectMethod = nConnectMethod;
this->nPrompt = nPrompt;
Modified: MYODBCIns/MYODBCInsTest/MYODBCInsTest.cpp
===================================================================
--- MYODBCIns/MYODBCInsTest/MYODBCInsTest.cpp 2006-04-21 23:33:57 UTC (rev 95)
+++ MYODBCIns/MYODBCInsTest/MYODBCInsTest.cpp 2006-04-21 23:54:34 UTC (rev 96)
@@ -107,7 +107,6 @@
QString stringResult;
QTextStream textstream( &stringResult );
-// QTextStream textstream( stderr );
textstream << driver;
if ( driver.getFriendlyName() != TEST_DRIVERNAME ||
@@ -124,7 +123,7 @@
void MYODBCInsTest::slotCreateDataSourceName()
{
/* its an error if it already exists... */
- QStringList stringlistDataSourceNames = MYODBCIns::getDataSourceNames(
MYODBC_INS_DATASOURCE_SCOPE_USER );
+ QStringList stringlistDataSourceNames = MYODBCIns::getDataSourceNames(
MYODBCInsDataSource::DATASOURCE_SCOPE_USER );
if ( stringlistDataSourceNames.contains( TEST_DSN ) )
{
@@ -132,16 +131,17 @@
QFAIL( "Failed to create DSN." );
}
- MYODBCInsDataSource datasource( MYODBC_INS_DATASOURCE_MODE_DSN_ADD );
+ MYODBCInsDataSource datasource;
- datasource.setScope( MYODBC_INS_DATASOURCE_SCOPE_USER );
+ datasource.setMode( MYODBCInsDataSource::DATASOURCE_MODE_DSN_ADD );
+ datasource.setScope( MYODBCInsDataSource::DATASOURCE_SCOPE_USER );
datasource.setDATABASE( TEST_DATABASE );
datasource.setDESCRIPTION( TEST_DESCRIPTION );
datasource.setDRIVER( TEST_DRIVERNAME );
- datasource.setDriverFileName( TEST_DRIVER );
- datasource.setDSN( TEST_DSN );
+// datasource.setDriverFileName( TEST_DRIVER );
+ datasource.setName( TEST_DSN );
datasource.setOPTION( TEST_OPTION );
- datasource.setPASSWORD( TEST_PASSWORD );
+ datasource.setPWD( TEST_PASSWORD );
datasource.setPORT( TEST_PORT );
datasource.setSERVER( TEST_SERVER );
datasource.setSOCKET( TEST_SOCKET );
@@ -168,10 +168,11 @@
void MYODBCInsTest::slotVerifyCreateDataSourceName()
{
- MYODBCInsDataSource datasource( MYODBC_INS_DATASOURCE_MODE_DSN_EDIT );
+ MYODBCInsDataSource datasource;
QString stringDefaultInstallLocation =
MYODBCIns::getDefaultInstallLocation();
- datasource.setScope( MYODBC_INS_DATASOURCE_SCOPE_USER );
+ datasource.setMode( MYODBCInsDataSource::DATASOURCE_MODE_DSN_EDIT );
+ datasource.setScope( MYODBCInsDataSource::DATASOURCE_SCOPE_USER );
if ( !datasource.doRead( TEST_DSN ) )
{
QStringList stringlist = MYODBCIns::getErrors();
@@ -193,15 +194,15 @@
if ( datasource.getDATABASE() != TEST_DATABASE ||
datasource.getDESCRIPTION() != TEST_DESCRIPTION ||
datasource.getDRIVER() != TEST_DRIVERNAME ||
- datasource.getDriverFileName() != stringDefaultInstallLocation + FILE_SEP +
TEST_DRIVER ||
- datasource.getDSN() != TEST_DSN ||
+// datasource.getDriverFileName() != stringDefaultInstallLocation + FILE_SEP +
TEST_DRIVER ||
+ datasource.getName() != TEST_DSN ||
datasource.getOPTION() != TEST_OPTION ||
- datasource.getPASSWORD() != TEST_PASSWORD ||
+ datasource.getPWD() != TEST_PASSWORD ||
datasource.getPORT() != TEST_PORT ||
datasource.getSERVER() != TEST_SERVER ||
datasource.getSOCKET() != TEST_SOCKET ||
datasource.getSTMT() != TEST_STMT ||
- datasource.getUSER() != TEST_USER )
+ datasource.getUID() != TEST_USER )
{
MYODBCDbgError( "Have prepended %1 to file name but data source information is
not the same...", stringDefaultInstallLocation );
MYODBCDbgError( "\nWrote:\n%1", stringOutput );
@@ -229,7 +230,7 @@
void MYODBCInsTest::slotVerifyDeleteDataSourceName()
{
- QStringList stringlistDataSourceNames = MYODBCIns::getDataSourceNames(
MYODBC_INS_DATASOURCE_SCOPE_USER );
+ QStringList stringlistDataSourceNames = MYODBCIns::getDataSourceNames(
MYODBCInsDataSource::DATASOURCE_SCOPE_USER );
if ( stringlistDataSourceNames.contains( TEST_DSN ) )
{
| Thread |
|---|
| • Connector/ODBC 5 commit: r96 - in MYODBCIns: MYODBCInsLib MYODBCInsTest | pharvey | 22 Apr |
