Modified:
MYODBCC/MYODBCCLib/MYODBCCLib.pro
MYODBCCls/MYODBCCls.vpj
MYODBCCls/MYODBCClsLib/MYODBCClsConnection.cpp
MYODBCCls/MYODBCClsLib/MYODBCClsEnvironment.cpp
MYODBCCls/MYODBCClsLib/MYODBCClsInternal.h
MYODBCCls/MYODBCClsLib/MYODBCClsLib.pro
MYODBCCls/MYODBCClsLib/MYODBCClsStatement.cpp
MYODBCCls/include/MYODBCCls.h
MYODBCCls/include/MYODBCClsConnection.h
MYODBCCls/include/MYODBCClsEnvironment.h
MYODBCCls/include/MYODBCClsStatement.h
MYODBCRes/MYODBCResLib/MYODBCResLib.pro
Log:
Modified: MYODBCC/MYODBCCLib/MYODBCCLib.pro
===================================================================
--- MYODBCC/MYODBCCLib/MYODBCCLib.pro 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCC/MYODBCCLib/MYODBCCLib.pro 2006-04-24 23:33:13 UTC (rev 107)
@@ -17,6 +17,7 @@
include( ../../odbc.pri )
CONFIG += staticlib
CONFIG += console
+INCLUDEPATH += ../../MYODBCRtti/include
# #########################################################
# UNIX
Modified: MYODBCCls/MYODBCCls.vpj
===================================================================
--- MYODBCCls/MYODBCCls.vpj 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/MYODBCCls.vpj 2006-04-24 23:33:13 UTC (rev 107)
@@ -22,7 +22,7 @@
CaptureOutputWith="ProcessBuffer"
SaveOption="SaveWorkspaceFiles"
RunFromDir="%rw">
- <Exec/>
+ <Exec CmdLine="make"/>
</Target>
<Target
Name="Rebuild"
Modified: MYODBCCls/MYODBCClsLib/MYODBCClsConnection.cpp
===================================================================
--- MYODBCCls/MYODBCClsLib/MYODBCClsConnection.cpp 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/MYODBCClsLib/MYODBCClsConnection.cpp 2006-04-24 23:33:13 UTC (rev 107)
@@ -1 +1,22 @@
+#include "MYODBCClsInternal.h"
+MYODBCClsConnection::MYODBCClsConnection( MYODBCClsEnvironment *pEnv )
+ : QObject( pEnv )
+{
+}
+
+MYODBCClsConnection::~MYODBCClsConnection()
+{
+}
+
+MYODBCDia *MYODBCClsConnection::getDia()
+{
+ return pDia;
+}
+
+MYODBCAttConnection *MYODBCClsConnection::getAtt()
+{
+ return pAtt;
+}
+
+
Modified: MYODBCCls/MYODBCClsLib/MYODBCClsEnvironment.cpp
===================================================================
--- MYODBCCls/MYODBCClsLib/MYODBCClsEnvironment.cpp 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/MYODBCClsLib/MYODBCClsEnvironment.cpp 2006-04-24 23:33:13 UTC (rev 107)
@@ -1,21 +1,21 @@
-#ifndef MYODBC_ENVIRONMENT
-#define MYODBC_ENVIRONMENT
+#include "MYODBCClsInternal.h"
-#include <MYODBCConnection.h>
+MYODBCClsEnvironment::MYODBCClsEnvironment()
+{
+}
-class MYODBCEnvironment
+MYODBCClsEnvironment::~MYODBCClsEnvironment()
{
-public:
- MYODBCEnvironment();
- ~MYODBCEnvironment();
+}
+MYODBCDia *MYODBCClsEnvironment::getDia()
+{
+ return pDia;
+}
-protected:
- MYODBCDia * pDia;
- MYODBCAttEnvironment * pAttributes;
+MYODBCAttEnvironment *MYODBCClsEnvironment::getAtt()
+{
+ return pAtt;
+}
- QList<MYODBCConnection*> listConnections; /*!< our connections */
-};
-#endif
-
Modified: MYODBCCls/MYODBCClsLib/MYODBCClsInternal.h
===================================================================
--- MYODBCCls/MYODBCClsLib/MYODBCClsInternal.h 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/MYODBCClsLib/MYODBCClsInternal.h 2006-04-24 23:33:13 UTC (rev 107)
@@ -1,5 +1,5 @@
-#ifndef MYODBC_CLS_INTERNAL
-#define MYODBC_CLS_INTERNAL
+#ifndef MYODBC_CLS_INTERNAL_H
+#define MYODBC_CLS_INTERNAL_H
#include "../include/MYODBCCls.h"
Modified: MYODBCCls/MYODBCClsLib/MYODBCClsLib.pro
===================================================================
--- MYODBCCls/MYODBCClsLib/MYODBCClsLib.pro 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/MYODBCClsLib/MYODBCClsLib.pro 2006-04-24 23:33:13 UTC (rev 107)
@@ -2,162 +2,35 @@
# COMMON
# #########################################################
TEMPLATE = lib
-TARGET = myodbc5
+TARGET = MYODBCCls
DESTDIR = ../../lib
include( ../../common.pri )
include( ../../config.pri )
include( ../../defines.pri )
-CONFIG += plugin
-INCLUDEPATH += ../../MYODBCC/include
+CONFIG += staticlib
INCLUDEPATH += ../../MYODBCRtti/include
+INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../../MYODBCDbg/include
-INCLUDEPATH += ../../MYODBCArray/include
-INCLUDEPATH += ../../MYODBCList/include
INCLUDEPATH += ../../MYODBCIns/include
INCLUDEPATH += ../../MYODBCDia/include
INCLUDEPATH += ../../MYODBCDes/include
-INCLUDEPATH += ../../MYODBCRes/include
-LIBS += -L../../lib
-LIBS += -lMYODBCRes
-LIBS += -lMYODBCDes
-LIBS += -lMYODBCDia
-LIBS += -lMYODBCIns
-LIBS += -lMYODBCList
-LIBS += -lMYODBCArray
-LIBS += -lMYODBCDbg
-LIBS += -lMYODBCC
+INCLUDEPATH += ../../MYODBCAtt/include
+# INCLUDEPATH += ../../MYODBCRes/include
-include( ../../odbc.pri )
include( ../../mysql.pri )
# #########################################################
-# WIN32
-# #########################################################
-win32 {
-# TMAKE_LFLAGS += /NODEFAULTLIB:libcmt.lib
-# TMAKE_LFLAGS += /NODEFAULTLIB:libcmtd.lib
-# old TMAKE_LFLAGS -= /NODEFAULTLIB:"libc"
-# old TMAKE_LFLAGS -= /SUBSYSTEM:WINDOWS
- DEF_FILE = MYODBCDrvExports.def
- RC_FILE = MYODBCDrv.rc
- libraries.path = /windows/system32
- libraries.files = MYODBCDrv.dll
-}
-
-# #########################################################
-# UNIX
-# #########################################################
-unix {
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB
-}
-
-# #########################################################
-# INSTALL
-# #########################################################
-INSTALLS += libraries
-
-# #########################################################
# FILES
# #########################################################
HEADERS = \
- ../include/MYODBCDrv.h \
- MYODBCDrvInternal.h
+ ../include/MYODBCCls.h \
+ ../include/MYODBCClsEnvironment.h \
+ ../include/MYODBCClsConnection.h \
+ ../include/MYODBCClsStatement.h \
+ MYODBCClsInternal.h
SOURCES = \
-# missing.c \
- SQLAllocConnect.c \
- SQLAllocEnv.c \
- SQLAllocHandle.c \
- SQLAllocStmt.c \
- SQLBindCol.c \
- SQLBindParameter.c \
- SQLBrowseConnect.c \
- SQLBulkOperations.c \
- SQLCancel.c \
- SQLCloseCursor.c \
- SQLColAttribute.c \
- SQLColAttributes.c \
- SQLColumnPrivileges.c \
- SQLColumns.c \
- SQLConnect.c \
- SQLCopyDesc.c \
- SQLDescribeCol.c \
- SQLDescribeParam.c \
- SQLDisconnect.c \
- SQLDriverConnect.c \
- SQLEndTran.c \
- SQLError.c \
- SQLExecDirect.c \
- SQLExecute.c \
- SQLExtendedFetch.c \
- SQLFetch.c \
- SQLFetchScroll.c \
- SQLForeignKeys.c \
- SQLFreeConnect.c \
- SQLFreeEnv.c \
- SQLFreeHandle.c \
- SQLFreeStmt.c \
- SQLGetConnectAttr.c \
- SQLGetConnectOption.c \
- SQLGetCursorName.c \
- SQLGetData.c \
- SQLGetDescField.c \
- SQLGetDescRec.c \
- SQLGetDiagField.c \
- SQLGetDiagRec.c \
- SQLGetEnvAttr.c \
- SQLGetFunctions.c \
- SQLGetInfo.c \
- SQLGetStmtAttr.c \
- SQLGetStmtOption.c \
- SQLGetTypeInfo.c \
- SQLMoreResults.c \
- SQLNativeSql.c \
- SQLNumParams.c \
- SQLNumResultCols.c \
- SQLParamData.c \
- SQLParamOptions.c \
- SQLPrepare.c \
- SQLPrimaryKeys.c \
- SQLProcedureColumns.c \
- SQLProcedures.c \
- SQLPutData.c \
- SQLRowCount.c \
- SQLSetConnectAttr.c \
- SQLSetConnectOption.c \
- SQLSetCursorName.c \
- SQLSetDescField.c \
- SQLSetDescRec.c \
- SQLSetEnvAttr.c \
- SQLSetPos.c \
- SQLSetScrollOptions.c \
- SQLSetStmtAttr.c \
- SQLSetStmtOption.c \
- SQLSpecialColumns.c \
- SQLStatistics.c \
- SQLTablePrivileges.c \
- SQLTables.c \
- SQLTransact.c \
- MYODBCDrvAssociateDes.c \
- MYODBCDrvConnect.c \
- MYODBCDrvDbcStateString.c \
- MYODBCDrvDisassociateDes.c \
- MYODBCDrvFini.c \
- MYODBCDrvFreeStmPrepare.c \
- MYODBCDrvFreeStmResult.c \
- MYODBCDrvGetCatalog.c \
- MYODBCDrvGetCatalogs.c \
- MYODBCDrvGetClientFlag.c \
- MYODBCDrvGetDesDbc.c \
- MYODBCDrvGetSchemas.c \
- MYODBCDrvGetTables.c \
- MYODBCDrvInit.c \
- MYODBCDrvIsDesWithStm.c \
- MYODBCDrvIsServerAlive.c \
- MYODBCDrvMain.c \
- MYODBCDrvSetDbcState.c \
- MYODBCDrvSetStmState.c \
- MYODBCDrvStmStateString.c \
- MYODBCDrvSubmitCommand.c
+ MYODBCClsEnvironment.cpp \
+ MYODBCClsConnection.cpp \
+ MYODBCClsStatement.cpp
Modified: MYODBCCls/MYODBCClsLib/MYODBCClsStatement.cpp
===================================================================
--- MYODBCCls/MYODBCClsLib/MYODBCClsStatement.cpp 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/MYODBCClsLib/MYODBCClsStatement.cpp 2006-04-24 23:33:13 UTC (rev 107)
@@ -1 +1,22 @@
+#include "MYODBCClsInternal.h"
+MYODBCClsStatement::MYODBCClsStatement( MYODBCClsConnection *pDbc )
+ : QObject( pDbc )
+{
+}
+
+MYODBCClsStatement::~MYODBCClsStatement()
+{
+}
+
+MYODBCDia *MYODBCClsStatement::getDia()
+{
+ return pDia;
+}
+
+MYODBCAttStatement *MYODBCClsStatement::getAtt()
+{
+ return pAtt;
+}
+
+
Modified: MYODBCCls/include/MYODBCCls.h
===================================================================
--- MYODBCCls/include/MYODBCCls.h 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/include/MYODBCCls.h 2006-04-24 23:33:13 UTC (rev 107)
@@ -3,6 +3,8 @@
#include <QObject>
+#include <MYODBCDia.h>
+
#include "MYODBCClsEnvironment.h"
#include "MYODBCClsConnection.h"
#include "MYODBCClsStatement.h"
Modified: MYODBCCls/include/MYODBCClsConnection.h
===================================================================
--- MYODBCCls/include/MYODBCClsConnection.h 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/include/MYODBCClsConnection.h 2006-04-24 23:33:13 UTC (rev 107)
@@ -3,6 +3,8 @@
#include "MYODBCCls.h"
+#include <MYODBCAttConnection.h>
+
class MYODBCClsConnection : public QObject
{
public:
Modified: MYODBCCls/include/MYODBCClsEnvironment.h
===================================================================
--- MYODBCCls/include/MYODBCClsEnvironment.h 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/include/MYODBCClsEnvironment.h 2006-04-24 23:33:13 UTC (rev 107)
@@ -3,6 +3,8 @@
#include "MYODBCCls.h"
+#include <MYODBCAttEnvironment.h>
+
class MYODBCClsEnvironment : public QObject
{
public:
Modified: MYODBCCls/include/MYODBCClsStatement.h
===================================================================
--- MYODBCCls/include/MYODBCClsStatement.h 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCCls/include/MYODBCClsStatement.h 2006-04-24 23:33:13 UTC (rev 107)
@@ -3,6 +3,8 @@
#include "MYODBCCls.h"
+#include <MYODBCAttStatement.h>
+
class MYODBCClsStatement : public QObject
{
public:
@@ -10,11 +12,11 @@
~MYODBCClsStatement();
MYODBCDia * getDia();
- MYODBCAttEnvironment * getAtt();
+ MYODBCAttStatement * getAtt();
protected:
MYODBCDia * pDia;
- MYODBCAttEnvironment * pAtt;
+ MYODBCAttStatement * pAtt;
};
#endif
Modified: MYODBCRes/MYODBCResLib/MYODBCResLib.pro
===================================================================
--- MYODBCRes/MYODBCResLib/MYODBCResLib.pro 2006-04-24 18:01:15 UTC (rev 106)
+++ MYODBCRes/MYODBCResLib/MYODBCResLib.pro 2006-04-24 23:33:13 UTC (rev 107)
@@ -8,9 +8,9 @@
include( ../../config.pri )
include( ../../defines.pri )
CONFIG += staticlib
+INCLUDEPATH += ../../MYODBCRtti/include
INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../../MYODBCDbg/include
-INCLUDEPATH += ../../MYODBCRtti/include
INCLUDEPATH += ../../MYODBCDia/include
INCLUDEPATH += ../../MYODBCDes/include
INCLUDEPATH += ../../MYODBCAtt/include
| Thread |
|---|
| • Connector/ODBC 5 commit: r107 - MYODBCC/MYODBCCLib MYODBCCls MYODBCCls/MYODBCClsLib MYODBCCls/include MYODBCRes/MYODBCResLib | pharvey | 25 Apr |
