Connector/ODBC 5 commit: r233 - MYODBCDriver/MYODBCDriverLib MYODBCIns/MYODBCInsLib MYSQLPlus/MYSQLPlusLib doc/Project

[pharvey]

Added:
   doc/Project/SituationReport-20060519.ods
Modified:
   MYODBCDriver/MYODBCDriverLib/SQLExecDirectW.cpp
   MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
   MYSQLPlus/MYSQLPlusLib/MStatement.cpp
Log:


Modified: MYODBCDriver/MYODBCDriverLib/SQLExecDirectW.cpp
===================================================================
--- MYODBCDriver/MYODBCDriverLib/SQLExecDirectW.cpp	2006-05-13 22:51:30 UTC (rev 232)
+++ MYODBCDriver/MYODBCDriverLib/SQLExecDirectW.cpp	2006-05-13 23:13:32 UTC (rev 233)
@@ -8,6 +8,25 @@
 */
 #include "MYODBCDriverInternal.h"
 
+/*!
+    \brief  <B>ODBC 1.0 API</B>
+            <BR>
+            Executes a preparable statement, using the current values of
+            the parameter marker variables if any parameters exist in the
+            statement.
+
+    \param  hStm                Viable statement handle.
+    \param  pszStatementText    SQL statement to be processed.
+    \param  nTextLength         Length of pszStatementText.
+    
+    \retval SQL_SUCCESS             Request processed ok.
+    \retval SQL_SUCCESS_WITH_INFO   Request was probably processed ok - check diagnostic.
+    \retval SQL_NEED_DATA           Need parameter data.
+    \retval SQL_STILL_EXECUTING     Still executing from a previous call.     
+    \retval SQL_ERROR               Request failed.
+    \retval SQL_NO_DATA             Searched update/delete statement did not affect any
rows.
+    \retval SQL_INVALID_HANDLE      Invalid handle was provided.
+*/
 SQLRETURN SQL_API SQLExecDirectW( SQLHSTMT   hStm,
                                   SQLWCHAR * psStatementText,
                                   SQLINTEGER nTextLength )

Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp	2006-05-13 22:51:30 UTC (rev 232)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp	2006-05-13 23:13:32 UTC (rev 233)
@@ -205,70 +205,70 @@
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["DRIVER"] );
+    MYODBCDbgReturn1( hashAttributes["DRIVER"] );
 }
 
 QString MYODBCInsDataSource::getDESCRIPTION()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["DESCRIPTION"] );
+    MYODBCDbgReturn1( hashAttributes["DESCRIPTION"] );
 }
 
 QString MYODBCInsDataSource::getSERVER()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["SERVER"] );
+    MYODBCDbgReturn1( hashAttributes["SERVER"] );
 }
 
 QString MYODBCInsDataSource::getUID()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["UID"] );
+    MYODBCDbgReturn1( hashAttributes["UID"] );
 }
 
 QString MYODBCInsDataSource::getPWD()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["PWD"] );
+    MYODBCDbgReturn1( hashAttributes["PWD"] );
 }
 
 QString MYODBCInsDataSource::getDATABASE()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["DATABASE"] );
+    MYODBCDbgReturn1( hashAttributes["DATABASE"] );
 }
 
 QString MYODBCInsDataSource::getPORT()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["PORT"] );
+    MYODBCDbgReturn1( hashAttributes["PORT"] );
 }
 
 QString MYODBCInsDataSource::getSOCKET()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["SOCKET"] );
+    MYODBCDbgReturn1( hashAttributes["SOCKET"] );
 }
 
 QString MYODBCInsDataSource::getSTMT()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["STMT"] );
+    MYODBCDbgReturn1( hashAttributes["STMT"] );
 }
 
 QString MYODBCInsDataSource::getOPTION()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%s", hashAttributes["OPTION"] );
+    MYODBCDbgReturn1( hashAttributes["OPTION"] );
 }
 
 MYODBCInsDataSource::DATASOURCE_MODE MYODBCInsDataSource::getMode()

Modified: MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-05-13 22:51:30 UTC (rev 232)
+++ MYSQLPlus/MYSQLPlusLib/MStatement.cpp	2006-05-13 23:13:32 UTC (rev 233)
@@ -1247,14 +1247,11 @@
 {
     MYODBCDbgEnter();
 
-    /*!
-        \internal ODBC RULE
+    SQLRETURN nReturn = doPrepare( psStatementText, SQLINTEGER nTextLength );
+    if ( !SQL_SUCCEEDED( nReturn ) )
+        MYODBCDbgReturn( nReturn );
 
-        We clear diagnostic each time an ODBC API call is made (with exceptions).
-    */
-    pDiagnostic->doClear();
-
-    MYODBCDbgReturn( SQL_ERROR );
+    MYODBCDbgReturn( doExecute() );
 }
 
 SQLRETURN MStatement::doExecute()

Added: doc/Project/SituationReport-20060519.ods
===================================================================
(Binary files differ)


Property changes on: doc/Project/SituationReport-20060519.ods
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream