Modified:
MYODBCDriver/MYODBCDriverLib/SQLColumnPrivilegesW.cpp
MYSQLPlus/MYSQLPlusLib/MConnection.cpp
MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp
MYSQLPlus/MYSQLPlusLib/MStatement.cpp
MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.vpj
Log:
Modified: MYODBCDriver/MYODBCDriverLib/SQLColumnPrivilegesW.cpp
===================================================================
--- MYODBCDriver/MYODBCDriverLib/SQLColumnPrivilegesW.cpp 2006-05-02 16:53:40 UTC (rev
175)
+++ MYODBCDriver/MYODBCDriverLib/SQLColumnPrivilegesW.cpp 2006-05-02 17:51:37 UTC (rev
176)
@@ -8,6 +8,35 @@
*/
#include "MYODBCDriverInternal.h"
+/*!
+ \brief <B>ODBC 1.0 API</B>
+ <BR>
+ SQLColumnPrivileges returns a list of columns and associated
+ privileges for the specified table.
+
+ The driver returns the information as a result set on the
+ specified StatementHandle.
+
+ \param hStm
+ \param pszCatalogName
+ \param nNameLength1
+ \param pszSchemaName
+ \param nNameLength2
+ \param pszTableName
+ \param nNameLength3
+ \param pszColumnName
+ \param nNameLength4
+
+ \return SQLRETURN
+
+ \retval SQL_SUCCESS Request processed ok.
+ \retval SQL_SUCCESS_WITH_INFO Request was probably processed ok - check diagnostic.
+ \retval SQL_STILL_EXECUTING Function is still processing - asynch.
+ \retval SQL_ERROR Request failed.
+ \retval SQL_INVALID_HANDLE Invalid handle was provided.
+
+ \sa SQLColumns
+*/
SQLRETURN SQL_API SQLColumnPrivilegesW( SQLHSTMT hStm,
SQLWCHAR * psCatalogName,
SQLSMALLINT nNameLength1,
Modified: MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-02 16:53:40 UTC (rev 175)
+++ MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-02 17:51:37 UTC (rev 176)
@@ -28,6 +28,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -44,6 +46,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -65,6 +69,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -114,6 +120,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -121,6 +129,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -128,6 +138,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -135,6 +147,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -142,6 +156,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -149,6 +165,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
Modified: MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp 2006-05-02 16:53:40 UTC (rev 175)
+++ MYSQLPlus/MYSQLPlusLib/MDescriptor.cpp 2006-05-02 17:51:37 UTC (rev 176)
@@ -96,6 +96,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_SUCCESS );
}
@@ -103,6 +105,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
/*
\internal ODBC Rule
@@ -139,6 +143,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
/*! \internal ODBC Rule
When an application calls SQLGetDescField to retrieve the value of a field that
is undefined for a particular descriptor
@@ -209,6 +215,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
if ( nRecNumber < 0 )
MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_07009 ) );
Modified: MYSQLPlus/MYSQLPlusLib/MStatement.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MStatement.cpp 2006-05-02 16:53:40 UTC (rev 175)
+++ MYSQLPlus/MYSQLPlusLib/MStatement.cpp 2006-05-02 17:51:37 UTC (rev 176)
@@ -48,6 +48,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -55,6 +57,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -62,6 +66,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -70,6 +76,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -77,6 +85,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -98,6 +108,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -105,6 +117,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -112,6 +126,8 @@
SQLRETURN MStatement::doBindCol( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType,
SQLPOINTER pTargetValuePtr, SQLINTEGER nBufferLength, SQLLEN *pnStrLenOrInd )
{
MYODBCDbgEnter();
+
+ pDiagnostic->doClear();
/*
MDescriptor *pDescriptor = getAppRowDesc();
@@ -164,6 +180,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -171,6 +189,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -178,6 +198,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -185,6 +207,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -192,6 +216,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -199,13 +225,17 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn( SQL_ERROR );
+ pDiagnostic->doClear();
+
+ MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000, 0, "Driver Does
not support this API" ) );
}
SQLRETURN MStatement::doColumns( SQLWCHAR *psCatalogName, SQLSMALLINT nNameLength1,
SQLWCHAR *psSchemaName, SQLSMALLINT nNameLength2, SQLWCHAR *psTableName, SQLSMALLINT
nNameLength3, SQLWCHAR *psColumnName, SQLSMALLINT nNameLength4 )
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -213,6 +243,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -220,6 +252,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -227,6 +261,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -234,6 +270,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -241,6 +279,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -248,6 +288,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -255,6 +297,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -262,6 +306,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -269,6 +315,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -276,6 +324,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -283,6 +333,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -290,6 +342,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -297,6 +351,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -304,6 +360,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -311,6 +369,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -318,6 +378,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -325,6 +387,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -332,6 +396,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -339,6 +405,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -346,6 +414,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -353,6 +423,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -360,6 +432,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
@@ -367,6 +441,8 @@
{
MYODBCDbgEnter();
+ pDiagnostic->doClear();
+
MYODBCDbgReturn( SQL_ERROR );
}
Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp 2006-05-02 16:53:40 UTC (rev 175)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp 2006-05-02 17:51:37 UTC (rev 176)
@@ -2,6 +2,7 @@
#include <QString>
#include <QFile>
#include <M.h>
+#include <MYODBCDbg.h>
class MYSQLPlusTest : public QObject
{
Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-02 16:53:40 UTC (rev 175)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-02 17:51:37 UTC (rev 176)
@@ -7,16 +7,18 @@
include( ../../common.pri )
include( ../../config.pri )
include( ../../defines.pri )
-include( ../../odbc.pri )
CONFIG += qtestlib
INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../../MYODBCDbg/include
INCLUDEPATH += ../include
LIBS += -L../../lib
-LIBS += -lMYODBCDia
+LIBS += -lMYSQLPlus
LIBS += -lMYODBCDbg
LIBS += -lMYODBCC
+include( ../../odbc.pri )
+include( ../../mysql.pri )
+
# #########################################################
# FILES
# #########################################################
Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.vpj
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.vpj 2006-05-02 16:53:40 UTC (rev 175)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.vpj 2006-05-02 17:51:37 UTC (rev 176)
@@ -22,7 +22,7 @@
CaptureOutputWith="ProcessBuffer"
SaveOption="SaveWorkspaceFiles"
RunFromDir="%rw">
- <Exec/>
+ <Exec CmdLine="make"/>
</Target>
<Target
Name="Rebuild"
| Thread |
|---|
| • Connector/ODBC 5 commit: r176 - MYODBCDriver/MYODBCDriverLib MYSQLPlus/MYSQLPlusLib MYSQLPlus/MYSQLPlusTest | pharvey | 2 May |
