Modified:
trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp
Log:
move to laptop
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp 2006-08-01 07:15:40 UTC (rev 472)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MCommands.cpp 2006-08-02 15:34:32 UTC (rev 473)
@@ -55,18 +55,21 @@
/* clear out any previous commands processing */
doClear();
-printf( "[PAH][%s][%d] (%s)\n", __FILE__, __LINE__, stringCommands.toLatin1().data() );
+// printf( "[PAH][%s][%d] (%s)\n", __FILE__, __LINE__, stringCommands.toLatin1().data()
);
for ( int nChar = 0; nChar < stringCommands.length(); nChar++ )
{
QChar cChar = stringCommands.at( nChar );
BOOLEAN bLastChar = ( nChar == (stringCommands.length() - 1) );
+// printf( "[PAH][%s][%d] bLastChar=%d (%c)\n", __FILE__, __LINE__, bLastChar,
cChar.toAscii() );
+
/* catch some last char problems */
if ( bLastChar && /* we are
on last char */
- ( !cQuote.isNull() && cQuote != cChar ) || /* last
char is not going to close our quote */
- ( cQuote.isNull() && stringQuotes.contains( cChar ) ) ) /* last
char is going to open a quote */
+ ( ( !cQuote.isNull() && cQuote != cChar ) || /* last
char is not going to close our quote */
+ ( cQuote.isNull() && stringQuotes.contains( cChar ) ) ) ) /*
last char is going to open a quote */
{
+// printf( "[PAH][%s][%d] bLastChar=%d (%c)\n", __FILE__, __LINE__, bLastChar,
cChar.toAscii() );
doClear();
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
QString( "unclosed quote near: " ).arg( stringCommand ) ) );
}
@@ -82,7 +85,7 @@
{
MCommand *pCommand = new MCommand( this );
SQLRETURN n = pCommand->setCommand( stringCommand );
-printf( "[PAH][%s][%d] (%s)\n", __FILE__, __LINE__, stringCommand.toLatin1().data() );
+
switch ( n )
{
case SQL_SUCCESS:
@@ -158,7 +161,7 @@
while ( i.hasNext() )
{
MCommand *pCommand = (MCommand *)i.next();
- if ( stringCommand.isEmpty() )
+ if ( !stringCommand.isEmpty() )
stringCommand += ";";
stringCommand += pCommand->getNative();
}
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-08-01 07:15:40 UTC (rev 472)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-08-02 15:34:32 UTC (rev 473)
@@ -3066,6 +3066,7 @@
{
MYODBCDbgEnter();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
if ( !pField )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
tr("Invalid field structure. Failed to store field descriptor information.") ) );
@@ -3453,10 +3454,12 @@
break;
default:
{
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
QString( "%1 %2" ).arg( pField->type ).arg( tr(" is an unknown MYSQL column data
type.") ) ) );
}
}
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
MYODBCDbgReturn( SQL_SUCCESS );
}
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp 2006-08-01 07:15:40 UTC (rev 472)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResultRes.cpp 2006-08-02 15:34:32 UTC (rev 473)
@@ -411,6 +411,7 @@
{
MYODBCDbgEnter();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
if ( getState() < STATE_PREPARED )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
@@ -514,11 +515,13 @@
stringStatement += stringlistStatement.at( nStatementSegment );
}
}
+printf( "[PAH][%s][%d] Command=(%s)\n", __FILE__, __LINE__,
stringStatement.toLatin1().data() );
/* submit command to server */
if ( mysql_real_query( getMySQL(), stringStatement.toUtf8().constData(),
stringStatement.length() ) )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000,
mysql_errno( getMySQL() ), mysql_error( getMySQL() ) ) );
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
/*!
\internal
\todo
@@ -529,6 +532,7 @@
if ( (!pRes && mysql_field_count( getMySQL() )) || mysql_errno( getMySQL() )
)
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000,
mysql_errno( getMySQL() ), mysql_error( getMySQL() ) ) );
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
/* get result-set meta-data */
nReturnInternal = doLoadMetaData();
switch ( nReturnInternal )
@@ -544,6 +548,7 @@
MYODBCDbgReturn( nReturnInternal );
}
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
/*!
\internal ODBC RULE
@@ -569,6 +574,7 @@
setRowsAffected( mysql_affected_rows( getMySQL() ) );
setState( STATE_EXECUTED );
+printf( "[PAH][%s][%d] %s\n", __FILE__, __LINE__, MYODBCC::getReturnString(nReturn
).toLatin1().data() );
MYODBCDbgReturn( nReturn );
}
@@ -748,6 +754,7 @@
{
MYODBCDbgEnter();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
if ( getState() != STATE_INITIALIZED ) /* should call doClear() first */
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
@@ -755,6 +762,7 @@
setState( STATE_PREPARED );
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
MYODBCDbgReturn( SQL_SUCCESS );
}
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp 2006-08-01 07:15:40 UTC (rev 472)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp 2006-08-02 15:34:32 UTC (rev 473)
@@ -744,17 +744,22 @@
{
MYODBCDbgEnter();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
if ( getState() != STATE_INITIALIZED ) /* should call doClear() first */
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) );
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
QString stringCommand = pCommand->getNative();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
if ( mysql_stmt_prepare( pstm, stringCommand.toUtf8().data(), stringCommand.length()
) )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000,
mysql_stmt_errno( pstm ), mysql_stmt_error( pstm ) ) );
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
this->pCommand = pCommand;
setState( STATE_PREPARED ); // set this here so if we fail below - a rollback will
cleanup
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
/* get result-set meta-data */
SQLRETURN nReturn = doLoadMetaData();
if ( !SQL_SUCCEEDED( nReturn ) )
@@ -763,6 +768,7 @@
MYODBCDbgReturn( nReturn );
}
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
MYODBCDbgReturn( SQL_SUCCESS );
}
@@ -1192,6 +1198,7 @@
{
MYODBCDbgEnter();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
getImpRowDesc()->doClear();
MYSQL_RES *pMetaData = mysql_stmt_result_metadata( pstm );
@@ -1204,6 +1211,7 @@
MYODBCDbgReturn( SQL_SUCCESS );
}
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
unsigned int nFields = mysql_num_fields( pMetaData );
if ( nFields )
@@ -1240,6 +1248,7 @@
}
}
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
MYODBCDbgReturn( SQL_SUCCESS );
}
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp 2006-08-01 07:15:40 UTC (rev 472)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MStatement.cpp 2006-08-02 15:34:32 UTC (rev 473)
@@ -2221,6 +2221,7 @@
{
MYODBCDbgEnter();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
SQLRETURN nReturn1 = doPrepare( psStatementText, nTextLength );
if ( !SQL_SUCCEEDED( nReturn1 ) )
MYODBCDbgReturn( nReturn1 );
@@ -2272,9 +2273,11 @@
else
setState( STATE_S4 );
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
if ( nReturn1 == SQL_SUCCESS_WITH_INFO || nReturn2 == SQL_SUCCESS_WITH_INFO )
MYODBCDbgReturn( SQL_SUCCESS_WITH_INFO );
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
MYODBCDbgReturn( SQL_SUCCESS );
}
@@ -5458,6 +5461,7 @@
{
MYODBCDbgEnter();
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
/* what flavour of resultset do we want? */
int nStatementType = getConnection()->getStatementType();
@@ -5508,12 +5512,14 @@
}
/* get MResult to do more prepare as needed */
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
SQLRETURN nReturn = pResult->doPrepare( pCommand );
if ( !SQL_SUCCEEDED( nReturn ) )
{
delete pResult;
MYODBCDbgReturn( nReturn );
}
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
/*!
\internal
@@ -5546,6 +5552,7 @@
}
}
+printf( "[PAH][%s][%d]\n", __FILE__, __LINE__ );
MYODBCDbgReturn( nReturn );
}
| Thread |
|---|
| • Connector/ODBC 5 commit: r473 - trunk/MYSQLPlus/MYSQLPlusLib | pharvey | 2 Aug |
